AyeCode / invoicing

includes/payments/class-getpaid-payment-form.php

Indentation +579 added lines, -579 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -10,55 +10,55 @@ 
 class GetPaid_Payment_Form extends GetPaid_Data {
 
     /**
-	 * Which data store to load.
-	 *
-	 * @var string
-	 */
+     * Which data store to load.
+     *
+     * @var string
+     */
     protected $data_store_name = 'payment_form';
 
     /**
-	 * This is the name of this object type.
-	 *
-	 * @var string
-	 */
-	protected $object_type = 'payment_form';
+     * This is the name of this object type.
+     *
+     * @var string
+     */
+    protected $object_type = 'payment_form';
 
     /**
-	 * Form Data array. This is the core form data exposed in APIs.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $data = array(
-		'status'        => 'draft',
-		'version'       => '',
-		'date_created'  => null,
+     * Form Data array. This is the core form data exposed in APIs.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $data = array(
+        'status'        => 'draft',
+        'version'       => '',
+        'date_created'  => null,
         'date_modified' => null,
         'name'          => '',
         'author'        => 1,
         'elements'      => null,
-		'items'         => null,
-		'earned'        => 0,
-		'refunded'      => 0,
-		'cancelled'     => 0,
-		'failed'        => 0,
-	);
-
-    /**
-	 * Stores meta in cache for future reads.
-	 *
-	 * A group must be set to to enable caching.
-	 *
-	 * @var string
-	 */
-	protected $cache_group = 'getpaid_forms';
-
-	/**
-	 * Stores a reference to the invoice if the form is for an invoice..
-	 *
-	 * @var WPInv_Invoice
-	 */
-	public $invoice = 0;
+        'items'         => null,
+        'earned'        => 0,
+        'refunded'      => 0,
+        'cancelled'     => 0,
+        'failed'        => 0,
+    );
+
+    /**
+     * Stores meta in cache for future reads.
+     *
+     * A group must be set to to enable caching.
+     *
+     * @var string
+     */
+    protected $cache_group = 'getpaid_forms';
+
+    /**
+     * Stores a reference to the invoice if the form is for an invoice..
+     *
+     * @var WPInv_Invoice
+     */
+    public $invoice = 0;
 
     /**
      * Stores a reference to the original WP_Post object
@@ -68,35 +68,35 @@ 
     protected $post = null;
 
     /**
-	 * Get the form if ID is passed, otherwise the form is new and empty.
-	 *
-	 * @param  int|object|GetPaid_Payment_Form|WP_Post $form Form to read.
-	 */
-	public function __construct( $form = 0 ) {
-		parent::__construct( $form );
+     * Get the form if ID is passed, otherwise the form is new and empty.
+     *
+     * @param  int|object|GetPaid_Payment_Form|WP_Post $form Form to read.
+     */
+    public function __construct( $form = 0 ) {
+        parent::__construct( $form );
 
-		if ( is_numeric( $form ) && $form > 0 ) {
-			$this->set_id( $form );
-		} elseif ( $form instanceof self ) {
+        if ( is_numeric( $form ) && $form > 0 ) {
+            $this->set_id( $form );
+        } elseif ( $form instanceof self ) {
 
-			$this->set_id( $form->get_id() );
-			$this->invoice = $form->invoice;
+            $this->set_id( $form->get_id() );
+            $this->invoice = $form->invoice;
 
-		} elseif ( ! empty( $form->ID ) ) {
-			$this->set_id( $form->ID );
-		} else {
-			$this->set_object_read( true );
-		}
+        } elseif ( ! empty( $form->ID ) ) {
+            $this->set_id( $form->ID );
+        } else {
+            $this->set_object_read( true );
+        }
 
         // Load the datastore.
-		$this->data_store = GetPaid_Data_Store::load( $this->data_store_name );
+        $this->data_store = GetPaid_Data_Store::load( $this->data_store_name );
 
-		if ( $this->get_id() > 0 ) {
+        if ( $this->get_id() > 0 ) {
             $this->post = get_post( $this->get_id() );
-			$this->data_store->read( $this );
+            $this->data_store->read( $this );
         }
 
-	}
+    }
 
     /*
 	|--------------------------------------------------------------------------
@@ -114,356 +114,356 @@ 
     */
 
     /**
-	 * Get plugin version when the form was created.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_version( $context = 'view' ) {
-		return $this->get_prop( 'version', $context );
+     * Get plugin version when the form was created.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_version( $context = 'view' ) {
+        return $this->get_prop( 'version', $context );
     }
 
     /**
-	 * Get date when the form was created.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_date_created( $context = 'view' ) {
-		return $this->get_prop( 'date_created', $context );
+     * Get date when the form was created.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_date_created( $context = 'view' ) {
+        return $this->get_prop( 'date_created', $context );
     }
 
     /**
-	 * Get GMT date when the form was created.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_date_created_gmt( $context = 'view' ) {
+     * Get GMT date when the form was created.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_date_created_gmt( $context = 'view' ) {
         $date = $this->get_date_created( $context );
 
         if ( $date ) {
             $date = get_gmt_from_date( $date );
         }
-		return $date;
+        return $date;
     }
 
     /**
-	 * Get date when the form was last modified.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_date_modified( $context = 'view' ) {
-		return $this->get_prop( 'date_modified', $context );
+     * Get date when the form was last modified.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_date_modified( $context = 'view' ) {
+        return $this->get_prop( 'date_modified', $context );
     }
 
     /**
-	 * Get GMT date when the form was last modified.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_date_modified_gmt( $context = 'view' ) {
+     * Get GMT date when the form was last modified.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_date_modified_gmt( $context = 'view' ) {
         $date = $this->get_date_modified( $context );
 
         if ( $date ) {
             $date = get_gmt_from_date( $date );
         }
-		return $date;
+        return $date;
     }
 
     /**
-	 * Get the form name.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_name( $context = 'view' ) {
-		return $this->get_prop( 'name', $context );
+     * Get the form name.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_name( $context = 'view' ) {
+        return $this->get_prop( 'name', $context );
     }
 
     /**
-	 * Alias of self::get_name().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_title( $context = 'view' ) {
-		return $this->get_name( $context );
-	}
+     * Alias of self::get_name().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_title( $context = 'view' ) {
+        return $this->get_name( $context );
+    }
 
     /**
-	 * Get the owner of the form.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
-	public function get_author( $context = 'view' ) {
-		return (int) $this->get_prop( 'author', $context );
+     * Get the owner of the form.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
+    public function get_author( $context = 'view' ) {
+        return (int) $this->get_prop( 'author', $context );
     }
 
     /**
-	 * Get the elements that make up the form.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return array
-	 */
-	public function get_elements( $context = 'view' ) {
-		$elements = $this->get_prop( 'elements', $context );
+     * Get the elements that make up the form.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return array
+     */
+    public function get_elements( $context = 'view' ) {
+        $elements = $this->get_prop( 'elements', $context );
 
-		if ( empty( $elements ) || ! is_array( $elements ) ) {
+        if ( empty( $elements ) || ! is_array( $elements ) ) {
             return wpinv_get_data( 'sample-payment-form' );
-		}
+        }
 
-		// Ensure that all required elements exist.
-		$_elements = array();
-		foreach ( $elements as $element ) {
+        // Ensure that all required elements exist.
+        $_elements = array();
+        foreach ( $elements as $element ) {
 
-			if ( $element['type'] == 'pay_button' && ! $this->has_element_type( 'gateway_select' ) ) {
+            if ( $element['type'] == 'pay_button' && ! $this->has_element_type( 'gateway_select' ) ) {
 
-				$_elements[] = array(
-					'text'    => __( 'Select Payment Method', 'invoicing' ),
-					'id'      => 'gtscicd',
-					'name'    => 'gtscicd',
-					'type'    => 'gateway_select',
-					'premade' => true,
+                $_elements[] = array(
+                    'text'    => __( 'Select Payment Method', 'invoicing' ),
+                    'id'      => 'gtscicd',
+                    'name'    => 'gtscicd',
+                    'type'    => 'gateway_select',
+                    'premade' => true,
 
-				);
+                );
 
-			}
+            }
 
-			$_elements[] = $element;
+            $_elements[] = $element;
 
-		}
+        }
 
         return $_elements;
-	}
-
-	/**
-	 * Get the items sold via the form.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @param  string $return objects or arrays.
-	 * @return GetPaid_Form_Item[]
-	 */
-	public function get_items( $context = 'view', $return = 'objects' ) {
-		$items = $this->get_prop( 'items', $context );
-
-		if ( empty( $items ) || ! is_array( $items ) ) {
+    }
+
+    /**
+     * Get the items sold via the form.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @param  string $return objects or arrays.
+     * @return GetPaid_Form_Item[]
+     */
+    public function get_items( $context = 'view', $return = 'objects' ) {
+        $items = $this->get_prop( 'items', $context );
+
+        if ( empty( $items ) || ! is_array( $items ) ) {
             $items = wpinv_get_data( 'sample-payment-form-items' );
-		}
+        }
+
+        // Convert the items.
+        $prepared = array();
+
+        foreach ( $items as $key => $value ) {
+
+            // Form items.
+            if ( $value instanceof GetPaid_Form_Item ) {
+
+                if ( $value->can_purchase() ) {
+                    $prepared[] = $value;
+                }
 
-		// Convert the items.
-		$prepared = array();
+                continue;
 
-		foreach ( $items as $key => $value ) {
+            }
 
-			// Form items.
-			if ( $value instanceof GetPaid_Form_Item ) {
+            // $item_id => $quantity (buy buttons)
+            if ( is_numeric( $key ) && is_numeric( $value ) ) {
+                $item = new GetPaid_Form_Item( $key );
 
-				if ( $value->can_purchase() ) {
-					$prepared[] = $value;
-				}
+                if ( $item->can_purchase() ) {
 
-				continue;
+                    $value = (float) $value;
+                    $item->set_quantity( $value );
+                    if ( 0 == $value ) {
+                        $item->set_quantity( 1 );
+                        $item->set_allow_quantities( true );
+                    }
 
-			}
+                    $prepared[] = $item;
+                }
 
-			// $item_id => $quantity (buy buttons)
-			if ( is_numeric( $key ) && is_numeric( $value ) ) {
-				$item = new GetPaid_Form_Item( $key );
+                continue;
+            }
 
-				if ( $item->can_purchase() ) {
+            // Items saved via payment forms editor.
+            if ( is_array( $value ) && isset( $value['id'] ) ) {
 
-					$value = (float) $value;
-					$item->set_quantity( $value );
-					if ( 0 == $value ) {
-						$item->set_quantity( 1 );
-						$item->set_allow_quantities( true );
-					}
+                $item = new GetPaid_Form_Item( $value['id'] );
 
-					$prepared[] = $item;
-				}
+                if ( ! $item->can_purchase() ) {
+                    continue;
+                }
 
-				continue;
-			}
+                // Sub-total (Cart items).
+                if ( isset( $value['subtotal'] ) ) {
+                    $item->set_price( $value['subtotal'] );
+                }
 
-			// Items saved via payment forms editor.
-			if ( is_array( $value ) && isset( $value['id'] ) ) {
+                if ( isset( $value['quantity'] ) ) {
+                    $item->set_quantity( $value['quantity'] );
+                }
 
-				$item = new GetPaid_Form_Item( $value['id'] );
+                if ( isset( $value['allow_quantities'] ) ) {
+                    $item->set_allow_quantities( $value['allow_quantities'] );
+                }
 
-				if ( ! $item->can_purchase() ) {
-					continue;
-				}
+                if ( isset( $value['required'] ) ) {
+                    $item->set_is_required( $value['required'] );
+                }
 
-				// Sub-total (Cart items).
-				if ( isset( $value['subtotal'] ) ) {
-					$item->set_price( $value['subtotal'] );
-				}
+                if ( isset( $value['description'] ) ) {
+                    $item->set_custom_description( $value['description'] );
+                }
 
-				if ( isset( $value['quantity'] ) ) {
-					$item->set_quantity( $value['quantity'] );
-				}
+                $prepared[] = $item;
+                continue;
 
-				if ( isset( $value['allow_quantities'] ) ) {
-					$item->set_allow_quantities( $value['allow_quantities'] );
-				}
+            }
 
-				if ( isset( $value['required'] ) ) {
-					$item->set_is_required( $value['required'] );
-				}
+            // $item_id => array( 'price' => 10 ) (item variations)
+            if ( is_numeric( $key ) && is_array( $value ) ) {
+                $item = new GetPaid_Form_Item( $key );
 
-				if ( isset( $value['description'] ) ) {
-					$item->set_custom_description( $value['description'] );
-				}
+                if ( isset( $value['price'] ) && $item->user_can_set_their_price() ) {
+                    $item->set_price( $value['price'] );
+                }
 
-				$prepared[] = $item;
-				continue;
+                if ( $item->can_purchase() ) {
+                    $prepared[] = $item;
+                }
 
-			}
-
-			// $item_id => array( 'price' => 10 ) (item variations)
-			if ( is_numeric( $key ) && is_array( $value ) ) {
-				$item = new GetPaid_Form_Item( $key );
-
-				if ( isset( $value['price'] ) && $item->user_can_set_their_price() ) {
-					$item->set_price( $value['price'] );
-				}
-
-				if ( $item->can_purchase() ) {
-					$prepared[] = $item;
-				}
-
-				continue;
-			}
-		}
-
-		if ( 'objects' == $return && 'view' == $context ) {
-			return $prepared;
-		}
-
-		$items = array();
-		foreach ( $prepared as $item ) {
-			$items[] = $item->prepare_data_for_use();
-		}
-
-		return $items;
-	}
-
-	/**
-	 * Get a single item belonging to the form.
-	 *
-	 * @since 1.0.19
-	 * @param  int $item_id The item id to return.
-	 * @return GetPaid_Form_Item|bool
-	 */
-	public function get_item( $item_id ) {
-
-		if ( empty( $item_id ) || ! is_numeric( $item_id ) ) {
-			return false;
-		}
-
-		foreach ( $this->get_items() as $item ) {
-			if ( $item->get_id() == (int) $item_id ) {
-				return $item;
-			}
-		}
-
-		return false;
-
-	}
-
-	/**
-	 * Gets a single element.
-	 *
-	 * @since 1.0.19
-	 * @param  string $element_type The element type to return.
-	 * @return array|bool
-	 */
-	public function get_element_type( $element_type ) {
-
-		if ( empty( $element_type ) || ! is_scalar( $element_type ) ) {
-			return false;
-		}
-
-		foreach ( $this->get_prop( 'elements' ) as $element ) {
-
-			if ( $element['type'] === $element_type ) {
-				return $element;
-			}
-		}
-
-		return false;
-
-	}
-
-	/**
-	 * Get the total amount earned via this form.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_earned( $context = 'view' ) {
-		return $this->get_prop( 'earned', $context );
-	}
-
-	/**
-	 * Get the total amount refunded via this form.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_refunded( $context = 'view' ) {
-		return $this->get_prop( 'refunded', $context );
-	}
-
-	/**
-	 * Get the total amount cancelled via this form.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_cancelled( $context = 'view' ) {
-		return $this->get_prop( 'cancelled', $context );
-	}
-
-	/**
-	 * Get the total amount failed via this form.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_failed( $context = 'view' ) {
-		return $this->get_prop( 'failed', $context );
-	}
-
-	/**
-	 * Get the currency.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_currency() {
-		$currency = empty( $this->invoice ) ? wpinv_get_currency() : $this->invoice->get_currency();
-		return apply_filters( 'getpaid-payment-form-currency', $currency, $this );
-	}
+                continue;
+            }
+        }
+
+        if ( 'objects' == $return && 'view' == $context ) {
+            return $prepared;
+        }
+
+        $items = array();
+        foreach ( $prepared as $item ) {
+            $items[] = $item->prepare_data_for_use();
+        }
+
+        return $items;
+    }
+
+    /**
+     * Get a single item belonging to the form.
+     *
+     * @since 1.0.19
+     * @param  int $item_id The item id to return.
+     * @return GetPaid_Form_Item|bool
+     */
+    public function get_item( $item_id ) {
+
+        if ( empty( $item_id ) || ! is_numeric( $item_id ) ) {
+            return false;
+        }
+
+        foreach ( $this->get_items() as $item ) {
+            if ( $item->get_id() == (int) $item_id ) {
+                return $item;
+            }
+        }
+
+        return false;
+
+    }
+
+    /**
+     * Gets a single element.
+     *
+     * @since 1.0.19
+     * @param  string $element_type The element type to return.
+     * @return array|bool
+     */
+    public function get_element_type( $element_type ) {
+
+        if ( empty( $element_type ) || ! is_scalar( $element_type ) ) {
+            return false;
+        }
+
+        foreach ( $this->get_prop( 'elements' ) as $element ) {
+
+            if ( $element['type'] === $element_type ) {
+                return $element;
+            }
+        }
+
+        return false;
+
+    }
+
+    /**
+     * Get the total amount earned via this form.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_earned( $context = 'view' ) {
+        return $this->get_prop( 'earned', $context );
+    }
+
+    /**
+     * Get the total amount refunded via this form.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_refunded( $context = 'view' ) {
+        return $this->get_prop( 'refunded', $context );
+    }
+
+    /**
+     * Get the total amount cancelled via this form.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_cancelled( $context = 'view' ) {
+        return $this->get_prop( 'cancelled', $context );
+    }
+
+    /**
+     * Get the total amount failed via this form.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_failed( $context = 'view' ) {
+        return $this->get_prop( 'failed', $context );
+    }
+
+    /**
+     * Get the currency.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_currency() {
+        $currency = empty( $this->invoice ) ? wpinv_get_currency() : $this->invoice->get_currency();
+        return apply_filters( 'getpaid-payment-form-currency', $currency, $this );
+    }
 
     /*
 	|--------------------------------------------------------------------------
@@ -476,22 +476,22 @@ 
     */
 
     /**
-	 * Set plugin version when the item was created.
-	 *
-	 * @since 1.0.19
-	 */
-	public function set_version( $value ) {
-		$this->set_prop( 'version', $value );
+     * Set plugin version when the item was created.
+     *
+     * @since 1.0.19
+     */
+    public function set_version( $value ) {
+        $this->set_prop( 'version', $value );
     }
 
     /**
-	 * Set date when the item was created.
-	 *
-	 * @since 1.0.19
-	 * @param string $value Value to set.
+     * Set date when the item was created.
+     *
+     * @since 1.0.19
+     * @param string $value Value to set.
      * @return bool Whether or not the date was set.
-	 */
-	public function set_date_created( $value ) {
+     */
+    public function set_date_created( $value ) {
         $date = strtotime( $value );
 
         if ( $date ) {
@@ -504,13 +504,13 @@ 
     }
 
     /**
-	 * Set date when the item was last modified.
-	 *
-	 * @since 1.0.19
-	 * @param string $value Value to set.
+     * Set date when the item was last modified.
+     *
+     * @since 1.0.19
+     * @param string $value Value to set.
      * @return bool Whether or not the date was set.
-	 */
-	public function set_date_modified( $value ) {
+     */
+    public function set_date_modified( $value ) {
         $date = strtotime( $value );
 
         if ( $date ) {
@@ -523,164 +523,164 @@ 
     }
 
     /**
-	 * Set the item name.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value New name.
-	 */
-	public function set_name( $value ) {
-		$this->set_prop( 'name', sanitize_text_field( $value ) );
-    }
-
-    /**
-	 * Alias of self::set_name().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value New name.
-	 */
-	public function set_title( $value ) {
-		$this->set_name( $value );
-    }
-
-    /**
-	 * Set the owner of the item.
-	 *
-	 * @since 1.0.19
-	 * @param  int $value New author.
-	 */
-	public function set_author( $value ) {
-		$this->set_prop( 'author', (int) $value );
-	}
-
-	/**
-	 * Set the form elements.
-	 *
-	 * @since 1.0.19
-	 * @sinve 2.3.4 Array values sanitized.
-	 * @param  array $value Form elements.
-	 */
-	public function set_elements( $value ) {
-		if ( is_array( $value ) ) {
-			$this->set_prop( 'elements', wp_kses_post_deep( $value ) );
-		}
-	}
-
-	/**
-	 * Sanitize array values.
-	 *
-	 * @param $value
-	 *
-	 * @return mixed
-	 */
-	public function sanitize_array_values( $value ) {
-
-		// sanitize
-		if ( ! empty( $value ) ) {
-
-			foreach ( $value as $key => $val_arr ) {
-
-				if ( is_array( $val_arr ) ) {
-					// check if we have sub array items.
-					$sub_arr = array();
-					foreach ( $val_arr as $key2 => $val2 ) {
-						if ( is_array( $val2 ) ) {
-							$sub_arr[ $key2 ] = $this->sanitize_array_values( $val2 );
-							unset( $val_arr[ $key ][ $key2 ] );
-						}
-					}
-
-					// we allow some html in description so we sanitize it separately.
-					$help_text = ! empty( $val_arr['description'] ) ? wp_kses_post( $val_arr['description'] ) : '';
-
-					// sanitize array elements
-					$value[ $key ] = array_map( 'sanitize_text_field', $val_arr );
-
-					// add back the description if set
-					if ( isset( $val_arr['description'] ) ) {
+     * Set the item name.
+     *
+     * @since 1.0.19
+     * @param  string $value New name.
+     */
+    public function set_name( $value ) {
+        $this->set_prop( 'name', sanitize_text_field( $value ) );
+    }
+
+    /**
+     * Alias of self::set_name().
+     *
+     * @since 1.0.19
+     * @param  string $value New name.
+     */
+    public function set_title( $value ) {
+        $this->set_name( $value );
+    }
+
+    /**
+     * Set the owner of the item.
+     *
+     * @since 1.0.19
+     * @param  int $value New author.
+     */
+    public function set_author( $value ) {
+        $this->set_prop( 'author', (int) $value );
+    }
+
+    /**
+     * Set the form elements.
+     *
+     * @since 1.0.19
+     * @sinve 2.3.4 Array values sanitized.
+     * @param  array $value Form elements.
+     */
+    public function set_elements( $value ) {
+        if ( is_array( $value ) ) {
+            $this->set_prop( 'elements', wp_kses_post_deep( $value ) );
+        }
+    }
+
+    /**
+     * Sanitize array values.
+     *
+     * @param $value
+     *
+     * @return mixed
+     */
+    public function sanitize_array_values( $value ) {
+
+        // sanitize
+        if ( ! empty( $value ) ) {
+
+            foreach ( $value as $key => $val_arr ) {
+
+                if ( is_array( $val_arr ) ) {
+                    // check if we have sub array items.
+                    $sub_arr = array();
+                    foreach ( $val_arr as $key2 => $val2 ) {
+                        if ( is_array( $val2 ) ) {
+                            $sub_arr[ $key2 ] = $this->sanitize_array_values( $val2 );
+                            unset( $val_arr[ $key ][ $key2 ] );
+                        }
+                    }
+
+                    // we allow some html in description so we sanitize it separately.
+                    $help_text = ! empty( $val_arr['description'] ) ? wp_kses_post( $val_arr['description'] ) : '';
+
+                    // sanitize array elements
+                    $value[ $key ] = array_map( 'sanitize_text_field', $val_arr );
+
+                    // add back the description if set
+                    if ( isset( $val_arr['description'] ) ) {
 $value[ $key ]['description'] = $help_text;}
 
-					// add back sub array items after its been sanitized.
-					if ( ! empty( $sub_arr ) ) {
-						$value[ $key ] = array_merge( $value[ $key ], $sub_arr );
-					}
-				}
+                    // add back sub array items after its been sanitized.
+                    if ( ! empty( $sub_arr ) ) {
+                        $value[ $key ] = array_merge( $value[ $key ], $sub_arr );
+                    }
+                }
 }
 }
 
-		return $value;
-	}
-
-	/**
-	 * Set the form items.
-	 *
-	 * @since 1.0.19
-	 * @param  array $value Form elements.
-	 */
-	public function set_items( $value ) {
-		if ( is_array( $value ) ) {
-			$this->set_prop( 'items', $value );
-		}
-	}
-
-	/**
-	 * Set the total amount earned via this form.
-	 *
-	 * @since 1.0.19
-	 * @param  float $value Amount earned.
-	 */
-	public function set_earned( $value ) {
-		$value = max( (float) $value, 0 );
-		$this->set_prop( 'earned', $value );
-	}
-
-	/**
-	 * Set the total amount refunded via this form.
-	 *
-	 * @since 1.0.19
-	 * @param  float $value Amount refunded.
-	 */
-	public function set_refunded( $value ) {
-		$value = max( (float) $value, 0 );
-		$this->set_prop( 'refunded', $value );
-	}
-
-	/**
-	 * Set the total amount cancelled via this form.
-	 *
-	 * @since 1.0.19
-	 * @param  float $value Amount cancelled.
-	 */
-	public function set_cancelled( $value ) {
-		$value = max( (float) $value, 0 );
-		$this->set_prop( 'cancelled', $value );
-	}
-
-	/**
-	 * Set the total amount failed via this form.
-	 *
-	 * @since 1.0.19
-	 * @param  float $value Amount cancelled.
-	 */
-	public function set_failed( $value ) {
-		$value = max( (float) $value, 0 );
-		$this->set_prop( 'failed', $value );
-	}
+        return $value;
+    }
+
+    /**
+     * Set the form items.
+     *
+     * @since 1.0.19
+     * @param  array $value Form elements.
+     */
+    public function set_items( $value ) {
+        if ( is_array( $value ) ) {
+            $this->set_prop( 'items', $value );
+        }
+    }
+
+    /**
+     * Set the total amount earned via this form.
+     *
+     * @since 1.0.19
+     * @param  float $value Amount earned.
+     */
+    public function set_earned( $value ) {
+        $value = max( (float) $value, 0 );
+        $this->set_prop( 'earned', $value );
+    }
+
+    /**
+     * Set the total amount refunded via this form.
+     *
+     * @since 1.0.19
+     * @param  float $value Amount refunded.
+     */
+    public function set_refunded( $value ) {
+        $value = max( (float) $value, 0 );
+        $this->set_prop( 'refunded', $value );
+    }
+
+    /**
+     * Set the total amount cancelled via this form.
+     *
+     * @since 1.0.19
+     * @param  float $value Amount cancelled.
+     */
+    public function set_cancelled( $value ) {
+        $value = max( (float) $value, 0 );
+        $this->set_prop( 'cancelled', $value );
+    }
+
+    /**
+     * Set the total amount failed via this form.
+     *
+     * @since 1.0.19
+     * @param  float $value Amount cancelled.
+     */
+    public function set_failed( $value ) {
+        $value = max( (float) $value, 0 );
+        $this->set_prop( 'failed', $value );
+    }
 
     /**
      * Create an item. For backwards compatibilty.
      *
      * @deprecated
-	 * @return int item id
+     * @return int item id
      */
     public function create( $data = array() ) {
 
-		// Set the properties.
-		if ( is_array( $data ) ) {
-			$this->set_props( $data );
-		}
+        // Set the properties.
+        if ( is_array( $data ) ) {
+            $this->set_props( $data );
+        }
 
-		// Save the item.
-		return $this->save();
+        // Save the item.
+        return $this->save();
 
     }
 
@@ -688,7 +688,7 @@ 
      * Updates an item. For backwards compatibilty.
      *
      * @deprecated
-	 * @return int item id
+     * @return int item id
      */
     public function update( $data = array() ) {
         return $this->create( $data );
@@ -704,22 +704,22 @@ 
 	*/
 
     /**
-	 * Checks whether this is the default payment form.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
+     * Checks whether this is the default payment form.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
     public function is_default() {
         $is_default = $this->get_id() == wpinv_get_default_payment_form();
         return (bool) apply_filters( 'wpinv_is_default_payment_form', $is_default, $this->get_id(), $this );
-	}
+    }
 
     /**
-	 * Checks whether the form is active.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
+     * Checks whether the form is active.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
     public function is_active() {
         $is_active = 0 !== (int) $this->get_id();
 
@@ -728,81 +728,81 @@ 
         }
 
         return (bool) apply_filters( 'wpinv_is_payment_form_active', $is_active, $this );
-	}
-
-	/**
-	 * Checks whether the form has a given item.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
+    }
+
+    /**
+     * Checks whether the form has a given item.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
     public function has_item( $item_id ) {
         return false !== $this->get_item( $item_id );
-	}
-
-	/**
-	 * Checks whether the form has a given element.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
+    }
+
+    /**
+     * Checks whether the form has a given element.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
     public function has_element_type( $element_type ) {
         return false !== $this->get_element_type( $element_type );
-	}
-
-	/**
-	 * Checks whether this form is recurring or not.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
+    }
+
+    /**
+     * Checks whether this form is recurring or not.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
     public function is_recurring() {
 
-		if ( ! empty( $this->invoice ) ) {
-			return $this->invoice->is_recurring();
-		}
+        if ( ! empty( $this->invoice ) ) {
+            return $this->invoice->is_recurring();
+        }
 
-		foreach ( $this->get_items() as $item ) {
+        foreach ( $this->get_items() as $item ) {
 
-			if ( $item->is_recurring() ) {
-				return true;
-			}
+            if ( $item->is_recurring() ) {
+                return true;
+            }
 }
 
         return false;
-	}
+    }
 
-	/**
-	 * Retrieves the form's html.
-	 *
-	 * @since 1.0.19
-	 */
+    /**
+     * Retrieves the form's html.
+     *
+     * @since 1.0.19
+     */
     public function get_html( $extra_markup = '' ) {
 
-		// Return the HTML.
-		return wpinv_get_template_html(
-			'payment-forms/form.php',
-			array(
-				'form'         => $this,
-				'extra_markup' => $extra_markup,
-			)
-		);
-
-	}
-
-	/**
-	 * Displays the payment form.
-	 *
-	 * @since 1.0.19
-	 */
+        // Return the HTML.
+        return wpinv_get_template_html(
+            'payment-forms/form.php',
+            array(
+                'form'         => $this,
+                'extra_markup' => $extra_markup,
+            )
+        );
+
+    }
+
+    /**
+     * Displays the payment form.
+     *
+     * @since 1.0.19
+     */
     public function display( $extra_markup = '' ) {
-		wpinv_get_template(
-			'payment-forms/form.php',
-			array(
-				'form'         => $this,
-				'extra_markup' => $extra_markup,
-			)
-		);
+        wpinv_get_template(
+            'payment-forms/form.php',
+            array(
+                'form'         => $this,
+                'extra_markup' => $extra_markup,
+            )
+        );
     }
 
 }

Spacing +158 added lines, -158 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -72,28 +72,28 @@ 
 	 *
 	 * @param  int|object|GetPaid_Payment_Form|WP_Post $form Form to read.
 	 */
-	public function __construct( $form = 0 ) {
-		parent::__construct( $form );
+	public function __construct($form = 0) {
+		parent::__construct($form);
 
-		if ( is_numeric( $form ) && $form > 0 ) {
-			$this->set_id( $form );
-		} elseif ( $form instanceof self ) {
+		if (is_numeric($form) && $form > 0) {
+			$this->set_id($form);
+		} elseif ($form instanceof self) {
 
-			$this->set_id( $form->get_id() );
+			$this->set_id($form->get_id());
 			$this->invoice = $form->invoice;
 
-		} elseif ( ! empty( $form->ID ) ) {
-			$this->set_id( $form->ID );
+		} elseif (!empty($form->ID)) {
+			$this->set_id($form->ID);
 		} else {
-			$this->set_object_read( true );
+			$this->set_object_read(true);
 		}
 
         // Load the datastore.
-		$this->data_store = GetPaid_Data_Store::load( $this->data_store_name );
+		$this->data_store = GetPaid_Data_Store::load($this->data_store_name);
 
-		if ( $this->get_id() > 0 ) {
-            $this->post = get_post( $this->get_id() );
-			$this->data_store->read( $this );
+		if ($this->get_id() > 0) {
+            $this->post = get_post($this->get_id());
+			$this->data_store->read($this);
         }
 
 	}
@@ -120,8 +120,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_version( $context = 'view' ) {
-		return $this->get_prop( 'version', $context );
+	public function get_version($context = 'view') {
+		return $this->get_prop('version', $context);
     }
 
     /**
@@ -131,8 +131,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_date_created( $context = 'view' ) {
-		return $this->get_prop( 'date_created', $context );
+	public function get_date_created($context = 'view') {
+		return $this->get_prop('date_created', $context);
     }
 
     /**
@@ -142,11 +142,11 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_date_created_gmt( $context = 'view' ) {
-        $date = $this->get_date_created( $context );
+	public function get_date_created_gmt($context = 'view') {
+        $date = $this->get_date_created($context);
 
-        if ( $date ) {
-            $date = get_gmt_from_date( $date );
+        if ($date) {
+            $date = get_gmt_from_date($date);
         }
 		return $date;
     }
@@ -158,8 +158,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_date_modified( $context = 'view' ) {
-		return $this->get_prop( 'date_modified', $context );
+	public function get_date_modified($context = 'view') {
+		return $this->get_prop('date_modified', $context);
     }
 
     /**
@@ -169,11 +169,11 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_date_modified_gmt( $context = 'view' ) {
-        $date = $this->get_date_modified( $context );
+	public function get_date_modified_gmt($context = 'view') {
+        $date = $this->get_date_modified($context);
 
-        if ( $date ) {
-            $date = get_gmt_from_date( $date );
+        if ($date) {
+            $date = get_gmt_from_date($date);
         }
 		return $date;
     }
@@ -185,8 +185,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_name( $context = 'view' ) {
-		return $this->get_prop( 'name', $context );
+	public function get_name($context = 'view') {
+		return $this->get_prop('name', $context);
     }
 
     /**
@@ -196,8 +196,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return string
 	 */
-	public function get_title( $context = 'view' ) {
-		return $this->get_name( $context );
+	public function get_title($context = 'view') {
+		return $this->get_name($context);
 	}
 
     /**
@@ -207,8 +207,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return int
 	 */
-	public function get_author( $context = 'view' ) {
-		return (int) $this->get_prop( 'author', $context );
+	public function get_author($context = 'view') {
+		return (int) $this->get_prop('author', $context);
     }
 
     /**
@@ -218,21 +218,21 @@ 
 	 * @param  string $context View or edit context.
 	 * @return array
 	 */
-	public function get_elements( $context = 'view' ) {
-		$elements = $this->get_prop( 'elements', $context );
+	public function get_elements($context = 'view') {
+		$elements = $this->get_prop('elements', $context);
 
-		if ( empty( $elements ) || ! is_array( $elements ) ) {
-            return wpinv_get_data( 'sample-payment-form' );
+		if (empty($elements) || !is_array($elements)) {
+            return wpinv_get_data('sample-payment-form');
 		}
 
 		// Ensure that all required elements exist.
 		$_elements = array();
-		foreach ( $elements as $element ) {
+		foreach ($elements as $element) {
 
-			if ( $element['type'] == 'pay_button' && ! $this->has_element_type( 'gateway_select' ) ) {
+			if ($element['type'] == 'pay_button' && !$this->has_element_type('gateway_select')) {
 
 				$_elements[] = array(
-					'text'    => __( 'Select Payment Method', 'invoicing' ),
+					'text'    => __('Select Payment Method', 'invoicing'),
 					'id'      => 'gtscicd',
 					'name'    => 'gtscicd',
 					'type'    => 'gateway_select',
@@ -257,22 +257,22 @@ 
 	 * @param  string $return objects or arrays.
 	 * @return GetPaid_Form_Item[]
 	 */
-	public function get_items( $context = 'view', $return = 'objects' ) {
-		$items = $this->get_prop( 'items', $context );
+	public function get_items($context = 'view', $return = 'objects') {
+		$items = $this->get_prop('items', $context);
 
-		if ( empty( $items ) || ! is_array( $items ) ) {
-            $items = wpinv_get_data( 'sample-payment-form-items' );
+		if (empty($items) || !is_array($items)) {
+            $items = wpinv_get_data('sample-payment-form-items');
 		}
 
 		// Convert the items.
 		$prepared = array();
 
-		foreach ( $items as $key => $value ) {
+		foreach ($items as $key => $value) {
 
 			// Form items.
-			if ( $value instanceof GetPaid_Form_Item ) {
+			if ($value instanceof GetPaid_Form_Item) {
 
-				if ( $value->can_purchase() ) {
+				if ($value->can_purchase()) {
 					$prepared[] = $value;
 				}
 
@@ -281,16 +281,16 @@ 
 			}
 
 			// $item_id => $quantity (buy buttons)
-			if ( is_numeric( $key ) && is_numeric( $value ) ) {
-				$item = new GetPaid_Form_Item( $key );
+			if (is_numeric($key) && is_numeric($value)) {
+				$item = new GetPaid_Form_Item($key);
 
-				if ( $item->can_purchase() ) {
+				if ($item->can_purchase()) {
 
 					$value = (float) $value;
-					$item->set_quantity( $value );
-					if ( 0 == $value ) {
-						$item->set_quantity( 1 );
-						$item->set_allow_quantities( true );
+					$item->set_quantity($value);
+					if (0 == $value) {
+						$item->set_quantity(1);
+						$item->set_allow_quantities(true);
 					}
 
 					$prepared[] = $item;
@@ -300,33 +300,33 @@ 
 			}
 
 			// Items saved via payment forms editor.
-			if ( is_array( $value ) && isset( $value['id'] ) ) {
+			if (is_array($value) && isset($value['id'])) {
 
-				$item = new GetPaid_Form_Item( $value['id'] );
+				$item = new GetPaid_Form_Item($value['id']);
 
-				if ( ! $item->can_purchase() ) {
+				if (!$item->can_purchase()) {
 					continue;
 				}
 
 				// Sub-total (Cart items).
-				if ( isset( $value['subtotal'] ) ) {
-					$item->set_price( $value['subtotal'] );
+				if (isset($value['subtotal'])) {
+					$item->set_price($value['subtotal']);
 				}
 
-				if ( isset( $value['quantity'] ) ) {
-					$item->set_quantity( $value['quantity'] );
+				if (isset($value['quantity'])) {
+					$item->set_quantity($value['quantity']);
 				}
 
-				if ( isset( $value['allow_quantities'] ) ) {
-					$item->set_allow_quantities( $value['allow_quantities'] );
+				if (isset($value['allow_quantities'])) {
+					$item->set_allow_quantities($value['allow_quantities']);
 				}
 
-				if ( isset( $value['required'] ) ) {
-					$item->set_is_required( $value['required'] );
+				if (isset($value['required'])) {
+					$item->set_is_required($value['required']);
 				}
 
-				if ( isset( $value['description'] ) ) {
-					$item->set_custom_description( $value['description'] );
+				if (isset($value['description'])) {
+					$item->set_custom_description($value['description']);
 				}
 
 				$prepared[] = $item;
@@ -335,14 +335,14 @@ 
 			}
 
 			// $item_id => array( 'price' => 10 ) (item variations)
-			if ( is_numeric( $key ) && is_array( $value ) ) {
-				$item = new GetPaid_Form_Item( $key );
+			if (is_numeric($key) && is_array($value)) {
+				$item = new GetPaid_Form_Item($key);
 
-				if ( isset( $value['price'] ) && $item->user_can_set_their_price() ) {
-					$item->set_price( $value['price'] );
+				if (isset($value['price']) && $item->user_can_set_their_price()) {
+					$item->set_price($value['price']);
 				}
 
-				if ( $item->can_purchase() ) {
+				if ($item->can_purchase()) {
 					$prepared[] = $item;
 				}
 
@@ -350,12 +350,12 @@ 
 			}
 		}
 
-		if ( 'objects' == $return && 'view' == $context ) {
+		if ('objects' == $return && 'view' == $context) {
 			return $prepared;
 		}
 
 		$items = array();
-		foreach ( $prepared as $item ) {
+		foreach ($prepared as $item) {
 			$items[] = $item->prepare_data_for_use();
 		}
 
@@ -369,14 +369,14 @@ 
 	 * @param  int $item_id The item id to return.
 	 * @return GetPaid_Form_Item|bool
 	 */
-	public function get_item( $item_id ) {
+	public function get_item($item_id) {
 
-		if ( empty( $item_id ) || ! is_numeric( $item_id ) ) {
+		if (empty($item_id) || !is_numeric($item_id)) {
 			return false;
 		}
 
-		foreach ( $this->get_items() as $item ) {
-			if ( $item->get_id() == (int) $item_id ) {
+		foreach ($this->get_items() as $item) {
+			if ($item->get_id() == (int) $item_id) {
 				return $item;
 			}
 		}
@@ -392,15 +392,15 @@ 
 	 * @param  string $element_type The element type to return.
 	 * @return array|bool
 	 */
-	public function get_element_type( $element_type ) {
+	public function get_element_type($element_type) {
 
-		if ( empty( $element_type ) || ! is_scalar( $element_type ) ) {
+		if (empty($element_type) || !is_scalar($element_type)) {
 			return false;
 		}
 
-		foreach ( $this->get_prop( 'elements' ) as $element ) {
+		foreach ($this->get_prop('elements') as $element) {
 
-			if ( $element['type'] === $element_type ) {
+			if ($element['type'] === $element_type) {
 				return $element;
 			}
 		}
@@ -416,8 +416,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return float
 	 */
-	public function get_earned( $context = 'view' ) {
-		return $this->get_prop( 'earned', $context );
+	public function get_earned($context = 'view') {
+		return $this->get_prop('earned', $context);
 	}
 
 	/**
@@ -427,8 +427,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return float
 	 */
-	public function get_refunded( $context = 'view' ) {
-		return $this->get_prop( 'refunded', $context );
+	public function get_refunded($context = 'view') {
+		return $this->get_prop('refunded', $context);
 	}
 
 	/**
@@ -438,8 +438,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return float
 	 */
-	public function get_cancelled( $context = 'view' ) {
-		return $this->get_prop( 'cancelled', $context );
+	public function get_cancelled($context = 'view') {
+		return $this->get_prop('cancelled', $context);
 	}
 
 	/**
@@ -449,8 +449,8 @@ 
 	 * @param  string $context View or edit context.
 	 * @return float
 	 */
-	public function get_failed( $context = 'view' ) {
-		return $this->get_prop( 'failed', $context );
+	public function get_failed($context = 'view') {
+		return $this->get_prop('failed', $context);
 	}
 
 	/**
@@ -461,8 +461,8 @@ 
 	 * @return string
 	 */
 	public function get_currency() {
-		$currency = empty( $this->invoice ) ? wpinv_get_currency() : $this->invoice->get_currency();
-		return apply_filters( 'getpaid-payment-form-currency', $currency, $this );
+		$currency = empty($this->invoice) ? wpinv_get_currency() : $this->invoice->get_currency();
+		return apply_filters('getpaid-payment-form-currency', $currency, $this);
 	}
 
     /*
@@ -480,8 +480,8 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function set_version( $value ) {
-		$this->set_prop( 'version', $value );
+	public function set_version($value) {
+		$this->set_prop('version', $value);
     }
 
     /**
@@ -491,11 +491,11 @@ 
 	 * @param string $value Value to set.
      * @return bool Whether or not the date was set.
 	 */
-	public function set_date_created( $value ) {
-        $date = strtotime( $value );
+	public function set_date_created($value) {
+        $date = strtotime($value);
 
-        if ( $date ) {
-            $this->set_prop( 'date_created', date( 'Y-m-d H:i:s', $date ) );
+        if ($date) {
+            $this->set_prop('date_created', date('Y-m-d H:i:s', $date));
             return true;
         }
 
@@ -510,11 +510,11 @@ 
 	 * @param string $value Value to set.
      * @return bool Whether or not the date was set.
 	 */
-	public function set_date_modified( $value ) {
-        $date = strtotime( $value );
+	public function set_date_modified($value) {
+        $date = strtotime($value);
 
-        if ( $date ) {
-            $this->set_prop( 'date_modified', date( 'Y-m-d H:i:s', $date ) );
+        if ($date) {
+            $this->set_prop('date_modified', date('Y-m-d H:i:s', $date));
             return true;
         }
 
@@ -528,8 +528,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value New name.
 	 */
-	public function set_name( $value ) {
-		$this->set_prop( 'name', sanitize_text_field( $value ) );
+	public function set_name($value) {
+		$this->set_prop('name', sanitize_text_field($value));
     }
 
     /**
@@ -538,8 +538,8 @@ 
 	 * @since 1.0.19
 	 * @param  string $value New name.
 	 */
-	public function set_title( $value ) {
-		$this->set_name( $value );
+	public function set_title($value) {
+		$this->set_name($value);
     }
 
     /**
@@ -548,8 +548,8 @@ 
 	 * @since 1.0.19
 	 * @param  int $value New author.
 	 */
-	public function set_author( $value ) {
-		$this->set_prop( 'author', (int) $value );
+	public function set_author($value) {
+		$this->set_prop('author', (int) $value);
 	}
 
 	/**
@@ -559,9 +559,9 @@ 
 	 * @sinve 2.3.4 Array values sanitized.
 	 * @param  array $value Form elements.
 	 */
-	public function set_elements( $value ) {
-		if ( is_array( $value ) ) {
-			$this->set_prop( 'elements', wp_kses_post_deep( $value ) );
+	public function set_elements($value) {
+		if (is_array($value)) {
+			$this->set_prop('elements', wp_kses_post_deep($value));
 		}
 	}
 
@@ -572,36 +572,36 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function sanitize_array_values( $value ) {
+	public function sanitize_array_values($value) {
 
 		// sanitize
-		if ( ! empty( $value ) ) {
+		if (!empty($value)) {
 
-			foreach ( $value as $key => $val_arr ) {
+			foreach ($value as $key => $val_arr) {
 
-				if ( is_array( $val_arr ) ) {
+				if (is_array($val_arr)) {
 					// check if we have sub array items.
 					$sub_arr = array();
-					foreach ( $val_arr as $key2 => $val2 ) {
-						if ( is_array( $val2 ) ) {
-							$sub_arr[ $key2 ] = $this->sanitize_array_values( $val2 );
-							unset( $val_arr[ $key ][ $key2 ] );
+					foreach ($val_arr as $key2 => $val2) {
+						if (is_array($val2)) {
+							$sub_arr[$key2] = $this->sanitize_array_values($val2);
+							unset($val_arr[$key][$key2]);
 						}
 					}
 
 					// we allow some html in description so we sanitize it separately.
-					$help_text = ! empty( $val_arr['description'] ) ? wp_kses_post( $val_arr['description'] ) : '';
+					$help_text = !empty($val_arr['description']) ? wp_kses_post($val_arr['description']) : '';
 
 					// sanitize array elements
-					$value[ $key ] = array_map( 'sanitize_text_field', $val_arr );
+					$value[$key] = array_map('sanitize_text_field', $val_arr);
 
 					// add back the description if set
-					if ( isset( $val_arr['description'] ) ) {
-$value[ $key ]['description'] = $help_text;}
+					if (isset($val_arr['description'])) {
+$value[$key]['description'] = $help_text; }
 
 					// add back sub array items after its been sanitized.
-					if ( ! empty( $sub_arr ) ) {
-						$value[ $key ] = array_merge( $value[ $key ], $sub_arr );
+					if (!empty($sub_arr)) {
+						$value[$key] = array_merge($value[$key], $sub_arr);
 					}
 				}
 }
@@ -616,9 +616,9 @@ 
 	 * @since 1.0.19
 	 * @param  array $value Form elements.
 	 */
-	public function set_items( $value ) {
-		if ( is_array( $value ) ) {
-			$this->set_prop( 'items', $value );
+	public function set_items($value) {
+		if (is_array($value)) {
+			$this->set_prop('items', $value);
 		}
 	}
 
@@ -628,9 +628,9 @@ 
 	 * @since 1.0.19
 	 * @param  float $value Amount earned.
 	 */
-	public function set_earned( $value ) {
-		$value = max( (float) $value, 0 );
-		$this->set_prop( 'earned', $value );
+	public function set_earned($value) {
+		$value = max((float) $value, 0);
+		$this->set_prop('earned', $value);
 	}
 
 	/**
@@ -639,9 +639,9 @@ 
 	 * @since 1.0.19
 	 * @param  float $value Amount refunded.
 	 */
-	public function set_refunded( $value ) {
-		$value = max( (float) $value, 0 );
-		$this->set_prop( 'refunded', $value );
+	public function set_refunded($value) {
+		$value = max((float) $value, 0);
+		$this->set_prop('refunded', $value);
 	}
 
 	/**
@@ -650,9 +650,9 @@ 
 	 * @since 1.0.19
 	 * @param  float $value Amount cancelled.
 	 */
-	public function set_cancelled( $value ) {
-		$value = max( (float) $value, 0 );
-		$this->set_prop( 'cancelled', $value );
+	public function set_cancelled($value) {
+		$value = max((float) $value, 0);
+		$this->set_prop('cancelled', $value);
 	}
 
 	/**
@@ -661,9 +661,9 @@ 
 	 * @since 1.0.19
 	 * @param  float $value Amount cancelled.
 	 */
-	public function set_failed( $value ) {
-		$value = max( (float) $value, 0 );
-		$this->set_prop( 'failed', $value );
+	public function set_failed($value) {
+		$value = max((float) $value, 0);
+		$this->set_prop('failed', $value);
 	}
 
     /**
@@ -672,11 +672,11 @@ 
      * @deprecated
 	 * @return int item id
      */
-    public function create( $data = array() ) {
+    public function create($data = array()) {
 
 		// Set the properties.
-		if ( is_array( $data ) ) {
-			$this->set_props( $data );
+		if (is_array($data)) {
+			$this->set_props($data);
 		}
 
 		// Save the item.
@@ -690,8 +690,8 @@ 
      * @deprecated
 	 * @return int item id
      */
-    public function update( $data = array() ) {
-        return $this->create( $data );
+    public function update($data = array()) {
+        return $this->create($data);
     }
 
     /*
@@ -711,7 +711,7 @@ 
 	 */
     public function is_default() {
         $is_default = $this->get_id() == wpinv_get_default_payment_form();
-        return (bool) apply_filters( 'wpinv_is_default_payment_form', $is_default, $this->get_id(), $this );
+        return (bool) apply_filters('wpinv_is_default_payment_form', $is_default, $this->get_id(), $this);
 	}
 
     /**
@@ -723,11 +723,11 @@ 
     public function is_active() {
         $is_active = 0 !== (int) $this->get_id();
 
-        if ( $is_active && ! current_user_can( 'edit_post', $this->get_id() ) && $this->get_status() != 'publish' ) {
+        if ($is_active && !current_user_can('edit_post', $this->get_id()) && $this->get_status() != 'publish') {
             $is_active = false;
         }
 
-        return (bool) apply_filters( 'wpinv_is_payment_form_active', $is_active, $this );
+        return (bool) apply_filters('wpinv_is_payment_form_active', $is_active, $this);
 	}
 
 	/**
@@ -736,8 +736,8 @@ 
 	 * @since 1.0.19
 	 * @return bool
 	 */
-    public function has_item( $item_id ) {
-        return false !== $this->get_item( $item_id );
+    public function has_item($item_id) {
+        return false !== $this->get_item($item_id);
 	}
 
 	/**
@@ -746,8 +746,8 @@ 
 	 * @since 1.0.19
 	 * @return bool
 	 */
-    public function has_element_type( $element_type ) {
-        return false !== $this->get_element_type( $element_type );
+    public function has_element_type($element_type) {
+        return false !== $this->get_element_type($element_type);
 	}
 
 	/**
@@ -758,13 +758,13 @@ 
 	 */
     public function is_recurring() {
 
-		if ( ! empty( $this->invoice ) ) {
+		if (!empty($this->invoice)) {
 			return $this->invoice->is_recurring();
 		}
 
-		foreach ( $this->get_items() as $item ) {
+		foreach ($this->get_items() as $item) {
 
-			if ( $item->is_recurring() ) {
+			if ($item->is_recurring()) {
 				return true;
 			}
 }
@@ -777,7 +777,7 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-    public function get_html( $extra_markup = '' ) {
+    public function get_html($extra_markup = '') {
 
 		// Return the HTML.
 		return wpinv_get_template_html(
@@ -795,7 +795,7 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-    public function display( $extra_markup = '' ) {
+    public function display($extra_markup = '') {
 		wpinv_get_template(
 			'payment-forms/form.php',
 			array(

includes/wpinv-address-functions.php

Indentation +87 added lines, -87 removed lines

@@ -13,9 +13,9 @@ 
 
 
 function wpinv_get_default_country() {
-	$country = wpinv_get_option( 'default_country', 'UK' );
+    $country = wpinv_get_option( 'default_country', 'UK' );
 
-	return apply_filters( 'wpinv_default_country', $country );
+    return apply_filters( 'wpinv_default_country', $country );
 }
 
 /**
@@ -36,7 +36,7 @@ 
  */
 function wpinv_sanitize_country( $country ) {
 
-	// Enure the country is specified
+    // Enure the country is specified
     if ( empty( $country ) ) {
         $country = wpinv_get_default_country();
     }
@@ -66,9 +66,9 @@ 
 }
 
 function wpinv_get_default_state() {
-	$state = wpinv_get_option( 'default_state', '' );
+    $state = wpinv_get_option( 'default_state', '' );
 
-	return apply_filters( 'wpinv_default_state', $state );
+    return apply_filters( 'wpinv_default_state', $state );
 }
 
 function wpinv_state_name( $state_code = '', $country_code = '' ) {
@@ -299,11 +299,11 @@ 
 
     $country = wpinv_sanitize_country( $country );
 
-	foreach ( wpinv_get_continents( 'countries' ) as $continent_code => $countries ) {
-		if ( false !== array_search( $country, $countries, true ) ) {
-			return $continent_code;
-		}
-	}
+    foreach ( wpinv_get_continents( 'countries' ) as $continent_code => $countries ) {
+        if ( false !== array_search( $country, $countries, true ) ) {
+            return $continent_code;
+        }
+    }
 
     return '';
 
@@ -595,31 +595,31 @@ 
 }
 
 function wpinv_get_states_field() {
-	if ( empty( $_POST['country'] ) ) {
-		$_POST['country'] = wpinv_get_default_country();
-	}
-	$states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
+    if ( empty( $_POST['country'] ) ) {
+        $_POST['country'] = wpinv_get_default_country();
+    }
+    $states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
 
-	if ( ! empty( $states ) ) {
-		$sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
+    if ( ! empty( $states ) ) {
+        $sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
 
         $class  = isset( $_POST['class'] ) ? esc_attr( sanitize_text_field( $_POST['class'] ) ) : '';
         $class .= " $sanitized_field_name getpaid_js_field-state custom-select wpinv-select wpi_select2";
 
         $args  = array(
-			'name'             => $sanitized_field_name,
-			'id'               => $sanitized_field_name,
-			'class'            => implode( ' ', array_unique( explode( ' ', $class ) ) ),
-			'options'          => array_merge( array( '' => '' ), $states ),
-			'show_option_all'  => false,
-			'show_option_none' => false,
-		);
-
-		wpinv_html_select( $args );
-
-	} else {
-		echo 'nostates';
-	}
+            'name'             => $sanitized_field_name,
+            'id'               => $sanitized_field_name,
+            'class'            => implode( ' ', array_unique( explode( ' ', $class ) ) ),
+            'options'          => array_merge( array( '' => '' ), $states ),
+            'show_option_all'  => false,
+            'show_option_none' => false,
+        );
+
+        wpinv_html_select( $args );
+
+    } else {
+        echo 'nostates';
+    }
 
 }
 
@@ -638,47 +638,47 @@ 
  */
 function wpinv_get_address_formats() {
 
-		return apply_filters(
+        return apply_filters(
             'wpinv_localisation_address_formats',
-			array(
-				'default' => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}\n{{zip}}\n{{country}}",
-				'AU'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}} {{zip}}\n{{country}}",
-				'AT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'BE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'CA'      => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{state_code}}  {{zip}}\n{{country}}",
-				'CH'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'CL'      => "{{company}}\n{{name}}\n{{address}}\n{{state}}\n{{zip}} {{city}}\n{{country}}",
-				'CN'      => "{{country}} {{zip}}\n{{state}}, {{city}}, {{address}}\n{{company}}\n{{name}}",
-				'CZ'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'DE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'EE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'FI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'DK'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'FR'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city_upper}}\n{{country}}",
-				'HK'      => "{{company}}\n{{first_name}} {{last_name_upper}}\n{{address}}\n{{city_upper}}\n{{state_upper}}\n{{country}}",
-				'HU'      => "{{name}}\n{{company}}\n{{city}}\n{{address}}\n{{zip}}\n{{country}}",
-				'IN'      => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{zip}}\n{{state}}, {{country}}",
-				'IS'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'IT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}}\n{{city}}\n{{state_upper}}\n{{country}}",
-				'JP'      => "{{zip}}\n{{state}} {{city}} {{address}}\n{{company}}\n{{last_name}} {{first_name}}\n{{country}}",
-				'TW'      => "{{company}}\n{{last_name}} {{first_name}}\n{{address}}\n{{state}}, {{city}} {{zip}}\n{{country}}",
-				'LI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'NL'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'NZ'      => "{{name}}\n{{company}}\n{{address}}\n{{city}} {{zip}}\n{{country}}",
-				'NO'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'PL'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'PT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'SK'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'RS'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'SI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'ES'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{state}}\n{{country}}",
-				'SE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'TR'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}} {{state}}\n{{country}}",
-				'UG'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}, {{country}}",
-				'US'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}, {{state_code}} {{zip}}\n{{country}}",
-				'VN'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{country}}",
-			)
-		);
+            array(
+                'default' => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}\n{{zip}}\n{{country}}",
+                'AU'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}} {{zip}}\n{{country}}",
+                'AT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'BE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'CA'      => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{state_code}}  {{zip}}\n{{country}}",
+                'CH'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'CL'      => "{{company}}\n{{name}}\n{{address}}\n{{state}}\n{{zip}} {{city}}\n{{country}}",
+                'CN'      => "{{country}} {{zip}}\n{{state}}, {{city}}, {{address}}\n{{company}}\n{{name}}",
+                'CZ'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'DE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'EE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'FI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'DK'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'FR'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city_upper}}\n{{country}}",
+                'HK'      => "{{company}}\n{{first_name}} {{last_name_upper}}\n{{address}}\n{{city_upper}}\n{{state_upper}}\n{{country}}",
+                'HU'      => "{{name}}\n{{company}}\n{{city}}\n{{address}}\n{{zip}}\n{{country}}",
+                'IN'      => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{zip}}\n{{state}}, {{country}}",
+                'IS'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'IT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}}\n{{city}}\n{{state_upper}}\n{{country}}",
+                'JP'      => "{{zip}}\n{{state}} {{city}} {{address}}\n{{company}}\n{{last_name}} {{first_name}}\n{{country}}",
+                'TW'      => "{{company}}\n{{last_name}} {{first_name}}\n{{address}}\n{{state}}, {{city}} {{zip}}\n{{country}}",
+                'LI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'NL'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'NZ'      => "{{name}}\n{{company}}\n{{address}}\n{{city}} {{zip}}\n{{country}}",
+                'NO'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'PL'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'PT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'SK'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'RS'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'SI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'ES'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{state}}\n{{country}}",
+                'SE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'TR'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}} {{state}}\n{{country}}",
+                'UG'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}, {{country}}",
+                'US'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}, {{state_code}} {{zip}}\n{{country}}",
+                'VN'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{country}}",
+            )
+        );
 }
 
 /**
@@ -695,21 +695,21 @@ 
     }
 
     // Get all formats.
-	$formats = wpinv_get_address_formats();
+    $formats = wpinv_get_address_formats();
 
-	// Get format for the specified country.
-	$format = ( $country && isset( $formats[ $country ] ) ) ? $formats[ $country ] : $formats['default'];
+    // Get format for the specified country.
+    $format = ( $country && isset( $formats[ $country ] ) ) ? $formats[ $country ] : $formats['default'];
 
     /**
-	 * Filters the address format to use on Invoices.
+     * Filters the address format to use on Invoices.
      *
      * New lines will be replaced by a `br` element. Double new lines will be replaced by a paragraph. HTML tags are allowed.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param string $format  The address format to use.
+     *
+     * @since 1.0.13
+     *
+     * @param string $format  The address format to use.
      * @param string $country The country who's address format is being retrieved.
-	 */
+     */
     return apply_filters( 'wpinv_get_full_address_format', $format, $country );
 }
 
@@ -730,8 +730,8 @@ 
         'country'    => '',
         'zip'        => '',
         'first_name' => '',
-		'last_name'  => '',
-		'company'    => '',
+        'last_name'  => '',
+        'company'    => '',
     );
 
     $args    = map_deep( wp_parse_args( array_filter( $billing_details ), $default_args ), 'trim' );
@@ -752,14 +752,14 @@ 
     $args['country_code'] = $country;
 
     /**
-	 * Filters the address format replacements to use on Invoices.
+     * Filters the address format replacements to use on Invoices.
+     *
+     *
+     * @since 1.0.13
      *
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param array $replacements  The address replacements to use.
+     * @param array $replacements  The address replacements to use.
      * @param array $billing_details  The billing details to use.
-	 */
+     */
     $replacements = apply_filters( 'wpinv_get_invoice_address_replacements', $args, $billing_details );
 
     $return = array();
@@ -782,5 +782,5 @@ 
  * @return string
  */
 function wpinv_trim_formatted_address_line( $line ) {
-	return trim( $line, ', ' );
+    return trim( $line, ', ' );
 }

Spacing +155 added lines, -155 removed lines

@@ -7,15 +7,15 @@ 
  */
 
 // MUST have WordPress.
-if ( ! defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
     exit;
 }
 
 
 function wpinv_get_default_country() {
-	$country = wpinv_get_option( 'default_country', 'UK' );
+	$country = wpinv_get_option('default_country', 'UK');
 
-	return apply_filters( 'wpinv_default_country', $country );
+	return apply_filters('wpinv_default_country', $country);
 }
 
 /**
@@ -23,8 +23,8 @@ 
  *
  * @return string
  */
-function getpaid_get_ip_country( $ip_address = '' ) {
-    $country = GetPaid_Geolocation::geolocate_ip( $ip_address, true );
+function getpaid_get_ip_country($ip_address = '') {
+    $country = GetPaid_Geolocation::geolocate_ip($ip_address, true);
     return $country['country'];
 }
 
@@ -34,59 +34,59 @@ 
  * @param string $country The country code to sanitize
  * @return array
  */
-function wpinv_sanitize_country( $country ) {
+function wpinv_sanitize_country($country) {
 
 	// Enure the country is specified
-    if ( empty( $country ) ) {
+    if (empty($country)) {
         $country = wpinv_get_default_country();
     }
-    return trim( wpinv_utf8_strtoupper( $country ) );
+    return trim(wpinv_utf8_strtoupper($country));
 
 }
 
-function wpinv_is_base_country( $country ) {
+function wpinv_is_base_country($country) {
     $base_country = wpinv_get_default_country();
 
-    if ( $base_country === 'UK' ) {
+    if ($base_country === 'UK') {
         $base_country = 'GB';
     }
-    if ( $country == 'UK' ) {
+    if ($country == 'UK') {
         $country = 'GB';
     }
 
-    return ( $country && $country === $base_country ) ? true : false;
+    return ($country && $country === $base_country) ? true : false;
 }
 
-function wpinv_country_name( $country_code = '' ) {
+function wpinv_country_name($country_code = '') {
     $countries = wpinv_get_country_list();
     $country_code = $country_code == 'UK' ? 'GB' : $country_code;
-    $country = isset( $countries[ $country_code ] ) ? $countries[ $country_code ] : $country_code;
+    $country = isset($countries[$country_code]) ? $countries[$country_code] : $country_code;
 
-    return apply_filters( 'wpinv_country_name', $country, $country_code );
+    return apply_filters('wpinv_country_name', $country, $country_code);
 }
 
 function wpinv_get_default_state() {
-	$state = wpinv_get_option( 'default_state', '' );
+	$state = wpinv_get_option('default_state', '');
 
-	return apply_filters( 'wpinv_default_state', $state );
+	return apply_filters('wpinv_default_state', $state);
 }
 
-function wpinv_state_name( $state_code = '', $country_code = '' ) {
+function wpinv_state_name($state_code = '', $country_code = '') {
     $state = $state_code;
 
-    if ( ! empty( $country_code ) ) {
-        $states = wpinv_get_country_states( $country_code );
+    if (!empty($country_code)) {
+        $states = wpinv_get_country_states($country_code);
 
-        $state = ! empty( $states ) && isset( $states[ $state_code ] ) ? $states[ $state_code ] : $state;
+        $state = !empty($states) && isset($states[$state_code]) ? $states[$state_code] : $state;
     }
 
-    return apply_filters( 'wpinv_state_name', $state, $state_code, $country_code );
+    return apply_filters('wpinv_state_name', $state, $state_code, $country_code);
 }
 
 function wpinv_store_address() {
-    $address = wpinv_get_option( 'store_address', '' );
+    $address = wpinv_get_option('store_address', '');
 
-    return apply_filters( 'wpinv_store_address', $address );
+    return apply_filters('wpinv_store_address', $address);
 }
 
 /**
@@ -94,24 +94,24 @@ 
  *
  * @param WPInv_Invoice $invoice
  */
-function getpaid_maybe_add_default_address( &$invoice ) {
+function getpaid_maybe_add_default_address(&$invoice) {
 
     $user_id = $invoice->get_user_id();
 
     // Abort if the invoice belongs to no one.
-    if ( empty( $user_id ) ) {
+    if (empty($user_id)) {
         return;
     }
 
     // Fill in defaults whenever necessary.
-    foreach ( wpinv_get_user_address( $user_id ) as $key => $value ) {
+    foreach (wpinv_get_user_address($user_id) as $key => $value) {
 
-        if ( is_callable( $invoice, "get_$key" ) ) {
-            $current = call_user_func( array( $invoice, "get_$key" ) );
+        if (is_callable($invoice, "get_$key")) {
+            $current = call_user_func(array($invoice, "get_$key"));
 
-            if ( empty( $current ) ) {
+            if (empty($current)) {
                 $method = "set_$key";
-                $invoice->$method( $value );
+                $invoice->$method($value);
             }
 }
 }
@@ -123,27 +123,27 @@ 
  *
  * @return array
  */
-function getpaid_user_address_fields( $force_vat = false ) {
+function getpaid_user_address_fields($force_vat = false) {
 
     $address_fields = apply_filters(
         'getpaid_user_address_fields',
         array(
-            'first_name' => __( 'First Name', 'invoicing' ),
-            'last_name'  => __( 'Last Name', 'invoicing' ),
-            'address'    => __( 'Address', 'invoicing' ),
-            'city'       => __( 'City', 'invoicing' ),
-            'country'    => __( 'Country', 'invoicing' ),
-            'state'      => __( 'State', 'invoicing' ),
-            'zip'        => __( 'Zip/Postal Code', 'invoicing' ),
-            'phone'      => __( 'Phone Number', 'invoicing' ),
-            'company'    => __( 'Company', 'invoicing' ),
-            'company_id' => __( 'Company ID', 'invoicing' ),
-            'vat_number' => __( 'VAT Number', 'invoicing' ),
+            'first_name' => __('First Name', 'invoicing'),
+            'last_name'  => __('Last Name', 'invoicing'),
+            'address'    => __('Address', 'invoicing'),
+            'city'       => __('City', 'invoicing'),
+            'country'    => __('Country', 'invoicing'),
+            'state'      => __('State', 'invoicing'),
+            'zip'        => __('Zip/Postal Code', 'invoicing'),
+            'phone'      => __('Phone Number', 'invoicing'),
+            'company'    => __('Company', 'invoicing'),
+            'company_id' => __('Company ID', 'invoicing'),
+            'vat_number' => __('VAT Number', 'invoicing'),
         )
     );
 
-    if ( ! wpinv_use_taxes() && isset( $address_fields['vat_number'] ) && ! wp_doing_ajax() && ! $force_vat ) {
-        unset( $address_fields['vat_number'] );
+    if (!wpinv_use_taxes() && isset($address_fields['vat_number']) && !wp_doing_ajax() && !$force_vat) {
+        unset($address_fields['vat_number']);
     }
 
     return $address_fields;
@@ -154,8 +154,8 @@ 
  *
  * @return bool
  */
-function getpaid_is_address_field_whitelisted( $key ) {
-    return array_key_exists( $key, getpaid_user_address_fields() );
+function getpaid_is_address_field_whitelisted($key) {
+    return array_key_exists($key, getpaid_user_address_fields());
 }
 
 /**
@@ -165,44 +165,44 @@ 
  *
  * @param WPInv_Invoice $invoice
  */
-function getpaid_save_invoice_user_address( $invoice ) {
+function getpaid_save_invoice_user_address($invoice) {
 
     // Retrieve the invoice.
-    $invoice = wpinv_get_invoice( $invoice );
+    $invoice = wpinv_get_invoice($invoice);
 
     // Abort if it does not exist.
-    if ( empty( $invoice ) || $invoice->is_renewal() ) {
+    if (empty($invoice) || $invoice->is_renewal()) {
         return;
     }
 
-    $customer = getpaid_get_customer_by_user_id( $invoice->get_user_id() );
+    $customer = getpaid_get_customer_by_user_id($invoice->get_user_id());
 
-    if ( empty( $customer ) ) {
-        $customer = new GetPaid_Customer( 0 );
-        $customer->clone_user( $invoice->get_user_id() );
+    if (empty($customer)) {
+        $customer = new GetPaid_Customer(0);
+        $customer->clone_user($invoice->get_user_id());
     }
 
-    foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
+    foreach (array_keys(getpaid_user_address_fields()) as $field) {
 
-        if ( is_callable( array( $invoice, "get_$field" ) ) ) {
-            $value = call_user_func( array( $invoice, "get_$field" ) );
+        if (is_callable(array($invoice, "get_$field"))) {
+            $value = call_user_func(array($invoice, "get_$field"));
 
             // Only save if it is not empty.
-            if ( ! empty( $value ) ) {
-                $customer->set( $field, sanitize_text_field( $value ) );
+            if (!empty($value)) {
+                $customer->set($field, sanitize_text_field($value));
             }
         }
     }
 
     $customer->save();
 
-    if ( ! $invoice->get_customer_id() ) {
-        $invoice->set_customer_id( $customer->get_id() );
+    if (!$invoice->get_customer_id()) {
+        $invoice->set_customer_id($customer->get_id());
         $invoice->save();
     }
 }
-add_action( 'getpaid_new_invoice', 'getpaid_save_invoice_user_address' );
-add_action( 'getpaid_update_invoice', 'getpaid_save_invoice_user_address' );
+add_action('getpaid_new_invoice', 'getpaid_save_invoice_user_address');
+add_action('getpaid_update_invoice', 'getpaid_save_invoice_user_address');
 
 /**
  * Retrieves a saved user address.
@@ -210,36 +210,36 @@ 
  * @param int $user_id The user id whose address we should get. Defaults to the current user id.
  * @return array
  */
-function wpinv_get_user_address( $user_id = 0 ) {
+function wpinv_get_user_address($user_id = 0) {
 
     // Prepare the user id.
-    $user_id   = empty( $user_id ) ? get_current_user_id() : $user_id;
-    $user_info = get_userdata( $user_id );
+    $user_id   = empty($user_id) ? get_current_user_id() : $user_id;
+    $user_info = get_userdata($user_id);
 
     // Abort if non exists.
-    if ( empty( $user_info ) ) {
+    if (empty($user_info)) {
         return array();
     }
 
-    $customer = getpaid_get_customer_by_user_id( $user_id );
+    $customer = getpaid_get_customer_by_user_id($user_id);
 
-    if ( empty( $customer ) ) {
-        $customer = new GetPaid_Customer( 0 );
-        $customer->clone_user( $user_id );
+    if (empty($customer)) {
+        $customer = new GetPaid_Customer(0);
+        $customer->clone_user($user_id);
     }
 
     // Prepare the address.
     $address = array(
         'user_id'      => $user_id,
-        'email'        => $customer->get( 'email' ),
+        'email'        => $customer->get('email'),
         'display_name' => $user_info->display_name,
     );
 
-    foreach ( array_keys( getpaid_user_address_fields() ) as $field ) {
-        $address[ $field ] = $customer->get( $field );
+    foreach (array_keys(getpaid_user_address_fields()) as $field) {
+        $address[$field] = $customer->get($field);
     }
 
-    $address = array_filter( $address );
+    $address = array_filter($address);
 
     $defaults = array(
         'first_name' => $user_info->first_name,
@@ -248,7 +248,7 @@ 
         'country'    => wpinv_get_default_country(),
     );
 
-    return getpaid_array_merge_if_empty( $address, $defaults );
+    return getpaid_array_merge_if_empty($address, $defaults);
 
 }
 
@@ -260,7 +260,7 @@ 
  * @return string|null
  * @deprecated
  */
-function getpaid_get_user_address_field( $user_id, $field ) {
+function getpaid_get_user_address_field($user_id, $field) {
 
     $prefixes = array(
         '_wpinv_',
@@ -268,15 +268,15 @@ 
         '',
     );
 
-    foreach ( $prefixes as $prefix ) {
+    foreach ($prefixes as $prefix) {
 
         // Meta table.
-        $value = get_user_meta( $user_id, $prefix . $field, true );
+        $value = get_user_meta($user_id, $prefix . $field, true);
 
         // UWP table.
-        $value = ( empty( $value ) && function_exists( 'uwp_get_usermeta' ) ) ? uwp_get_usermeta( $user_id, $prefix . $field ) : $value;
+        $value = (empty($value) && function_exists('uwp_get_usermeta')) ? uwp_get_usermeta($user_id, $prefix . $field) : $value;
 
-        if ( ! empty( $value ) ) {
+        if (!empty($value)) {
             return $value;
         }
 }
@@ -292,16 +292,16 @@ 
  * @param string $return What to return.
  * @return array
  */
-function wpinv_get_continents( $return = 'all' ) {
+function wpinv_get_continents($return = 'all') {
 
-    $continents = wpinv_get_data( 'continents' );
+    $continents = wpinv_get_data('continents');
 
-    switch ( $return ) {
+    switch ($return) {
         case 'name':
-            return wp_list_pluck( $continents, 'name' );
+            return wp_list_pluck($continents, 'name');
             break;
         case 'countries':
-            return wp_list_pluck( $continents, 'countries' );
+            return wp_list_pluck($continents, 'countries');
             break;
         default:
             return $continents;
@@ -317,12 +317,12 @@ 
  * @param string $country Country code. If no code is specified, defaults to the default country.
  * @return string
  */
-function wpinv_get_continent_code_for_country( $country = false ) {
+function wpinv_get_continent_code_for_country($country = false) {
 
-    $country = wpinv_sanitize_country( $country );
+    $country = wpinv_sanitize_country($country);
 
-	foreach ( wpinv_get_continents( 'countries' ) as $continent_code => $countries ) {
-		if ( false !== array_search( $country, $countries, true ) ) {
+	foreach (wpinv_get_continents('countries') as $continent_code => $countries) {
+		if (false !== array_search($country, $countries, true)) {
 			return $continent_code;
 		}
 	}
@@ -338,13 +338,13 @@ 
  * @param string $country Country code. If no code is specified, defaults to the default country.
  * @return array
  */
-function wpinv_get_country_calling_code( $country = null ) {
+function wpinv_get_country_calling_code($country = null) {
 
-    $country = wpinv_sanitize_country( $country );
-    $codes   = wpinv_get_data( 'phone-codes' );
-    $code    = isset( $codes[ $country ] ) ? $codes[ $country ] : '';
+    $country = wpinv_sanitize_country($country);
+    $codes   = wpinv_get_data('phone-codes');
+    $code    = isset($codes[$country]) ? $codes[$country] : '';
 
-    if ( is_array( $code ) ) {
+    if (is_array($code)) {
         return $code[0];
     }
     return $code;
@@ -357,8 +357,8 @@ 
  * @param bool $first_empty Whether or not the first item in the list should be empty
  * @return array
  */
-function wpinv_get_country_list( $first_empty = false ) {
-    return wpinv_maybe_add_empty_option( apply_filters( 'wpinv_countries', wpinv_get_data( 'countries' ) ), $first_empty );
+function wpinv_get_country_list($first_empty = false) {
+    return wpinv_maybe_add_empty_option(apply_filters('wpinv_countries', wpinv_get_data('countries')), $first_empty);
 }
 
 /**
@@ -368,22 +368,22 @@ 
  * @param bool $first_empty Whether or not the first item in the list should be empty
  * @return array
  */
-function wpinv_get_country_states( $country = null, $first_empty = false ) {
+function wpinv_get_country_states($country = null, $first_empty = false) {
 
     // Prepare the country.
-    $country = wpinv_sanitize_country( $country );
+    $country = wpinv_sanitize_country($country);
 
     // Fetch all states.
-    $all_states = wpinv_get_data( 'states' );
+    $all_states = wpinv_get_data('states');
 
     // Fetch the specified country's states.
-    $states     = isset( $all_states[ $country ] ) ? $all_states[ $country ] : array();
-    $states     = apply_filters( "wpinv_{$country}_states", $states );
-    $states     = apply_filters( 'wpinv_country_states', $states, $country );
+    $states     = isset($all_states[$country]) ? $all_states[$country] : array();
+    $states     = apply_filters("wpinv_{$country}_states", $states);
+    $states     = apply_filters('wpinv_country_states', $states, $country);
 
-    asort( $states );
+    asort($states);
 
-    return wpinv_maybe_add_empty_option( $states, $first_empty );
+    return wpinv_maybe_add_empty_option($states, $first_empty);
 }
 
 /**
@@ -393,7 +393,7 @@ 
  * @return array
  */
 function wpinv_get_us_states_list() {
-    return apply_filters( 'wpinv_usa_states', wpinv_get_country_states( 'US' ) );
+    return apply_filters('wpinv_usa_states', wpinv_get_country_states('US'));
 }
 
 /**
@@ -403,7 +403,7 @@ 
  * @return array
  */
 function wpinv_get_canada_states_list() {
-    return apply_filters( 'wpinv_canada_provinces', wpinv_get_country_states( 'CA' ) );
+    return apply_filters('wpinv_canada_provinces', wpinv_get_country_states('CA'));
 }
 
 /**
@@ -413,7 +413,7 @@ 
  * @return array
  */
 function wpinv_get_australia_states_list() {
-    return apply_filters( 'wpinv_australia_states', wpinv_get_country_states( 'AU' ) );
+    return apply_filters('wpinv_australia_states', wpinv_get_country_states('AU'));
 }
 
 /**
@@ -423,7 +423,7 @@ 
  * @return array
  */
 function wpinv_get_bangladesh_states_list() {
-    return apply_filters( 'wpinv_bangladesh_states', wpinv_get_country_states( 'BD' ) );
+    return apply_filters('wpinv_bangladesh_states', wpinv_get_country_states('BD'));
 }
 
 /**
@@ -433,7 +433,7 @@ 
  * @return array
  */
 function wpinv_get_brazil_states_list() {
-    return apply_filters( 'wpinv_brazil_states', wpinv_get_country_states( 'BR' ) );
+    return apply_filters('wpinv_brazil_states', wpinv_get_country_states('BR'));
 }
 
 /**
@@ -443,7 +443,7 @@ 
  * @return array
  */
 function wpinv_get_bulgaria_states_list() {
-    return apply_filters( 'wpinv_bulgaria_states', wpinv_get_country_states( 'BG' ) );
+    return apply_filters('wpinv_bulgaria_states', wpinv_get_country_states('BG'));
 }
 
 /**
@@ -453,7 +453,7 @@ 
  * @return array
  */
 function wpinv_get_hong_kong_states_list() {
-    return apply_filters( 'wpinv_hong_kong_states', wpinv_get_country_states( 'HK' ) );
+    return apply_filters('wpinv_hong_kong_states', wpinv_get_country_states('HK'));
 }
 
 /**
@@ -463,7 +463,7 @@ 
  * @return array
  */
 function wpinv_get_hungary_states_list() {
-    return apply_filters( 'wpinv_hungary_states', wpinv_get_country_states( 'HU' ) );
+    return apply_filters('wpinv_hungary_states', wpinv_get_country_states('HU'));
 }
 
 /**
@@ -473,7 +473,7 @@ 
  * @return array
  */
 function wpinv_get_japan_states_list() {
-    return apply_filters( 'wpinv_japan_states', wpinv_get_country_states( 'JP' ) );
+    return apply_filters('wpinv_japan_states', wpinv_get_country_states('JP'));
 }
 
 /**
@@ -483,7 +483,7 @@ 
  * @return array
  */
 function wpinv_get_china_states_list() {
-    return apply_filters( 'wpinv_china_states', wpinv_get_country_states( 'CN' ) );
+    return apply_filters('wpinv_china_states', wpinv_get_country_states('CN'));
 }
 
 /**
@@ -493,7 +493,7 @@ 
  * @return array
  */
 function wpinv_get_new_zealand_states_list() {
-    return apply_filters( 'wpinv_new_zealand_states', wpinv_get_country_states( 'NZ' ) );
+    return apply_filters('wpinv_new_zealand_states', wpinv_get_country_states('NZ'));
 }
 
 /**
@@ -503,7 +503,7 @@ 
  * @return array
  */
 function wpinv_get_peru_states_list() {
-    return apply_filters( 'wpinv_peru_states', wpinv_get_country_states( 'PE' ) );
+    return apply_filters('wpinv_peru_states', wpinv_get_country_states('PE'));
 }
 
 /**
@@ -513,7 +513,7 @@ 
  * @return array
  */
 function wpinv_get_indonesia_states_list() {
-    return apply_filters( 'wpinv_indonesia_states', wpinv_get_country_states( 'ID' ) );
+    return apply_filters('wpinv_indonesia_states', wpinv_get_country_states('ID'));
 }
 
 /**
@@ -523,7 +523,7 @@ 
  * @return array
  */
 function wpinv_get_india_states_list() {
-    return apply_filters( 'wpinv_india_states', wpinv_get_country_states( 'IN' ) );
+    return apply_filters('wpinv_india_states', wpinv_get_country_states('IN'));
 }
 
 /**
@@ -533,7 +533,7 @@ 
  * @return array
  */
 function wpinv_get_iran_states_list() {
-    return apply_filters( 'wpinv_iran_states', wpinv_get_country_states( 'IR' ) );
+    return apply_filters('wpinv_iran_states', wpinv_get_country_states('IR'));
 }
 
 /**
@@ -543,7 +543,7 @@ 
  * @return array
  */
 function wpinv_get_italy_states_list() {
-    return apply_filters( 'wpinv_italy_states', wpinv_get_country_states( 'IT' ) );
+    return apply_filters('wpinv_italy_states', wpinv_get_country_states('IT'));
 }
 
 /**
@@ -553,7 +553,7 @@ 
  * @return array
  */
 function wpinv_get_malaysia_states_list() {
-    return apply_filters( 'wpinv_malaysia_states', wpinv_get_country_states( 'MY' ) );
+    return apply_filters('wpinv_malaysia_states', wpinv_get_country_states('MY'));
 }
 
 /**
@@ -563,7 +563,7 @@ 
  * @return array
  */
 function wpinv_get_mexico_states_list() {
-    return apply_filters( 'wpinv_mexico_states', wpinv_get_country_states( 'MX' ) );
+    return apply_filters('wpinv_mexico_states', wpinv_get_country_states('MX'));
 }
 
 /**
@@ -573,7 +573,7 @@ 
  * @return array
  */
 function wpinv_get_nepal_states_list() {
-    return apply_filters( 'wpinv_nepal_states', wpinv_get_country_states( 'NP' ) );
+    return apply_filters('wpinv_nepal_states', wpinv_get_country_states('NP'));
 }
 
 /**
@@ -583,7 +583,7 @@ 
  * @return array
  */
 function wpinv_get_south_africa_states_list() {
-    return apply_filters( 'wpinv_south_africa_states', wpinv_get_country_states( 'ZA' ) );
+    return apply_filters('wpinv_south_africa_states', wpinv_get_country_states('ZA'));
 }
 
 /**
@@ -593,7 +593,7 @@ 
  * @return array
  */
 function wpinv_get_thailand_states_list() {
-    return apply_filters( 'wpinv_thailand_states', wpinv_get_country_states( 'TH' ) );
+    return apply_filters('wpinv_thailand_states', wpinv_get_country_states('TH'));
 }
 
 /**
@@ -603,7 +603,7 @@ 
  * @return array
  */
 function wpinv_get_turkey_states_list() {
-    return apply_filters( 'wpinv_turkey_states', wpinv_get_country_states( 'TR' ) );
+    return apply_filters('wpinv_turkey_states', wpinv_get_country_states('TR'));
 }
 
 /**
@@ -613,31 +613,31 @@ 
  * @return array
  */
 function wpinv_get_spain_states_list() {
-    return apply_filters( 'wpinv_spain_states', wpinv_get_country_states( 'ES' ) );
+    return apply_filters('wpinv_spain_states', wpinv_get_country_states('ES'));
 }
 
 function wpinv_get_states_field() {
-	if ( empty( $_POST['country'] ) ) {
+	if (empty($_POST['country'])) {
 		$_POST['country'] = wpinv_get_default_country();
 	}
-	$states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
+	$states = wpinv_get_country_states(sanitize_text_field($_POST['country']));
 
-	if ( ! empty( $states ) ) {
-		$sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
+	if (!empty($states)) {
+		$sanitized_field_name = sanitize_text_field($_POST['field_name']);
 
-        $class  = isset( $_POST['class'] ) ? esc_attr( sanitize_text_field( $_POST['class'] ) ) : '';
+        $class  = isset($_POST['class']) ? esc_attr(sanitize_text_field($_POST['class'])) : '';
         $class .= " $sanitized_field_name getpaid_js_field-state custom-select wpinv-select wpi_select2";
 
-        $args  = array(
+        $args = array(
 			'name'             => $sanitized_field_name,
 			'id'               => $sanitized_field_name,
-			'class'            => implode( ' ', array_unique( explode( ' ', $class ) ) ),
-			'options'          => array_merge( array( '' => '' ), $states ),
+			'class'            => implode(' ', array_unique(explode(' ', $class))),
+			'options'          => array_merge(array('' => ''), $states),
 			'show_option_all'  => false,
 			'show_option_none' => false,
 		);
 
-		wpinv_html_select( $args );
+		wpinv_html_select($args);
 
 	} else {
 		echo 'nostates';
@@ -645,10 +645,10 @@ 
 
 }
 
-function wpinv_default_billing_country( $country = '', $user_id = 0 ) {
-    $country = ! empty( $country ) ? $country : wpinv_get_default_country();
+function wpinv_default_billing_country($country = '', $user_id = 0) {
+    $country = !empty($country) ? $country : wpinv_get_default_country();
 
-    return apply_filters( 'wpinv_default_billing_country', $country, $user_id );
+    return apply_filters('wpinv_default_billing_country', $country, $user_id);
 }
 
 /**
@@ -710,9 +710,9 @@ 
  * @see `wpinv_get_invoice_address_replacements`
  * @return string
  */
-function wpinv_get_full_address_format( $country = false ) {
+function wpinv_get_full_address_format($country = false) {
 
-    if ( empty( $country ) ) {
+    if (empty($country)) {
         $country = wpinv_get_default_country();
     }
 
@@ -720,7 +720,7 @@ 
 	$formats = wpinv_get_address_formats();
 
 	// Get format for the specified country.
-	$format = ( $country && isset( $formats[ $country ] ) ) ? $formats[ $country ] : $formats['default'];
+	$format = ($country && isset($formats[$country])) ? $formats[$country] : $formats['default'];
 
     /**
 	 * Filters the address format to use on Invoices.
@@ -732,7 +732,7 @@ 
 	 * @param string $format  The address format to use.
      * @param string $country The country who's address format is being retrieved.
 	 */
-    return apply_filters( 'wpinv_get_full_address_format', $format, $country );
+    return apply_filters('wpinv_get_full_address_format', $format, $country);
 }
 
 /**
@@ -743,7 +743,7 @@ 
  * @param array $billing_details customer's billing details
  * @return array
  */
-function wpinv_get_invoice_address_replacements( $billing_details ) {
+function wpinv_get_invoice_address_replacements($billing_details) {
 
     $default_args = array(
         'address'    => '',
@@ -756,15 +756,15 @@ 
 		'company'    => '',
     );
 
-    $args    = map_deep( wp_parse_args( array_filter( $billing_details ), $default_args ), 'trim' );
+    $args    = map_deep(wp_parse_args(array_filter($billing_details), $default_args), 'trim');
     $state   = $args['state'];
     $country = $args['country'];
 
     // Handle full country name.
-    $full_country = empty( $country ) ? $country : wpinv_country_name( $country );
+    $full_country = empty($country) ? $country : wpinv_country_name($country);
 
     // Handle full state name.
-    $full_state   = ( $country && $state ) ? wpinv_state_name( $state, $country ) : $state;
+    $full_state   = ($country && $state) ? wpinv_state_name($state, $country) : $state;
 
     $args['postcode']    = $args['zip'];
     $args['name']        = $args['first_name'] . ' ' . $args['last_name'];
@@ -782,14 +782,14 @@ 
 	 * @param array $replacements  The address replacements to use.
      * @param array $billing_details  The billing details to use.
 	 */
-    $replacements = apply_filters( 'wpinv_get_invoice_address_replacements', $args, $billing_details );
+    $replacements = apply_filters('wpinv_get_invoice_address_replacements', $args, $billing_details);
 
     $return = array();
 
-    foreach ( $replacements as $key => $value ) {
-        $value  = is_scalar( $value ) ? trim( sanitize_text_field( $value ) ) : '';
-        $return[ '{{' . $key . '}}' ] = $value;
-        $return[ '{{' . $key . '_upper}}' ] = wpinv_utf8_strtoupper( $value );
+    foreach ($replacements as $key => $value) {
+        $value = is_scalar($value) ? trim(sanitize_text_field($value)) : '';
+        $return['{{' . $key . '}}'] = $value;
+        $return['{{' . $key . '_upper}}'] = wpinv_utf8_strtoupper($value);
     }
 
     return $return;
@@ -803,6 +803,6 @@ 
  * @since 1.0.14
  * @return string
  */
-function wpinv_trim_formatted_address_line( $line ) {
-	return trim( $line, ', ' );
+function wpinv_trim_formatted_address_line($line) {
+	return trim($line, ', ');
 }

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

Indentation +210 added lines, -210 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -14,228 +14,228 @@ 
  */
 class GetPaid_Item_Data_Store extends GetPaid_Data_Store_WP {
 
-	/**
-	 * Data stored in meta keys, but not considered "meta" for an item.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $internal_meta_keys = array(
-		'_wpinv_price',
-		'_wpinv_vat_rule',
-		'_wpinv_vat_class',
-		'_wpinv_type',
-		'_wpinv_custom_id',
-		'_wpinv_custom_name',
-		'_wpinv_custom_singular_name',
-		'_wpinv_editable',
-		'_wpinv_dynamic_pricing',
-		'_minimum_price',
-		'_wpinv_is_recurring',
-		'_wpinv_recurring_period',
-		'_wpinv_recurring_interval',
-		'_wpinv_recurring_limit',
-		'_wpinv_free_trial',
-		'_wpinv_trial_period',
-		'_wpinv_trial_interval',
-	);
-
-	/**
-	 * A map of meta keys to data props.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @var array
-	 */
-	protected $meta_key_to_props = array(
-		'_wpinv_price'                => 'price',
-		'_wpinv_vat_rule'             => 'vat_rule',
-		'_wpinv_vat_class'            => 'vat_class',
-		'_wpinv_type'                 => 'type',
-		'_wpinv_custom_id'            => 'custom_id',
-		'_wpinv_custom_name'          => 'custom_name',
-		'_wpinv_custom_singular_name' => 'custom_singular_name',
-		'_wpinv_editable'             => 'is_editable',
-		'_wpinv_dynamic_pricing'      => 'is_dynamic_pricing',
-		'_minimum_price'              => 'minimum_price',
-		'_wpinv_custom_name'          => 'custom_name',
-		'_wpinv_is_recurring'         => 'is_recurring',
-		'_wpinv_recurring_period'     => 'recurring_period',
-		'_wpinv_recurring_interval'   => 'recurring_interval',
-		'_wpinv_recurring_limit'      => 'recurring_limit',
-		'_wpinv_free_trial'           => 'is_free_trial',
-		'_wpinv_trial_period'         => 'trial_period',
-		'_wpinv_trial_interval'       => 'trial_interval',
-		'_wpinv_version'              => 'version',
-	);
-
-	/*
+    /**
+     * Data stored in meta keys, but not considered "meta" for an item.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $internal_meta_keys = array(
+        '_wpinv_price',
+        '_wpinv_vat_rule',
+        '_wpinv_vat_class',
+        '_wpinv_type',
+        '_wpinv_custom_id',
+        '_wpinv_custom_name',
+        '_wpinv_custom_singular_name',
+        '_wpinv_editable',
+        '_wpinv_dynamic_pricing',
+        '_minimum_price',
+        '_wpinv_is_recurring',
+        '_wpinv_recurring_period',
+        '_wpinv_recurring_interval',
+        '_wpinv_recurring_limit',
+        '_wpinv_free_trial',
+        '_wpinv_trial_period',
+        '_wpinv_trial_interval',
+    );
+
+    /**
+     * A map of meta keys to data props.
+     *
+     * @since 1.0.19
+     *
+     * @var array
+     */
+    protected $meta_key_to_props = array(
+        '_wpinv_price'                => 'price',
+        '_wpinv_vat_rule'             => 'vat_rule',
+        '_wpinv_vat_class'            => 'vat_class',
+        '_wpinv_type'                 => 'type',
+        '_wpinv_custom_id'            => 'custom_id',
+        '_wpinv_custom_name'          => 'custom_name',
+        '_wpinv_custom_singular_name' => 'custom_singular_name',
+        '_wpinv_editable'             => 'is_editable',
+        '_wpinv_dynamic_pricing'      => 'is_dynamic_pricing',
+        '_minimum_price'              => 'minimum_price',
+        '_wpinv_custom_name'          => 'custom_name',
+        '_wpinv_is_recurring'         => 'is_recurring',
+        '_wpinv_recurring_period'     => 'recurring_period',
+        '_wpinv_recurring_interval'   => 'recurring_interval',
+        '_wpinv_recurring_limit'      => 'recurring_limit',
+        '_wpinv_free_trial'           => 'is_free_trial',
+        '_wpinv_trial_period'         => 'trial_period',
+        '_wpinv_trial_interval'       => 'trial_interval',
+        '_wpinv_version'              => 'version',
+    );
+
+    /*
 	|--------------------------------------------------------------------------
 	| CRUD Methods
 	|--------------------------------------------------------------------------
 	*/
 
-	/**
-	 * Method to create a new item in the database.
-	 *
-	 * @param WPInv_Item $item Item object.
-	 */
-	public function create( &$item ) {
-		$item->set_version( WPINV_VERSION );
-		$item->set_date_created( current_time( 'mysql' ) );
-
-		// Create a new post.
-		$id = wp_insert_post(
-			apply_filters(
-				'getpaid_new_item_data',
-				array(
-					'post_date'    => $item->get_date_created( 'edit' ),
-					'post_type'    => 'wpi_item',
-					'post_status'  => $this->get_post_status( $item ),
-					'ping_status'  => 'closed',
-					'post_author'  => $item->get_author( 'edit' ),
-					'post_title'   => $item->get_name( 'edit' ),
-					'post_parent'  => $item->get_parent_id(),
-					'post_excerpt' => $item->get_description( 'edit' ),
-				)
-			),
-			true
-		);
-
-		if ( $id && ! is_wp_error( $id ) ) {
-			$item->set_id( $id );
-			$this->update_post_meta( $item );
-			$item->save_meta_data();
-			$item->apply_changes();
-			$this->clear_caches( $item );
-			do_action( 'getpaid_new_item', $item );
-			return true;
-		}
-
-		if ( is_wp_error( $id ) ) {
-			$item->last_error = $id->get_error_message();
-		}
-
-		return false;
-	}
-
-	/**
-	 * Method to read an item from the database.
-	 *
-	 * @param WPInv_Item $item Item object.
-	 *
-	 */
-	public function read( &$item ) {
-
-		$item->set_defaults();
-		$item_object = get_post( $item->get_id() );
-
-		if ( ! $item->get_id() || ! $item_object || $item_object->post_type != 'wpi_item' ) {
-			$item->last_error = __( 'Invalid item.', 'invoicing' );
-			$item->set_id( 0 );
-			return false;
-		}
-
-		$item->set_props(
-			array(
-				'parent_id'     => $item_object->post_parent,
-				'date_created'  => 0 < $item_object->post_date ? $item_object->post_date : null,
-				'date_modified' => 0 < $item_object->post_modified ? $item_object->post_modified : null,
-				'status'        => $item_object->post_status,
-				'name'          => $item_object->post_title,
-				'description'   => $item_object->post_excerpt,
-				'author'        => $item_object->post_author,
-			)
-		);
-
-		$this->read_object_data( $item, $item_object );
-		$item->read_meta_data();
-		$item->set_object_read( true );
-		do_action( 'getpaid_read_item', $item );
-
-	}
-
-	/**
-	 * Method to update an item in the database.
-	 *
-	 * @param WPInv_Item $item Item object.
-	 */
-	public function update( &$item ) {
-		$item->save_meta_data();
-		$item->set_version( WPINV_VERSION );
-
-		if ( null === $item->get_date_created( 'edit' ) ) {
-			$item->set_date_created( current_time( 'mysql' ) );
-		}
-
-		// Grab the current status so we can compare.
-		$previous_status = get_post_status( $item->get_id() );
-
-		$changes = $item->get_changes();
-
-		// Only update the post when the post data changes.
-		if ( array_intersect( array( 'date_created', 'date_modified', 'status', 'parent_id', 'description', 'name', 'author' ), array_keys( $changes ) ) ) {
-			$post_data = array(
-				'post_date'     => $item->get_date_created( 'edit' ),
-				'post_status'   => $item->get_status( 'edit' ),
-				'post_parent'   => $item->get_parent_id( 'edit' ),
-				'post_excerpt'  => $item->get_description( 'edit' ),
-				'post_modified' => $item->get_date_modified( 'edit' ),
-				'post_title'    => $item->get_name( 'edit' ),
-				'post_author'   => $item->get_author( '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' => $item->get_id() ) );
-				clean_post_cache( $item->get_id() );
-			} else {
-				wp_update_post( array_merge( array( 'ID' => $item->get_id() ), $post_data ) );
-			}
-			$item->read_meta_data( true ); // Refresh internal meta data, in case things were hooked into `save_post` or another WP hook.
-		}
-		$this->update_post_meta( $item );
-		$item->apply_changes();
-		$this->clear_caches( $item );
-
-		// Fire a hook depending on the status - this should be considered a creation if it was previously draft status.
-		$new_status = $item->get_status( 'edit' );
-
-		if ( $new_status !== $previous_status && in_array( $previous_status, array( 'new', 'auto-draft', 'draft' ), true ) ) {
-			do_action( 'getpaid_new_item', $item );
-		} else {
-			do_action( 'getpaid_update_item', $item );
-		}
-
-	}
-
-	/*
+    /**
+     * Method to create a new item in the database.
+     *
+     * @param WPInv_Item $item Item object.
+     */
+    public function create( &$item ) {
+        $item->set_version( WPINV_VERSION );
+        $item->set_date_created( current_time( 'mysql' ) );
+
+        // Create a new post.
+        $id = wp_insert_post(
+            apply_filters(
+                'getpaid_new_item_data',
+                array(
+                    'post_date'    => $item->get_date_created( 'edit' ),
+                    'post_type'    => 'wpi_item',
+                    'post_status'  => $this->get_post_status( $item ),
+                    'ping_status'  => 'closed',
+                    'post_author'  => $item->get_author( 'edit' ),
+                    'post_title'   => $item->get_name( 'edit' ),
+                    'post_parent'  => $item->get_parent_id(),
+                    'post_excerpt' => $item->get_description( 'edit' ),
+                )
+            ),
+            true
+        );
+
+        if ( $id && ! is_wp_error( $id ) ) {
+            $item->set_id( $id );
+            $this->update_post_meta( $item );
+            $item->save_meta_data();
+            $item->apply_changes();
+            $this->clear_caches( $item );
+            do_action( 'getpaid_new_item', $item );
+            return true;
+        }
+
+        if ( is_wp_error( $id ) ) {
+            $item->last_error = $id->get_error_message();
+        }
+
+        return false;
+    }
+
+    /**
+     * Method to read an item from the database.
+     *
+     * @param WPInv_Item $item Item object.
+     *
+     */
+    public function read( &$item ) {
+
+        $item->set_defaults();
+        $item_object = get_post( $item->get_id() );
+
+        if ( ! $item->get_id() || ! $item_object || $item_object->post_type != 'wpi_item' ) {
+            $item->last_error = __( 'Invalid item.', 'invoicing' );
+            $item->set_id( 0 );
+            return false;
+        }
+
+        $item->set_props(
+            array(
+                'parent_id'     => $item_object->post_parent,
+                'date_created'  => 0 < $item_object->post_date ? $item_object->post_date : null,
+                'date_modified' => 0 < $item_object->post_modified ? $item_object->post_modified : null,
+                'status'        => $item_object->post_status,
+                'name'          => $item_object->post_title,
+                'description'   => $item_object->post_excerpt,
+                'author'        => $item_object->post_author,
+            )
+        );
+
+        $this->read_object_data( $item, $item_object );
+        $item->read_meta_data();
+        $item->set_object_read( true );
+        do_action( 'getpaid_read_item', $item );
+
+    }
+
+    /**
+     * Method to update an item in the database.
+     *
+     * @param WPInv_Item $item Item object.
+     */
+    public function update( &$item ) {
+        $item->save_meta_data();
+        $item->set_version( WPINV_VERSION );
+
+        if ( null === $item->get_date_created( 'edit' ) ) {
+            $item->set_date_created( current_time( 'mysql' ) );
+        }
+
+        // Grab the current status so we can compare.
+        $previous_status = get_post_status( $item->get_id() );
+
+        $changes = $item->get_changes();
+
+        // Only update the post when the post data changes.
+        if ( array_intersect( array( 'date_created', 'date_modified', 'status', 'parent_id', 'description', 'name', 'author' ), array_keys( $changes ) ) ) {
+            $post_data = array(
+                'post_date'     => $item->get_date_created( 'edit' ),
+                'post_status'   => $item->get_status( 'edit' ),
+                'post_parent'   => $item->get_parent_id( 'edit' ),
+                'post_excerpt'  => $item->get_description( 'edit' ),
+                'post_modified' => $item->get_date_modified( 'edit' ),
+                'post_title'    => $item->get_name( 'edit' ),
+                'post_author'   => $item->get_author( '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' => $item->get_id() ) );
+                clean_post_cache( $item->get_id() );
+            } else {
+                wp_update_post( array_merge( array( 'ID' => $item->get_id() ), $post_data ) );
+            }
+            $item->read_meta_data( true ); // Refresh internal meta data, in case things were hooked into `save_post` or another WP hook.
+        }
+        $this->update_post_meta( $item );
+        $item->apply_changes();
+        $this->clear_caches( $item );
+
+        // Fire a hook depending on the status - this should be considered a creation if it was previously draft status.
+        $new_status = $item->get_status( 'edit' );
+
+        if ( $new_status !== $previous_status && in_array( $previous_status, array( 'new', 'auto-draft', 'draft' ), true ) ) {
+            do_action( 'getpaid_new_item', $item );
+        } else {
+            do_action( 'getpaid_update_item', $item );
+        }
+
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Additional Methods
 	|--------------------------------------------------------------------------
 	*/
 
-	/**
-	 * Helper method that updates all the post meta for an item based on it's settings in the WPInv_Item class.
-	 *
-	 * @param WPInv_Item $item WPInv_Item object.
-	 * @since 1.0.19
-	 */
-	protected function update_post_meta( &$item ) {
+    /**
+     * Helper method that updates all the post meta for an item based on it's settings in the WPInv_Item class.
+     *
+     * @param WPInv_Item $item WPInv_Item object.
+     * @since 1.0.19
+     */
+    protected function update_post_meta( &$item ) {
 
-		// Ensure that we have a custom id.
+        // Ensure that we have a custom id.
         if ( ! $item->get_custom_id() ) {
             $item->set_custom_id( $item->get_id() );
-		}
+        }
 
-		parent::update_post_meta( $item );
-	}
+        parent::update_post_meta( $item );
+    }
 
 }

Spacing +51 added lines, -51 removed lines

@@ -3,7 +3,7 @@ 
  * GetPaid_Item_Data_Store class file.
  *
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -80,39 +80,39 @@ 
 	 *
 	 * @param WPInv_Item $item Item object.
 	 */
-	public function create( &$item ) {
-		$item->set_version( WPINV_VERSION );
-		$item->set_date_created( current_time( 'mysql' ) );
+	public function create(&$item) {
+		$item->set_version(WPINV_VERSION);
+		$item->set_date_created(current_time('mysql'));
 
 		// Create a new post.
 		$id = wp_insert_post(
 			apply_filters(
 				'getpaid_new_item_data',
 				array(
-					'post_date'    => $item->get_date_created( 'edit' ),
+					'post_date'    => $item->get_date_created('edit'),
 					'post_type'    => 'wpi_item',
-					'post_status'  => $this->get_post_status( $item ),
+					'post_status'  => $this->get_post_status($item),
 					'ping_status'  => 'closed',
-					'post_author'  => $item->get_author( 'edit' ),
-					'post_title'   => $item->get_name( 'edit' ),
+					'post_author'  => $item->get_author('edit'),
+					'post_title'   => $item->get_name('edit'),
 					'post_parent'  => $item->get_parent_id(),
-					'post_excerpt' => $item->get_description( 'edit' ),
+					'post_excerpt' => $item->get_description('edit'),
 				)
 			),
 			true
 		);
 
-		if ( $id && ! is_wp_error( $id ) ) {
-			$item->set_id( $id );
-			$this->update_post_meta( $item );
+		if ($id && !is_wp_error($id)) {
+			$item->set_id($id);
+			$this->update_post_meta($item);
 			$item->save_meta_data();
 			$item->apply_changes();
-			$this->clear_caches( $item );
-			do_action( 'getpaid_new_item', $item );
+			$this->clear_caches($item);
+			do_action('getpaid_new_item', $item);
 			return true;
 		}
 
-		if ( is_wp_error( $id ) ) {
+		if (is_wp_error($id)) {
 			$item->last_error = $id->get_error_message();
 		}
 
@@ -125,14 +125,14 @@ 
 	 * @param WPInv_Item $item Item object.
 	 *
 	 */
-	public function read( &$item ) {
+	public function read(&$item) {
 
 		$item->set_defaults();
-		$item_object = get_post( $item->get_id() );
+		$item_object = get_post($item->get_id());
 
-		if ( ! $item->get_id() || ! $item_object || $item_object->post_type != 'wpi_item' ) {
-			$item->last_error = __( 'Invalid item.', 'invoicing' );
-			$item->set_id( 0 );
+		if (!$item->get_id() || !$item_object || $item_object->post_type != 'wpi_item') {
+			$item->last_error = __('Invalid item.', 'invoicing');
+			$item->set_id(0);
 			return false;
 		}
 
@@ -148,10 +148,10 @@ 
 			)
 		);
 
-		$this->read_object_data( $item, $item_object );
+		$this->read_object_data($item, $item_object);
 		$item->read_meta_data();
-		$item->set_object_read( true );
-		do_action( 'getpaid_read_item', $item );
+		$item->set_object_read(true);
+		do_action('getpaid_read_item', $item);
 
 	}
 
@@ -160,29 +160,29 @@ 
 	 *
 	 * @param WPInv_Item $item Item object.
 	 */
-	public function update( &$item ) {
+	public function update(&$item) {
 		$item->save_meta_data();
-		$item->set_version( WPINV_VERSION );
+		$item->set_version(WPINV_VERSION);
 
-		if ( null === $item->get_date_created( 'edit' ) ) {
-			$item->set_date_created( current_time( 'mysql' ) );
+		if (null === $item->get_date_created('edit')) {
+			$item->set_date_created(current_time('mysql'));
 		}
 
 		// Grab the current status so we can compare.
-		$previous_status = get_post_status( $item->get_id() );
+		$previous_status = get_post_status($item->get_id());
 
 		$changes = $item->get_changes();
 
 		// Only update the post when the post data changes.
-		if ( array_intersect( array( 'date_created', 'date_modified', 'status', 'parent_id', 'description', 'name', 'author' ), array_keys( $changes ) ) ) {
+		if (array_intersect(array('date_created', 'date_modified', 'status', 'parent_id', 'description', 'name', 'author'), array_keys($changes))) {
 			$post_data = array(
-				'post_date'     => $item->get_date_created( 'edit' ),
-				'post_status'   => $item->get_status( 'edit' ),
-				'post_parent'   => $item->get_parent_id( 'edit' ),
-				'post_excerpt'  => $item->get_description( 'edit' ),
-				'post_modified' => $item->get_date_modified( 'edit' ),
-				'post_title'    => $item->get_name( 'edit' ),
-				'post_author'   => $item->get_author( 'edit' ),
+				'post_date'     => $item->get_date_created('edit'),
+				'post_status'   => $item->get_status('edit'),
+				'post_parent'   => $item->get_parent_id('edit'),
+				'post_excerpt'  => $item->get_description('edit'),
+				'post_modified' => $item->get_date_modified('edit'),
+				'post_title'    => $item->get_name('edit'),
+				'post_author'   => $item->get_author('edit'),
 			);
 
 			/**
@@ -193,25 +193,25 @@ 
 			 * 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' => $item->get_id() ) );
-				clean_post_cache( $item->get_id() );
+			if (doing_action('save_post')) {
+				$GLOBALS['wpdb']->update($GLOBALS['wpdb']->posts, $post_data, array('ID' => $item->get_id()));
+				clean_post_cache($item->get_id());
 			} else {
-				wp_update_post( array_merge( array( 'ID' => $item->get_id() ), $post_data ) );
+				wp_update_post(array_merge(array('ID' => $item->get_id()), $post_data));
 			}
-			$item->read_meta_data( true ); // Refresh internal meta data, in case things were hooked into `save_post` or another WP hook.
+			$item->read_meta_data(true); // Refresh internal meta data, in case things were hooked into `save_post` or another WP hook.
 		}
-		$this->update_post_meta( $item );
+		$this->update_post_meta($item);
 		$item->apply_changes();
-		$this->clear_caches( $item );
+		$this->clear_caches($item);
 
 		// Fire a hook depending on the status - this should be considered a creation if it was previously draft status.
-		$new_status = $item->get_status( 'edit' );
+		$new_status = $item->get_status('edit');
 
-		if ( $new_status !== $previous_status && in_array( $previous_status, array( 'new', 'auto-draft', 'draft' ), true ) ) {
-			do_action( 'getpaid_new_item', $item );
+		if ($new_status !== $previous_status && in_array($previous_status, array('new', 'auto-draft', 'draft'), true)) {
+			do_action('getpaid_new_item', $item);
 		} else {
-			do_action( 'getpaid_update_item', $item );
+			do_action('getpaid_update_item', $item);
 		}
 
 	}
@@ -228,14 +228,14 @@ 
 	 * @param WPInv_Item $item WPInv_Item object.
 	 * @since 1.0.19
 	 */
-	protected function update_post_meta( &$item ) {
+	protected function update_post_meta(&$item) {
 
 		// Ensure that we have a custom id.
-        if ( ! $item->get_custom_id() ) {
-            $item->set_custom_id( $item->get_id() );
+        if (!$item->get_custom_id()) {
+            $item->set_custom_id($item->get_id());
 		}
 
-		parent::update_post_meta( $item );
+		parent::update_post_meta($item);
 	}
 
 }

includes/payments/class-getpaid-payment-form-submission.php

Indentation +878 added lines, -878 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -10,199 +10,199 @@ 
 class GetPaid_Payment_Form_Submission {
 
     /**
-	 * Submission ID
-	 *
-	 * @var string
-	 */
-	public $id = null;
-
-	/**
-	 * The raw submission data.
-	 *
-	 * @var array
-	 */
-	protected $data = null;
-
-	/**
-	 * Submission totals
-	 *
-	 * @var array
-	 */
-	protected $totals = array(
-
-		'subtotal' => array(
-			'initial'   => 0,
-			'recurring' => 0,
-		),
-
-		'discount' => array(
-			'initial'   => 0,
-			'recurring' => 0,
-		),
-
-		'fees'     => array(
-			'initial'   => 0,
-			'recurring' => 0,
-		),
-
-		'taxes'    => array(
-			'initial'   => 0,
-			'recurring' => 0,
-		),
-
-		'shipping' => array(
-			'initial'   => 0,
-			'recurring' => 0,
-		),
-
-	);
-
-	/**
-	 * Sets the associated payment form.
-	 *
-	 * @var GetPaid_Payment_Form
-	 */
+     * Submission ID
+     *
+     * @var string
+     */
+    public $id = null;
+
+    /**
+     * The raw submission data.
+     *
+     * @var array
+     */
+    protected $data = null;
+
+    /**
+     * Submission totals
+     *
+     * @var array
+     */
+    protected $totals = array(
+
+        'subtotal' => array(
+            'initial'   => 0,
+            'recurring' => 0,
+        ),
+
+        'discount' => array(
+            'initial'   => 0,
+            'recurring' => 0,
+        ),
+
+        'fees'     => array(
+            'initial'   => 0,
+            'recurring' => 0,
+        ),
+
+        'taxes'    => array(
+            'initial'   => 0,
+            'recurring' => 0,
+        ),
+
+        'shipping' => array(
+            'initial'   => 0,
+            'recurring' => 0,
+        ),
+
+    );
+
+    /**
+     * Sets the associated payment form.
+     *
+     * @var GetPaid_Payment_Form
+     */
     protected $payment_form = null;
 
     /**
-	 * The country for the submission.
-	 *
-	 * @var string
-	 */
-	public $country = null;
-
-    /**
-	 * The state for the submission.
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $state = null;
-
-	/**
-	 * The invoice associated with the submission.
-	 *
-	 * @var WPInv_Invoice
-	 */
-	protected $invoice = null;
-
-	/**
-	 * The recurring item for the submission.
-	 *
-	 * @var int
-	 */
-	public $has_recurring = 0;
-
-	/**
-	 * An array of fees for the submission.
-	 *
-	 * @var array
-	 */
-	protected $fees = array();
-
-	/**
-	 * An array of discounts for the submission.
-	 *
-	 * @var array
-	 */
-	protected $discounts = array();
-
-	/**
-	 * An array of taxes for the submission.
-	 *
-	 * @var array
-	 */
-	protected $taxes = array();
-
-	/**
-	 * An array of items for the submission.
-	 *
-	 * @var GetPaid_Form_Item[]
-	 */
-	protected $items = array();
-
-	/**
-	 * The last error.
-	 *
-	 * @var string
-	 */
-	public $last_error = null;
-
-	/**
-	 * The last error code.
-	 *
-	 * @var string
-	 */
-	public $last_error_code = null;
-
-    /**
-	 * Class constructor.
-	 *
-	 */
-	public function __construct() {
-
-		// Set the state and country to the default state and country.
-		$this->country = wpinv_default_billing_country();
-		$this->state   = wpinv_get_default_state();
-
-		// Do we have an actual submission?
-		if ( isset( $_POST['getpaid_payment_form_submission'] ) ) {
-			$this->load_data( wp_kses_post_deep( wp_unslash( $_POST ) ) );
-		}
-
-	}
-
-	/**
-	 * Loads submission data.
-	 *
-	 * @param array $data
-	 */
-	public function load_data( $data ) {
-
-		// Allow plugins to filter the data.
-		$data       = apply_filters( 'getpaid_submission_data', $data, $this );
-
-		// Cache it...
-		$this->data = $data;
-
-		// Then generate a unique id from the data.
-		$this->id   = md5( wp_json_encode( $data ) );
-
-		// Finally, process the submission.
-		try {
-
-			// Each process is passed an instance of the class (with reference)
-			// and should throw an Exception whenever it encounters one.
-			$processors = apply_filters(
-				'getpaid_payment_form_submission_processors',
-				array(
-					array( $this, 'process_payment_form' ),
-					array( $this, 'process_invoice' ),
-					array( $this, 'process_fees' ),
-					array( $this, 'process_items' ),
-					array( $this, 'process_discount' ),
-					array( $this, 'process_taxes' ),
-				),
-				$this
-			);
-
-			foreach ( $processors as $processor ) {
-				call_user_func_array( $processor, array( &$this ) );
-			}
-		} catch ( GetPaid_Payment_Exception $e ) {
-			$this->last_error      = $e->getMessage();
-			$this->last_error_code = $e->getErrorCode();
-		} catch ( Exception $e ) {
-			$this->last_error      = $e->getMessage();
-			$this->last_error_code = $e->getCode();
-		}
-
-		// Fired when we are done processing a submission.
-		do_action_ref_array( 'getpaid_process_submission', array( &$this ) );
-
-	}
-
-	/*
+     * The country for the submission.
+     *
+     * @var string
+     */
+    public $country = null;
+
+    /**
+     * The state for the submission.
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $state = null;
+
+    /**
+     * The invoice associated with the submission.
+     *
+     * @var WPInv_Invoice
+     */
+    protected $invoice = null;
+
+    /**
+     * The recurring item for the submission.
+     *
+     * @var int
+     */
+    public $has_recurring = 0;
+
+    /**
+     * An array of fees for the submission.
+     *
+     * @var array
+     */
+    protected $fees = array();
+
+    /**
+     * An array of discounts for the submission.
+     *
+     * @var array
+     */
+    protected $discounts = array();
+
+    /**
+     * An array of taxes for the submission.
+     *
+     * @var array
+     */
+    protected $taxes = array();
+
+    /**
+     * An array of items for the submission.
+     *
+     * @var GetPaid_Form_Item[]
+     */
+    protected $items = array();
+
+    /**
+     * The last error.
+     *
+     * @var string
+     */
+    public $last_error = null;
+
+    /**
+     * The last error code.
+     *
+     * @var string
+     */
+    public $last_error_code = null;
+
+    /**
+     * Class constructor.
+     *
+     */
+    public function __construct() {
+
+        // Set the state and country to the default state and country.
+        $this->country = wpinv_default_billing_country();
+        $this->state   = wpinv_get_default_state();
+
+        // Do we have an actual submission?
+        if ( isset( $_POST['getpaid_payment_form_submission'] ) ) {
+            $this->load_data( wp_kses_post_deep( wp_unslash( $_POST ) ) );
+        }
+
+    }
+
+    /**
+     * Loads submission data.
+     *
+     * @param array $data
+     */
+    public function load_data( $data ) {
+
+        // Allow plugins to filter the data.
+        $data       = apply_filters( 'getpaid_submission_data', $data, $this );
+
+        // Cache it...
+        $this->data = $data;
+
+        // Then generate a unique id from the data.
+        $this->id   = md5( wp_json_encode( $data ) );
+
+        // Finally, process the submission.
+        try {
+
+            // Each process is passed an instance of the class (with reference)
+            // and should throw an Exception whenever it encounters one.
+            $processors = apply_filters(
+                'getpaid_payment_form_submission_processors',
+                array(
+                    array( $this, 'process_payment_form' ),
+                    array( $this, 'process_invoice' ),
+                    array( $this, 'process_fees' ),
+                    array( $this, 'process_items' ),
+                    array( $this, 'process_discount' ),
+                    array( $this, 'process_taxes' ),
+                ),
+                $this
+            );
+
+            foreach ( $processors as $processor ) {
+                call_user_func_array( $processor, array( &$this ) );
+            }
+        } catch ( GetPaid_Payment_Exception $e ) {
+            $this->last_error      = $e->getMessage();
+            $this->last_error_code = $e->getErrorCode();
+        } catch ( Exception $e ) {
+            $this->last_error      = $e->getMessage();
+            $this->last_error_code = $e->getCode();
+        }
+
+        // Fired when we are done processing a submission.
+        do_action_ref_array( 'getpaid_process_submission', array( &$this ) );
+
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Payment Forms.
 	|--------------------------------------------------------------------------
@@ -211,39 +211,39 @@ 
 	| submission has an active payment form etc.
     */
 
-	/**
-	 * Prepares the submission's payment form.
-	 *
-	 * @since 1.0.19
-	 */
-	public function process_payment_form() {
+    /**
+     * Prepares the submission's payment form.
+     *
+     * @since 1.0.19
+     */
+    public function process_payment_form() {
 
-		// Every submission needs an active payment form.
-		if ( empty( $this->data['form_id'] ) ) {
-			throw new Exception( __( 'Missing payment form', 'invoicing' ) );
-		}
+        // Every submission needs an active payment form.
+        if ( empty( $this->data['form_id'] ) ) {
+            throw new Exception( __( 'Missing payment form', 'invoicing' ) );
+        }
 
-		// Fetch the payment form.
-		$this->payment_form = new GetPaid_Payment_Form( $this->data['form_id'] );
+        // Fetch the payment form.
+        $this->payment_form = new GetPaid_Payment_Form( $this->data['form_id'] );
 
-		if ( ! $this->payment_form->is_active() ) {
-			throw new Exception( __( 'Payment form not active', 'invoicing' ) );
-		}
+        if ( ! $this->payment_form->is_active() ) {
+            throw new Exception( __( 'Payment form not active', 'invoicing' ) );
+        }
 
-		do_action_ref_array( 'getpaid_submissions_process_payment_form', array( &$this ) );
-	}
+        do_action_ref_array( 'getpaid_submissions_process_payment_form', array( &$this ) );
+    }
 
     /**
-	 * Returns the payment form.
-	 *
-	 * @since 1.0.19
-	 * @return GetPaid_Payment_Form
-	 */
-	public function get_payment_form() {
-		return $this->payment_form;
-	}
+     * Returns the payment form.
+     *
+     * @since 1.0.19
+     * @return GetPaid_Payment_Form
+     */
+    public function get_payment_form() {
+        return $this->payment_form;
+    }
 
-	/*
+    /*
 	|--------------------------------------------------------------------------
 	| Invoices.
 	|--------------------------------------------------------------------------
@@ -252,95 +252,95 @@ 
 	| might be for an existing invoice.
 	*/
 
-	/**
-	 * Prepares the submission's invoice.
-	 *
-	 * @since 1.0.19
-	 */
-	public function process_invoice() {
-
-		// Abort if there is no invoice.
-		if ( empty( $this->data['invoice_id'] ) ) {
-
-			// Check if we are resuming a payment.
-			if ( empty( $this->data['maybe_use_invoice'] ) ) {
-				return;
-			}
-
-			$invoice = wpinv_get_invoice( $this->data['maybe_use_invoice'] );
-			if ( empty( $invoice ) || ! $invoice->has_status( 'draft, auto-draft, wpi-pending' ) ) {
-				return;
-			}
-		}
-
-		// If the submission is for an existing invoice, ensure that it exists
-		// and that it is not paid for.
-		if ( empty( $invoice ) ) {
-			$invoice = wpinv_get_invoice( $this->data['invoice_id'] );
-		}
+    /**
+     * Prepares the submission's invoice.
+     *
+     * @since 1.0.19
+     */
+    public function process_invoice() {
+
+        // Abort if there is no invoice.
+        if ( empty( $this->data['invoice_id'] ) ) {
+
+            // Check if we are resuming a payment.
+            if ( empty( $this->data['maybe_use_invoice'] ) ) {
+                return;
+            }
+
+            $invoice = wpinv_get_invoice( $this->data['maybe_use_invoice'] );
+            if ( empty( $invoice ) || ! $invoice->has_status( 'draft, auto-draft, wpi-pending' ) ) {
+                return;
+            }
+        }
+
+        // If the submission is for an existing invoice, ensure that it exists
+        // and that it is not paid for.
+        if ( empty( $invoice ) ) {
+            $invoice = wpinv_get_invoice( $this->data['invoice_id'] );
+        }
 
         if ( empty( $invoice ) ) {
-			throw new Exception( __( 'Invalid invoice', 'invoicing' ) );
-		}
-
-		if ( $invoice->is_paid() ) {
-			throw new Exception( __( 'This invoice is already paid for.', 'invoicing' ) );
-		}
-
-		$this->payment_form->invoice = $invoice;
-		if ( ! $this->payment_form->is_default() ) {
-
-			$items    = array();
-			$item_ids = array();
-
-			foreach ( $invoice->get_items() as $item ) {
-				if ( ! in_array( $item->get_id(), $item_ids ) ) {
-					$item_ids[] = $item->get_id();
-					$items[]    = $item;
-				}
-			}
-
-			foreach ( $this->payment_form->get_items() as $item ) {
-				if ( ! in_array( $item->get_id(), $item_ids ) ) {
-					$item_ids[] = $item->get_id();
-					$items[]    = $item;
-				}
-			}
-
-			$this->payment_form->set_items( $items );
-
-		} else {
-			$this->payment_form->set_items( $invoice->get_items() );
-		}
-
-		$this->country = $invoice->get_country();
-		$this->state   = $invoice->get_state();
-		$this->invoice = $invoice;
-
-		do_action_ref_array( 'getpaid_submissions_process_invoice', array( &$this ) );
-	}
-
-	/**
-	 * Returns the associated invoice.
-	 *
-	 * @since 1.0.19
-	 * @return WPInv_Invoice
-	 */
-	public function get_invoice() {
-		return $this->invoice;
-	}
-
-	/**
-	 * Checks whether there is an invoice associated with this submission.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function has_invoice() {
-		return ! empty( $this->invoice );
-	}
-
-	/*
+            throw new Exception( __( 'Invalid invoice', 'invoicing' ) );
+        }
+
+        if ( $invoice->is_paid() ) {
+            throw new Exception( __( 'This invoice is already paid for.', 'invoicing' ) );
+        }
+
+        $this->payment_form->invoice = $invoice;
+        if ( ! $this->payment_form->is_default() ) {
+
+            $items    = array();
+            $item_ids = array();
+
+            foreach ( $invoice->get_items() as $item ) {
+                if ( ! in_array( $item->get_id(), $item_ids ) ) {
+                    $item_ids[] = $item->get_id();
+                    $items[]    = $item;
+                }
+            }
+
+            foreach ( $this->payment_form->get_items() as $item ) {
+                if ( ! in_array( $item->get_id(), $item_ids ) ) {
+                    $item_ids[] = $item->get_id();
+                    $items[]    = $item;
+                }
+            }
+
+            $this->payment_form->set_items( $items );
+
+        } else {
+            $this->payment_form->set_items( $invoice->get_items() );
+        }
+
+        $this->country = $invoice->get_country();
+        $this->state   = $invoice->get_state();
+        $this->invoice = $invoice;
+
+        do_action_ref_array( 'getpaid_submissions_process_invoice', array( &$this ) );
+    }
+
+    /**
+     * Returns the associated invoice.
+     *
+     * @since 1.0.19
+     * @return WPInv_Invoice
+     */
+    public function get_invoice() {
+        return $this->invoice;
+    }
+
+    /**
+     * Checks whether there is an invoice associated with this submission.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function has_invoice() {
+        return ! empty( $this->invoice );
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Items.
 	|--------------------------------------------------------------------------
@@ -349,129 +349,129 @@ 
 	| recurring item. But can have an unlimited number of non-recurring items.
 	*/
 
-	/**
-	 * Prepares the submission's items.
-	 *
-	 * @since 1.0.19
-	 */
-	public function process_items() {
-
-		$processor = new GetPaid_Payment_Form_Submission_Items( $this );
-
-		foreach ( $processor->items as $item ) {
-			$this->add_item( $item );
-		}
-
-		do_action_ref_array( 'getpaid_submissions_process_items', array( &$this ) );
-	}
-
-	/**
-	 * Adds an item to the submission.
-	 *
-	 * @since 1.0.19
-	 * @param GetPaid_Form_Item $item
-	 */
-	public function add_item( $item ) {
-
-		// Make sure that it is available for purchase.
-		if ( ! $item->can_purchase() || isset( $this->items[ $item->get_id() ] ) ) {
-			return;
-		}
-
-		// Each submission can only contain one recurring item.
-		if ( $item->is_recurring() ) {
-			$this->has_recurring = $item->get_id();
-		}
-
-		// Update the items and totals.
-		$this->items[ $item->get_id() ]         = $item;
-		$this->totals['subtotal']['initial']   += $item->get_sub_total();
-		$this->totals['subtotal']['recurring'] += $item->get_recurring_sub_total();
-
-	}
-
-	/**
-	 * Removes a specific item.
-	 *
-	 * You should not call this method after the discounts and taxes
-	 * have been calculated.
-	 *
-	 * @since 1.0.19
-	 */
-	public function remove_item( $item_id ) {
-
-		if ( isset( $this->items[ $item_id ] ) ) {
-			$this->totals['subtotal']['initial']   -= $this->items[ $item_id ]->get_sub_total();
-			$this->totals['subtotal']['recurring'] -= $this->items[ $item_id ]->get_recurring_sub_total();
-
-			if ( $this->items[ $item_id ]->is_recurring() ) {
-				$this->has_recurring = 0;
-			}
-
-			unset( $this->items[ $item_id ] );
-		}
-
-	}
-
-	/**
-	 * Returns the subtotal.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_subtotal() {
-
-		if ( wpinv_prices_include_tax() ) {
-			return $this->totals['subtotal']['initial'] - $this->totals['taxes']['initial'];
-		}
-
-		return $this->totals['subtotal']['initial'];
-	}
-
-	/**
-	 * Returns the recurring subtotal.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_recurring_subtotal() {
-
-		if ( wpinv_prices_include_tax() ) {
-			return $this->totals['subtotal']['recurring'] - $this->totals['taxes']['recurring'];
-		}
-
-		return $this->totals['subtotal']['recurring'];
-	}
-
-	/**
-	 * Returns all items.
-	 *
-	 * @since 1.0.19
-	 * @return GetPaid_Form_Item[]
-	 */
-	public function get_items() {
-		return $this->items;
-	}
-
-	/**
-	 * Checks if there's a single subscription group in the submission.
-	 *
-	 * @since 2.3.0
-	 * @return bool
-	 */
-	public function has_subscription_group() {
-		return $this->has_recurring && getpaid_should_group_subscriptions( $this ) && 1 == count( getpaid_get_subscription_groups( $this ) );
-	}
-
-	/**
-	 * Checks if there are multipe subscription groups in the submission.
-	 *
-	 * @since 2.3.0
-	 * @return bool
-	 */
-	public function has_multiple_subscription_groups() {
-		return $this->has_recurring && 1 < count( getpaid_get_subscription_groups( $this ) );
-	}
-
-	/*
+    /**
+     * Prepares the submission's items.
+     *
+     * @since 1.0.19
+     */
+    public function process_items() {
+
+        $processor = new GetPaid_Payment_Form_Submission_Items( $this );
+
+        foreach ( $processor->items as $item ) {
+            $this->add_item( $item );
+        }
+
+        do_action_ref_array( 'getpaid_submissions_process_items', array( &$this ) );
+    }
+
+    /**
+     * Adds an item to the submission.
+     *
+     * @since 1.0.19
+     * @param GetPaid_Form_Item $item
+     */
+    public function add_item( $item ) {
+
+        // Make sure that it is available for purchase.
+        if ( ! $item->can_purchase() || isset( $this->items[ $item->get_id() ] ) ) {
+            return;
+        }
+
+        // Each submission can only contain one recurring item.
+        if ( $item->is_recurring() ) {
+            $this->has_recurring = $item->get_id();
+        }
+
+        // Update the items and totals.
+        $this->items[ $item->get_id() ]         = $item;
+        $this->totals['subtotal']['initial']   += $item->get_sub_total();
+        $this->totals['subtotal']['recurring'] += $item->get_recurring_sub_total();
+
+    }
+
+    /**
+     * Removes a specific item.
+     *
+     * You should not call this method after the discounts and taxes
+     * have been calculated.
+     *
+     * @since 1.0.19
+     */
+    public function remove_item( $item_id ) {
+
+        if ( isset( $this->items[ $item_id ] ) ) {
+            $this->totals['subtotal']['initial']   -= $this->items[ $item_id ]->get_sub_total();
+            $this->totals['subtotal']['recurring'] -= $this->items[ $item_id ]->get_recurring_sub_total();
+
+            if ( $this->items[ $item_id ]->is_recurring() ) {
+                $this->has_recurring = 0;
+            }
+
+            unset( $this->items[ $item_id ] );
+        }
+
+    }
+
+    /**
+     * Returns the subtotal.
+     *
+     * @since 1.0.19
+     */
+    public function get_subtotal() {
+
+        if ( wpinv_prices_include_tax() ) {
+            return $this->totals['subtotal']['initial'] - $this->totals['taxes']['initial'];
+        }
+
+        return $this->totals['subtotal']['initial'];
+    }
+
+    /**
+     * Returns the recurring subtotal.
+     *
+     * @since 1.0.19
+     */
+    public function get_recurring_subtotal() {
+
+        if ( wpinv_prices_include_tax() ) {
+            return $this->totals['subtotal']['recurring'] - $this->totals['taxes']['recurring'];
+        }
+
+        return $this->totals['subtotal']['recurring'];
+    }
+
+    /**
+     * Returns all items.
+     *
+     * @since 1.0.19
+     * @return GetPaid_Form_Item[]
+     */
+    public function get_items() {
+        return $this->items;
+    }
+
+    /**
+     * Checks if there's a single subscription group in the submission.
+     *
+     * @since 2.3.0
+     * @return bool
+     */
+    public function has_subscription_group() {
+        return $this->has_recurring && getpaid_should_group_subscriptions( $this ) && 1 == count( getpaid_get_subscription_groups( $this ) );
+    }
+
+    /**
+     * Checks if there are multipe subscription groups in the submission.
+     *
+     * @since 2.3.0
+     * @return bool
+     */
+    public function has_multiple_subscription_groups() {
+        return $this->has_recurring && 1 < count( getpaid_get_subscription_groups( $this ) );
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Taxes
 	|--------------------------------------------------------------------------
@@ -480,128 +480,128 @@ 
 	| or only one-time.
     */
 
-	/**
-	 * Prepares the submission's taxes.
-	 *
-	 * @since 1.0.19
-	 */
-	public function process_taxes() {
-
-		// Abort if we're not using taxes.
-		if ( ! $this->use_taxes() ) {
-			return;
-		}
-
-		// If a custom country && state has been passed in, use it to calculate taxes.
-		$country = $this->get_field( 'wpinv_country', 'billing' );
-		if ( ! empty( $country ) ) {
-			$this->country = $country;
-		}
-
-		$state = $this->get_field( 'wpinv_state', 'billing' );
-		if ( ! empty( $state ) ) {
-			$this->state = $state;
-		}
-
-		// Confirm if the provided country and the ip country are similar.
-		$address_confirmed = $this->get_field( 'confirm-address' );
-		if ( isset( $_POST['billing']['country'] ) && wpinv_should_validate_vat_number() && getpaid_get_ip_country() != $this->country && empty( $address_confirmed ) ) {
-			throw new Exception( __( 'The country of your current location must be the same as the country of your billing location or you must confirm the billing address is your home country.', 'invoicing' ) );
-		}
-
-		// Abort if the country is not taxable.
-		if ( ! wpinv_is_country_taxable( $this->country ) ) {
-			return;
-		}
-
-		$processor = new GetPaid_Payment_Form_Submission_Taxes( $this );
-
-		foreach ( $processor->taxes as $tax ) {
-			$this->add_tax( $tax );
-		}
-
-		do_action_ref_array( 'getpaid_submissions_process_taxes', array( &$this ) );
-	}
-
-	/**
-	 * Adds a tax to the submission.
-	 *
-	 * @param array $tax An array of tax details. name, initial_tax, and recurring_tax are required.
-	 * @since 1.0.19
-	 */
-	public function add_tax( $tax ) {
-
-		if ( wpinv_round_tax_per_tax_rate() ) {
-			$tax['initial_tax']   = wpinv_round_amount( $tax['initial_tax'] );
-			$tax['recurring_tax'] = wpinv_round_amount( $tax['recurring_tax'] );
-		}
-
-		$this->taxes[ $tax['name'] ]         = $tax;
-		$this->totals['taxes']['initial']   += wpinv_sanitize_amount( $tax['initial_tax'] );
-		$this->totals['taxes']['recurring'] += wpinv_sanitize_amount( $tax['recurring_tax'] );
-
-	}
-
-	/**
-	 * Removes a specific tax.
-	 *
-	 * @since 1.0.19
-	 */
-	public function remove_tax( $tax_name ) {
-
-		if ( isset( $this->taxes[ $tax_name ] ) ) {
-			$this->totals['taxes']['initial']   -= $this->taxes[ $tax_name ]['initial_tax'];
-			$this->totals['taxes']['recurring'] -= $this->taxes[ $tax_name ]['recurring_tax'];
-			unset( $this->taxes[ $tax_name ] );
-		}
-
-	}
-
-	/**
-	 * Whether or not we'll use taxes for the submission.
-	 *
-	 * @since 1.0.19
-	 */
-	public function use_taxes() {
-
-		$use_taxes = wpinv_use_taxes();
-
-		if ( $this->has_invoice() && ! $this->invoice->is_taxable() ) {
-			$use_taxes = false;
-		}
-
-		return apply_filters( 'getpaid_submission_use_taxes', $use_taxes, $this );
-
-	}
-
-	/**
-	 * Returns the tax.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_tax() {
-		return $this->totals['taxes']['initial'];
-	}
-
-	/**
-	 * Returns the recurring tax.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_recurring_tax() {
-		return $this->totals['taxes']['recurring'];
-	}
-
-	/**
-	 * Returns all taxes.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_taxes() {
-		return $this->taxes;
-	}
-
-	/*
+    /**
+     * Prepares the submission's taxes.
+     *
+     * @since 1.0.19
+     */
+    public function process_taxes() {
+
+        // Abort if we're not using taxes.
+        if ( ! $this->use_taxes() ) {
+            return;
+        }
+
+        // If a custom country && state has been passed in, use it to calculate taxes.
+        $country = $this->get_field( 'wpinv_country', 'billing' );
+        if ( ! empty( $country ) ) {
+            $this->country = $country;
+        }
+
+        $state = $this->get_field( 'wpinv_state', 'billing' );
+        if ( ! empty( $state ) ) {
+            $this->state = $state;
+        }
+
+        // Confirm if the provided country and the ip country are similar.
+        $address_confirmed = $this->get_field( 'confirm-address' );
+        if ( isset( $_POST['billing']['country'] ) && wpinv_should_validate_vat_number() && getpaid_get_ip_country() != $this->country && empty( $address_confirmed ) ) {
+            throw new Exception( __( 'The country of your current location must be the same as the country of your billing location or you must confirm the billing address is your home country.', 'invoicing' ) );
+        }
+
+        // Abort if the country is not taxable.
+        if ( ! wpinv_is_country_taxable( $this->country ) ) {
+            return;
+        }
+
+        $processor = new GetPaid_Payment_Form_Submission_Taxes( $this );
+
+        foreach ( $processor->taxes as $tax ) {
+            $this->add_tax( $tax );
+        }
+
+        do_action_ref_array( 'getpaid_submissions_process_taxes', array( &$this ) );
+    }
+
+    /**
+     * Adds a tax to the submission.
+     *
+     * @param array $tax An array of tax details. name, initial_tax, and recurring_tax are required.
+     * @since 1.0.19
+     */
+    public function add_tax( $tax ) {
+
+        if ( wpinv_round_tax_per_tax_rate() ) {
+            $tax['initial_tax']   = wpinv_round_amount( $tax['initial_tax'] );
+            $tax['recurring_tax'] = wpinv_round_amount( $tax['recurring_tax'] );
+        }
+
+        $this->taxes[ $tax['name'] ]         = $tax;
+        $this->totals['taxes']['initial']   += wpinv_sanitize_amount( $tax['initial_tax'] );
+        $this->totals['taxes']['recurring'] += wpinv_sanitize_amount( $tax['recurring_tax'] );
+
+    }
+
+    /**
+     * Removes a specific tax.
+     *
+     * @since 1.0.19
+     */
+    public function remove_tax( $tax_name ) {
+
+        if ( isset( $this->taxes[ $tax_name ] ) ) {
+            $this->totals['taxes']['initial']   -= $this->taxes[ $tax_name ]['initial_tax'];
+            $this->totals['taxes']['recurring'] -= $this->taxes[ $tax_name ]['recurring_tax'];
+            unset( $this->taxes[ $tax_name ] );
+        }
+
+    }
+
+    /**
+     * Whether or not we'll use taxes for the submission.
+     *
+     * @since 1.0.19
+     */
+    public function use_taxes() {
+
+        $use_taxes = wpinv_use_taxes();
+
+        if ( $this->has_invoice() && ! $this->invoice->is_taxable() ) {
+            $use_taxes = false;
+        }
+
+        return apply_filters( 'getpaid_submission_use_taxes', $use_taxes, $this );
+
+    }
+
+    /**
+     * Returns the tax.
+     *
+     * @since 1.0.19
+     */
+    public function get_tax() {
+        return $this->totals['taxes']['initial'];
+    }
+
+    /**
+     * Returns the recurring tax.
+     *
+     * @since 1.0.19
+     */
+    public function get_recurring_tax() {
+        return $this->totals['taxes']['recurring'];
+    }
+
+    /**
+     * Returns all taxes.
+     *
+     * @since 1.0.19
+     */
+    public function get_taxes() {
+        return $this->taxes;
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Discounts
 	|--------------------------------------------------------------------------
@@ -610,99 +610,99 @@ 
 	| or only one-time. They also do not have to come from a discount code.
     */
 
-	/**
-	 * Prepares the submission's discount.
-	 *
-	 * @since 1.0.19
-	 */
-	public function process_discount() {
-
-		$initial_total    = $this->get_subtotal() + $this->get_fee() + $this->get_tax();
-		$recurring_total  = $this->get_recurring_subtotal() + $this->get_recurring_fee() + $this->get_recurring_tax();
-		$processor        = new GetPaid_Payment_Form_Submission_Discount( $this, $initial_total, $recurring_total );
-
-		foreach ( $processor->discounts as $discount ) {
-			$this->add_discount( $discount );
-		}
-
-		do_action_ref_array( 'getpaid_submissions_process_discounts', array( &$this ) );
-	}
-
-	/**
-	 * Adds a discount to the submission.
-	 *
-	 * @param array $discount An array of discount details. name, initial_discount, and recurring_discount are required. Include discount_code if the discount is from a discount code.
-	 * @since 1.0.19
-	 */
-	public function add_discount( $discount ) {
-		$this->discounts[ $discount['name'] ]   = $discount;
-		$this->totals['discount']['initial']   += wpinv_sanitize_amount( $discount['initial_discount'] );
-		$this->totals['discount']['recurring'] += wpinv_sanitize_amount( $discount['recurring_discount'] );
-	}
-
-	/**
-	 * Removes a discount from the submission.
-	 *
-	 * @since 1.0.19
-	 */
-	public function remove_discount( $name ) {
-
-		if ( isset( $this->discounts[ $name ] ) ) {
-			$this->totals['discount']['initial']   -= $this->discounts[ $name ]['initial_discount'];
-			$this->totals['discount']['recurring'] -= $this->discounts[ $name ]['recurring_discount'];
-			unset( $this->discounts[ $name ] );
-		}
-
-	}
-
-	/**
-	 * Checks whether there is a discount code associated with this submission.
-	 *
-	 * @since 1.0.19
-	 * @return bool
-	 */
-	public function has_discount_code() {
-		return ! empty( $this->discounts['discount_code'] );
-	}
-
-	/**
-	 * Returns the discount code.
-	 *
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_discount_code() {
-		return $this->has_discount_code() ? $this->discounts['discount_code']['discount_code'] : '';
-	}
-
-	/**
-	 * Returns the discount.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_discount() {
-		return $this->totals['discount']['initial'];
-	}
-
-	/**
-	 * Returns the recurring discount.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_recurring_discount() {
-		return $this->totals['discount']['recurring'];
-	}
-
-	/**
-	 * Returns all discounts.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_discounts() {
-		return $this->discounts;
-	}
-
-	/*
+    /**
+     * Prepares the submission's discount.
+     *
+     * @since 1.0.19
+     */
+    public function process_discount() {
+
+        $initial_total    = $this->get_subtotal() + $this->get_fee() + $this->get_tax();
+        $recurring_total  = $this->get_recurring_subtotal() + $this->get_recurring_fee() + $this->get_recurring_tax();
+        $processor        = new GetPaid_Payment_Form_Submission_Discount( $this, $initial_total, $recurring_total );
+
+        foreach ( $processor->discounts as $discount ) {
+            $this->add_discount( $discount );
+        }
+
+        do_action_ref_array( 'getpaid_submissions_process_discounts', array( &$this ) );
+    }
+
+    /**
+     * Adds a discount to the submission.
+     *
+     * @param array $discount An array of discount details. name, initial_discount, and recurring_discount are required. Include discount_code if the discount is from a discount code.
+     * @since 1.0.19
+     */
+    public function add_discount( $discount ) {
+        $this->discounts[ $discount['name'] ]   = $discount;
+        $this->totals['discount']['initial']   += wpinv_sanitize_amount( $discount['initial_discount'] );
+        $this->totals['discount']['recurring'] += wpinv_sanitize_amount( $discount['recurring_discount'] );
+    }
+
+    /**
+     * Removes a discount from the submission.
+     *
+     * @since 1.0.19
+     */
+    public function remove_discount( $name ) {
+
+        if ( isset( $this->discounts[ $name ] ) ) {
+            $this->totals['discount']['initial']   -= $this->discounts[ $name ]['initial_discount'];
+            $this->totals['discount']['recurring'] -= $this->discounts[ $name ]['recurring_discount'];
+            unset( $this->discounts[ $name ] );
+        }
+
+    }
+
+    /**
+     * Checks whether there is a discount code associated with this submission.
+     *
+     * @since 1.0.19
+     * @return bool
+     */
+    public function has_discount_code() {
+        return ! empty( $this->discounts['discount_code'] );
+    }
+
+    /**
+     * Returns the discount code.
+     *
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_discount_code() {
+        return $this->has_discount_code() ? $this->discounts['discount_code']['discount_code'] : '';
+    }
+
+    /**
+     * Returns the discount.
+     *
+     * @since 1.0.19
+     */
+    public function get_discount() {
+        return $this->totals['discount']['initial'];
+    }
+
+    /**
+     * Returns the recurring discount.
+     *
+     * @since 1.0.19
+     */
+    public function get_recurring_discount() {
+        return $this->totals['discount']['recurring'];
+    }
+
+    /**
+     * Returns all discounts.
+     *
+     * @since 1.0.19
+     */
+    public function get_discounts() {
+        return $this->discounts;
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Fees
 	|--------------------------------------------------------------------------
@@ -712,100 +712,100 @@ 
 	| fees.
     */
 
-	/**
-	 * Prepares the submission's fees.
-	 *
-	 * @since 1.0.19
-	 */
-	public function process_fees() {
-
-		$fees_processor = new GetPaid_Payment_Form_Submission_Fees( $this );
-
-		foreach ( $fees_processor->fees as $fee ) {
-			$this->add_fee( $fee );
-		}
-
-		do_action_ref_array( 'getpaid_submissions_process_fees', array( &$this ) );
-	}
-
-	/**
-	 * Adds a fee to the submission.
-	 *
-	 * @param array $fee An array of fee details. name, initial_fee, and recurring_fee are required.
-	 * @since 1.0.19
-	 */
-	public function add_fee( $fee ) {
-
-		if ( $fee['name'] == 'shipping' ) {
-			$this->totals['shipping']['initial']   += wpinv_sanitize_amount( $fee['initial_fee'] );
-			$this->totals['shipping']['recurring'] += wpinv_sanitize_amount( $fee['recurring_fee'] );
-			return;
-		}
-
-		$this->fees[ $fee['name'] ]         = $fee;
-		$this->totals['fees']['initial']   += wpinv_sanitize_amount( $fee['initial_fee'] );
-		$this->totals['fees']['recurring'] += wpinv_sanitize_amount( $fee['recurring_fee'] );
-
-	}
-
-	/**
-	 * Removes a fee from the submission.
-	 *
-	 * @since 1.0.19
-	 */
-	public function remove_fee( $name ) {
-
-		if ( isset( $this->fees[ $name ] ) ) {
-			$this->totals['fees']['initial']   -= $this->fees[ $name ]['initial_fee'];
-			$this->totals['fees']['recurring'] -= $this->fees[ $name ]['recurring_fee'];
-			unset( $this->fees[ $name ] );
-		}
-
-		if ( 'shipping' == $name ) {
-			$this->totals['shipping']['initial']   = 0;
-			$this->totals['shipping']['recurring'] = 0;
-		}
-
-	}
-
-	/**
-	 * Returns the fees.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_fee() {
-		return $this->totals['fees']['initial'];
-	}
-
-	/**
-	 * Returns the recurring fees.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_recurring_fee() {
-		return $this->totals['fees']['recurring'];
-	}
-
-	/**
-	 * Returns all fees.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_fees() {
-		return $this->fees;
-	}
-
-	/**
-	 * Checks if there are any fees for the form.
-	 *
-	 * @return bool
-	 * @since 1.0.19
-	 */
-	public function has_fees() {
-		return count( $this->fees ) !== 0;
-	}
-
-	/*
+    /**
+     * Prepares the submission's fees.
+     *
+     * @since 1.0.19
+     */
+    public function process_fees() {
+
+        $fees_processor = new GetPaid_Payment_Form_Submission_Fees( $this );
+
+        foreach ( $fees_processor->fees as $fee ) {
+            $this->add_fee( $fee );
+        }
+
+        do_action_ref_array( 'getpaid_submissions_process_fees', array( &$this ) );
+    }
+
+    /**
+     * Adds a fee to the submission.
+     *
+     * @param array $fee An array of fee details. name, initial_fee, and recurring_fee are required.
+     * @since 1.0.19
+     */
+    public function add_fee( $fee ) {
+
+        if ( $fee['name'] == 'shipping' ) {
+            $this->totals['shipping']['initial']   += wpinv_sanitize_amount( $fee['initial_fee'] );
+            $this->totals['shipping']['recurring'] += wpinv_sanitize_amount( $fee['recurring_fee'] );
+            return;
+        }
+
+        $this->fees[ $fee['name'] ]         = $fee;
+        $this->totals['fees']['initial']   += wpinv_sanitize_amount( $fee['initial_fee'] );
+        $this->totals['fees']['recurring'] += wpinv_sanitize_amount( $fee['recurring_fee'] );
+
+    }
+
+    /**
+     * Removes a fee from the submission.
+     *
+     * @since 1.0.19
+     */
+    public function remove_fee( $name ) {
+
+        if ( isset( $this->fees[ $name ] ) ) {
+            $this->totals['fees']['initial']   -= $this->fees[ $name ]['initial_fee'];
+            $this->totals['fees']['recurring'] -= $this->fees[ $name ]['recurring_fee'];
+            unset( $this->fees[ $name ] );
+        }
+
+        if ( 'shipping' == $name ) {
+            $this->totals['shipping']['initial']   = 0;
+            $this->totals['shipping']['recurring'] = 0;
+        }
+
+    }
+
+    /**
+     * Returns the fees.
+     *
+     * @since 1.0.19
+     */
+    public function get_fee() {
+        return $this->totals['fees']['initial'];
+    }
+
+    /**
+     * Returns the recurring fees.
+     *
+     * @since 1.0.19
+     */
+    public function get_recurring_fee() {
+        return $this->totals['fees']['recurring'];
+    }
+
+    /**
+     * Returns all fees.
+     *
+     * @since 1.0.19
+     */
+    public function get_fees() {
+        return $this->fees;
+    }
+
+    /**
+     * Checks if there are any fees for the form.
+     *
+     * @return bool
+     * @since 1.0.19
+     */
+    public function has_fees() {
+        return count( $this->fees ) !== 0;
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| MISC
 	|--------------------------------------------------------------------------
@@ -813,147 +813,147 @@ 
 	| Extra submission functions.
     */
 
-	/**
-	 * Returns the shipping amount.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_shipping() {
-		return $this->totals['shipping']['initial'];
-	}
-
-	/**
-	 * Returns the recurring shipping.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_recurring_shipping() {
-		return $this->totals['shipping']['recurring'];
-	}
-
-	/**
-	 * Checks if there are any shipping fees for the form.
-	 *
-	 * @return bool
-	 * @since 1.0.19
-	 */
-	public function has_shipping() {
-		return apply_filters( 'getpaid_payment_form_has_shipping', false, $this );
-	}
-
-	/**
-	 * Checks if this is the initial fetch.
-	 *
-	 * @return bool
-	 * @since 1.0.19
-	 */
-	public function is_initial_fetch() {
-		return isset( $this->data['initial_state'] ) && empty( $this->data['initial_state'] );
-	}
-
-	/**
-	 * Returns the total amount to collect for this submission.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_total() {
-		$total = $this->get_subtotal() + $this->get_fee() + $this->get_tax() + $this->get_shipping() - $this->get_discount();
-		return max( $total, 0 );
-	}
-
-	/**
-	 * Returns the recurring total amount to collect for this submission.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_recurring_total() {
-		$total = $this->get_recurring_subtotal() + $this->get_recurring_fee() + $this->get_recurring_tax() + $this->get_recurring_shipping() - $this->get_recurring_discount();
-		return max( $total, 0 );
-	}
-
-	/**
-	 * Whether payment details should be collected for this submission.
-	 *
-	 * @since 1.0.19
-	 */
-	public function should_collect_payment_details() {
-		$initial   = $this->get_total();
-		$recurring = $this->get_recurring_total();
-
-		if ( $this->has_recurring == 0 ) {
-			$recurring = 0;
-		}
-
-		$collect = $initial > 0 || $recurring > 0;
-		return apply_filters( 'getpaid_submission_should_collect_payment_details', $collect, $this );
-	}
-
-	/**
-	 * Returns the billing email of the user.
-	 *
-	 * @since 1.0.19
-	 */
-	public function get_billing_email() {
-		return apply_filters( 'getpaid_get_submission_billing_email', $this->get_field( 'billing_email' ), $this );
-	}
-
-	/**
-	 * Checks if the submitter has a billing email.
-	 *
-	 * @since 1.0.19
-	 */
-	public function has_billing_email() {
-		$billing_email = $this->get_billing_email();
-		return ! empty( $billing_email ) && is_email( $billing_email );
-	}
-
-	/**
-	 * Returns the appropriate currency for the submission.
-	 *
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_currency() {
-		return $this->has_invoice() ? $this->invoice->get_currency() : wpinv_get_currency();
-    }
-
-    /**
-	 * Returns the raw submission data.
-	 *
-	 * @since 1.0.19
-	 * @return array
-	 */
-	public function get_data() {
-		return $this->data;
-	}
-
-	/**
-	 * Returns a field from the submission data
-	 *
-	 * @param string $field
-	 * @since 1.0.19
-	 * @return mixed|null
-	 */
-	public function get_field( $field, $sub_array_key = null ) {
-		return getpaid_get_array_field( $this->data, $field, $sub_array_key );
-	}
-
-	/**
-	 * Checks if a required field is set.
-	 *
-	 * @since 1.0.19
-	 */
-	public function is_required_field_set( $field ) {
-		return empty( $field['required'] ) || ! empty( $this->data[ $field['id'] ] );
-	}
-
-	/**
-	 * Formats an amount
-	 *
-	 * @since 1.0.19
-	 */
-	public function format_amount( $amount ) {
-		return wpinv_price( $amount, $this->get_currency() );
-	}
+    /**
+     * Returns the shipping amount.
+     *
+     * @since 1.0.19
+     */
+    public function get_shipping() {
+        return $this->totals['shipping']['initial'];
+    }
+
+    /**
+     * Returns the recurring shipping.
+     *
+     * @since 1.0.19
+     */
+    public function get_recurring_shipping() {
+        return $this->totals['shipping']['recurring'];
+    }
+
+    /**
+     * Checks if there are any shipping fees for the form.
+     *
+     * @return bool
+     * @since 1.0.19
+     */
+    public function has_shipping() {
+        return apply_filters( 'getpaid_payment_form_has_shipping', false, $this );
+    }
+
+    /**
+     * Checks if this is the initial fetch.
+     *
+     * @return bool
+     * @since 1.0.19
+     */
+    public function is_initial_fetch() {
+        return isset( $this->data['initial_state'] ) && empty( $this->data['initial_state'] );
+    }
+
+    /**
+     * Returns the total amount to collect for this submission.
+     *
+     * @since 1.0.19
+     */
+    public function get_total() {
+        $total = $this->get_subtotal() + $this->get_fee() + $this->get_tax() + $this->get_shipping() - $this->get_discount();
+        return max( $total, 0 );
+    }
+
+    /**
+     * Returns the recurring total amount to collect for this submission.
+     *
+     * @since 1.0.19
+     */
+    public function get_recurring_total() {
+        $total = $this->get_recurring_subtotal() + $this->get_recurring_fee() + $this->get_recurring_tax() + $this->get_recurring_shipping() - $this->get_recurring_discount();
+        return max( $total, 0 );
+    }
+
+    /**
+     * Whether payment details should be collected for this submission.
+     *
+     * @since 1.0.19
+     */
+    public function should_collect_payment_details() {
+        $initial   = $this->get_total();
+        $recurring = $this->get_recurring_total();
+
+        if ( $this->has_recurring == 0 ) {
+            $recurring = 0;
+        }
+
+        $collect = $initial > 0 || $recurring > 0;
+        return apply_filters( 'getpaid_submission_should_collect_payment_details', $collect, $this );
+    }
+
+    /**
+     * Returns the billing email of the user.
+     *
+     * @since 1.0.19
+     */
+    public function get_billing_email() {
+        return apply_filters( 'getpaid_get_submission_billing_email', $this->get_field( 'billing_email' ), $this );
+    }
+
+    /**
+     * Checks if the submitter has a billing email.
+     *
+     * @since 1.0.19
+     */
+    public function has_billing_email() {
+        $billing_email = $this->get_billing_email();
+        return ! empty( $billing_email ) && is_email( $billing_email );
+    }
+
+    /**
+     * Returns the appropriate currency for the submission.
+     *
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_currency() {
+        return $this->has_invoice() ? $this->invoice->get_currency() : wpinv_get_currency();
+    }
+
+    /**
+     * Returns the raw submission data.
+     *
+     * @since 1.0.19
+     * @return array
+     */
+    public function get_data() {
+        return $this->data;
+    }
+
+    /**
+     * Returns a field from the submission data
+     *
+     * @param string $field
+     * @since 1.0.19
+     * @return mixed|null
+     */
+    public function get_field( $field, $sub_array_key = null ) {
+        return getpaid_get_array_field( $this->data, $field, $sub_array_key );
+    }
+
+    /**
+     * Checks if a required field is set.
+     *
+     * @since 1.0.19
+     */
+    public function is_required_field_set( $field ) {
+        return empty( $field['required'] ) || ! empty( $this->data[ $field['id'] ] );
+    }
+
+    /**
+     * Formats an amount
+     *
+     * @since 1.0.19
+     */
+    public function format_amount( $amount ) {
+        return wpinv_price( $amount, $this->get_currency() );
+    }
 
 }

Spacing +133 added lines, -133 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -146,8 +146,8 @@ 
 		$this->state   = wpinv_get_default_state();
 
 		// Do we have an actual submission?
-		if ( isset( $_POST['getpaid_payment_form_submission'] ) ) {
-			$this->load_data( wp_kses_post_deep( wp_unslash( $_POST ) ) );
+		if (isset($_POST['getpaid_payment_form_submission'])) {
+			$this->load_data(wp_kses_post_deep(wp_unslash($_POST)));
 		}
 
 	}
@@ -157,16 +157,16 @@ 
 	 *
 	 * @param array $data
 	 */
-	public function load_data( $data ) {
+	public function load_data($data) {
 
 		// Allow plugins to filter the data.
-		$data       = apply_filters( 'getpaid_submission_data', $data, $this );
+		$data       = apply_filters('getpaid_submission_data', $data, $this);
 
 		// Cache it...
 		$this->data = $data;
 
 		// Then generate a unique id from the data.
-		$this->id   = md5( wp_json_encode( $data ) );
+		$this->id   = md5(wp_json_encode($data));
 
 		// Finally, process the submission.
 		try {
@@ -176,29 +176,29 @@ 
 			$processors = apply_filters(
 				'getpaid_payment_form_submission_processors',
 				array(
-					array( $this, 'process_payment_form' ),
-					array( $this, 'process_invoice' ),
-					array( $this, 'process_fees' ),
-					array( $this, 'process_items' ),
-					array( $this, 'process_discount' ),
-					array( $this, 'process_taxes' ),
+					array($this, 'process_payment_form'),
+					array($this, 'process_invoice'),
+					array($this, 'process_fees'),
+					array($this, 'process_items'),
+					array($this, 'process_discount'),
+					array($this, 'process_taxes'),
 				),
 				$this
 			);
 
-			foreach ( $processors as $processor ) {
-				call_user_func_array( $processor, array( &$this ) );
+			foreach ($processors as $processor) {
+				call_user_func_array($processor, array(&$this));
 			}
-		} catch ( GetPaid_Payment_Exception $e ) {
+		} catch (GetPaid_Payment_Exception $e) {
 			$this->last_error      = $e->getMessage();
 			$this->last_error_code = $e->getErrorCode();
-		} catch ( Exception $e ) {
+		} catch (Exception $e) {
 			$this->last_error      = $e->getMessage();
 			$this->last_error_code = $e->getCode();
 		}
 
 		// Fired when we are done processing a submission.
-		do_action_ref_array( 'getpaid_process_submission', array( &$this ) );
+		do_action_ref_array('getpaid_process_submission', array(&$this));
 
 	}
 
@@ -219,18 +219,18 @@ 
 	public function process_payment_form() {
 
 		// Every submission needs an active payment form.
-		if ( empty( $this->data['form_id'] ) ) {
-			throw new Exception( __( 'Missing payment form', 'invoicing' ) );
+		if (empty($this->data['form_id'])) {
+			throw new Exception(__('Missing payment form', 'invoicing'));
 		}
 
 		// Fetch the payment form.
-		$this->payment_form = new GetPaid_Payment_Form( $this->data['form_id'] );
+		$this->payment_form = new GetPaid_Payment_Form($this->data['form_id']);
 
-		if ( ! $this->payment_form->is_active() ) {
-			throw new Exception( __( 'Payment form not active', 'invoicing' ) );
+		if (!$this->payment_form->is_active()) {
+			throw new Exception(__('Payment form not active', 'invoicing'));
 		}
 
-		do_action_ref_array( 'getpaid_submissions_process_payment_form', array( &$this ) );
+		do_action_ref_array('getpaid_submissions_process_payment_form', array(&$this));
 	}
 
     /**
@@ -260,64 +260,64 @@ 
 	public function process_invoice() {
 
 		// Abort if there is no invoice.
-		if ( empty( $this->data['invoice_id'] ) ) {
+		if (empty($this->data['invoice_id'])) {
 
 			// Check if we are resuming a payment.
-			if ( empty( $this->data['maybe_use_invoice'] ) ) {
+			if (empty($this->data['maybe_use_invoice'])) {
 				return;
 			}
 
-			$invoice = wpinv_get_invoice( $this->data['maybe_use_invoice'] );
-			if ( empty( $invoice ) || ! $invoice->has_status( 'draft, auto-draft, wpi-pending' ) ) {
+			$invoice = wpinv_get_invoice($this->data['maybe_use_invoice']);
+			if (empty($invoice) || !$invoice->has_status('draft, auto-draft, wpi-pending')) {
 				return;
 			}
 		}
 
 		// If the submission is for an existing invoice, ensure that it exists
 		// and that it is not paid for.
-		if ( empty( $invoice ) ) {
-			$invoice = wpinv_get_invoice( $this->data['invoice_id'] );
+		if (empty($invoice)) {
+			$invoice = wpinv_get_invoice($this->data['invoice_id']);
 		}
 
-        if ( empty( $invoice ) ) {
-			throw new Exception( __( 'Invalid invoice', 'invoicing' ) );
+        if (empty($invoice)) {
+			throw new Exception(__('Invalid invoice', 'invoicing'));
 		}
 
-		if ( $invoice->is_paid() ) {
-			throw new Exception( __( 'This invoice is already paid for.', 'invoicing' ) );
+		if ($invoice->is_paid()) {
+			throw new Exception(__('This invoice is already paid for.', 'invoicing'));
 		}
 
 		$this->payment_form->invoice = $invoice;
-		if ( ! $this->payment_form->is_default() ) {
+		if (!$this->payment_form->is_default()) {
 
 			$items    = array();
 			$item_ids = array();
 
-			foreach ( $invoice->get_items() as $item ) {
-				if ( ! in_array( $item->get_id(), $item_ids ) ) {
+			foreach ($invoice->get_items() as $item) {
+				if (!in_array($item->get_id(), $item_ids)) {
 					$item_ids[] = $item->get_id();
 					$items[]    = $item;
 				}
 			}
 
-			foreach ( $this->payment_form->get_items() as $item ) {
-				if ( ! in_array( $item->get_id(), $item_ids ) ) {
+			foreach ($this->payment_form->get_items() as $item) {
+				if (!in_array($item->get_id(), $item_ids)) {
 					$item_ids[] = $item->get_id();
 					$items[]    = $item;
 				}
 			}
 
-			$this->payment_form->set_items( $items );
+			$this->payment_form->set_items($items);
 
 		} else {
-			$this->payment_form->set_items( $invoice->get_items() );
+			$this->payment_form->set_items($invoice->get_items());
 		}
 
 		$this->country = $invoice->get_country();
 		$this->state   = $invoice->get_state();
 		$this->invoice = $invoice;
 
-		do_action_ref_array( 'getpaid_submissions_process_invoice', array( &$this ) );
+		do_action_ref_array('getpaid_submissions_process_invoice', array(&$this));
 	}
 
 	/**
@@ -337,7 +337,7 @@ 
 	 * @return bool
 	 */
 	public function has_invoice() {
-		return ! empty( $this->invoice );
+		return !empty($this->invoice);
 	}
 
 	/*
@@ -356,13 +356,13 @@ 
 	 */
 	public function process_items() {
 
-		$processor = new GetPaid_Payment_Form_Submission_Items( $this );
+		$processor = new GetPaid_Payment_Form_Submission_Items($this);
 
-		foreach ( $processor->items as $item ) {
-			$this->add_item( $item );
+		foreach ($processor->items as $item) {
+			$this->add_item($item);
 		}
 
-		do_action_ref_array( 'getpaid_submissions_process_items', array( &$this ) );
+		do_action_ref_array('getpaid_submissions_process_items', array(&$this));
 	}
 
 	/**
@@ -371,20 +371,20 @@ 
 	 * @since 1.0.19
 	 * @param GetPaid_Form_Item $item
 	 */
-	public function add_item( $item ) {
+	public function add_item($item) {
 
 		// Make sure that it is available for purchase.
-		if ( ! $item->can_purchase() || isset( $this->items[ $item->get_id() ] ) ) {
+		if (!$item->can_purchase() || isset($this->items[$item->get_id()])) {
 			return;
 		}
 
 		// Each submission can only contain one recurring item.
-		if ( $item->is_recurring() ) {
+		if ($item->is_recurring()) {
 			$this->has_recurring = $item->get_id();
 		}
 
 		// Update the items and totals.
-		$this->items[ $item->get_id() ]         = $item;
+		$this->items[$item->get_id()]         = $item;
 		$this->totals['subtotal']['initial']   += $item->get_sub_total();
 		$this->totals['subtotal']['recurring'] += $item->get_recurring_sub_total();
 
@@ -398,17 +398,17 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function remove_item( $item_id ) {
+	public function remove_item($item_id) {
 
-		if ( isset( $this->items[ $item_id ] ) ) {
-			$this->totals['subtotal']['initial']   -= $this->items[ $item_id ]->get_sub_total();
-			$this->totals['subtotal']['recurring'] -= $this->items[ $item_id ]->get_recurring_sub_total();
+		if (isset($this->items[$item_id])) {
+			$this->totals['subtotal']['initial']   -= $this->items[$item_id]->get_sub_total();
+			$this->totals['subtotal']['recurring'] -= $this->items[$item_id]->get_recurring_sub_total();
 
-			if ( $this->items[ $item_id ]->is_recurring() ) {
+			if ($this->items[$item_id]->is_recurring()) {
 				$this->has_recurring = 0;
 			}
 
-			unset( $this->items[ $item_id ] );
+			unset($this->items[$item_id]);
 		}
 
 	}
@@ -420,7 +420,7 @@ 
 	 */
 	public function get_subtotal() {
 
-		if ( wpinv_prices_include_tax() ) {
+		if (wpinv_prices_include_tax()) {
 			return $this->totals['subtotal']['initial'] - $this->totals['taxes']['initial'];
 		}
 
@@ -434,7 +434,7 @@ 
 	 */
 	public function get_recurring_subtotal() {
 
-		if ( wpinv_prices_include_tax() ) {
+		if (wpinv_prices_include_tax()) {
 			return $this->totals['subtotal']['recurring'] - $this->totals['taxes']['recurring'];
 		}
 
@@ -458,7 +458,7 @@ 
 	 * @return bool
 	 */
 	public function has_subscription_group() {
-		return $this->has_recurring && getpaid_should_group_subscriptions( $this ) && 1 == count( getpaid_get_subscription_groups( $this ) );
+		return $this->has_recurring && getpaid_should_group_subscriptions($this) && 1 == count(getpaid_get_subscription_groups($this));
 	}
 
 	/**
@@ -468,7 +468,7 @@ 
 	 * @return bool
 	 */
 	public function has_multiple_subscription_groups() {
-		return $this->has_recurring && 1 < count( getpaid_get_subscription_groups( $this ) );
+		return $this->has_recurring && 1 < count(getpaid_get_subscription_groups($this));
 	}
 
 	/*
@@ -488,39 +488,39 @@ 
 	public function process_taxes() {
 
 		// Abort if we're not using taxes.
-		if ( ! $this->use_taxes() ) {
+		if (!$this->use_taxes()) {
 			return;
 		}
 
 		// If a custom country && state has been passed in, use it to calculate taxes.
-		$country = $this->get_field( 'wpinv_country', 'billing' );
-		if ( ! empty( $country ) ) {
+		$country = $this->get_field('wpinv_country', 'billing');
+		if (!empty($country)) {
 			$this->country = $country;
 		}
 
-		$state = $this->get_field( 'wpinv_state', 'billing' );
-		if ( ! empty( $state ) ) {
+		$state = $this->get_field('wpinv_state', 'billing');
+		if (!empty($state)) {
 			$this->state = $state;
 		}
 
 		// Confirm if the provided country and the ip country are similar.
-		$address_confirmed = $this->get_field( 'confirm-address' );
-		if ( isset( $_POST['billing']['country'] ) && wpinv_should_validate_vat_number() && getpaid_get_ip_country() != $this->country && empty( $address_confirmed ) ) {
-			throw new Exception( __( 'The country of your current location must be the same as the country of your billing location or you must confirm the billing address is your home country.', 'invoicing' ) );
+		$address_confirmed = $this->get_field('confirm-address');
+		if (isset($_POST['billing']['country']) && wpinv_should_validate_vat_number() && getpaid_get_ip_country() != $this->country && empty($address_confirmed)) {
+			throw new Exception(__('The country of your current location must be the same as the country of your billing location or you must confirm the billing address is your home country.', 'invoicing'));
 		}
 
 		// Abort if the country is not taxable.
-		if ( ! wpinv_is_country_taxable( $this->country ) ) {
+		if (!wpinv_is_country_taxable($this->country)) {
 			return;
 		}
 
-		$processor = new GetPaid_Payment_Form_Submission_Taxes( $this );
+		$processor = new GetPaid_Payment_Form_Submission_Taxes($this);
 
-		foreach ( $processor->taxes as $tax ) {
-			$this->add_tax( $tax );
+		foreach ($processor->taxes as $tax) {
+			$this->add_tax($tax);
 		}
 
-		do_action_ref_array( 'getpaid_submissions_process_taxes', array( &$this ) );
+		do_action_ref_array('getpaid_submissions_process_taxes', array(&$this));
 	}
 
 	/**
@@ -529,16 +529,16 @@ 
 	 * @param array $tax An array of tax details. name, initial_tax, and recurring_tax are required.
 	 * @since 1.0.19
 	 */
-	public function add_tax( $tax ) {
+	public function add_tax($tax) {
 
-		if ( wpinv_round_tax_per_tax_rate() ) {
-			$tax['initial_tax']   = wpinv_round_amount( $tax['initial_tax'] );
-			$tax['recurring_tax'] = wpinv_round_amount( $tax['recurring_tax'] );
+		if (wpinv_round_tax_per_tax_rate()) {
+			$tax['initial_tax']   = wpinv_round_amount($tax['initial_tax']);
+			$tax['recurring_tax'] = wpinv_round_amount($tax['recurring_tax']);
 		}
 
-		$this->taxes[ $tax['name'] ]         = $tax;
-		$this->totals['taxes']['initial']   += wpinv_sanitize_amount( $tax['initial_tax'] );
-		$this->totals['taxes']['recurring'] += wpinv_sanitize_amount( $tax['recurring_tax'] );
+		$this->taxes[$tax['name']]         = $tax;
+		$this->totals['taxes']['initial']   += wpinv_sanitize_amount($tax['initial_tax']);
+		$this->totals['taxes']['recurring'] += wpinv_sanitize_amount($tax['recurring_tax']);
 
 	}
 
@@ -547,12 +547,12 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function remove_tax( $tax_name ) {
+	public function remove_tax($tax_name) {
 
-		if ( isset( $this->taxes[ $tax_name ] ) ) {
-			$this->totals['taxes']['initial']   -= $this->taxes[ $tax_name ]['initial_tax'];
-			$this->totals['taxes']['recurring'] -= $this->taxes[ $tax_name ]['recurring_tax'];
-			unset( $this->taxes[ $tax_name ] );
+		if (isset($this->taxes[$tax_name])) {
+			$this->totals['taxes']['initial']   -= $this->taxes[$tax_name]['initial_tax'];
+			$this->totals['taxes']['recurring'] -= $this->taxes[$tax_name]['recurring_tax'];
+			unset($this->taxes[$tax_name]);
 		}
 
 	}
@@ -566,11 +566,11 @@ 
 
 		$use_taxes = wpinv_use_taxes();
 
-		if ( $this->has_invoice() && ! $this->invoice->is_taxable() ) {
+		if ($this->has_invoice() && !$this->invoice->is_taxable()) {
 			$use_taxes = false;
 		}
 
-		return apply_filters( 'getpaid_submission_use_taxes', $use_taxes, $this );
+		return apply_filters('getpaid_submission_use_taxes', $use_taxes, $this);
 
 	}
 
@@ -619,13 +619,13 @@ 
 
 		$initial_total    = $this->get_subtotal() + $this->get_fee() + $this->get_tax();
 		$recurring_total  = $this->get_recurring_subtotal() + $this->get_recurring_fee() + $this->get_recurring_tax();
-		$processor        = new GetPaid_Payment_Form_Submission_Discount( $this, $initial_total, $recurring_total );
+		$processor        = new GetPaid_Payment_Form_Submission_Discount($this, $initial_total, $recurring_total);
 
-		foreach ( $processor->discounts as $discount ) {
-			$this->add_discount( $discount );
+		foreach ($processor->discounts as $discount) {
+			$this->add_discount($discount);
 		}
 
-		do_action_ref_array( 'getpaid_submissions_process_discounts', array( &$this ) );
+		do_action_ref_array('getpaid_submissions_process_discounts', array(&$this));
 	}
 
 	/**
@@ -634,10 +634,10 @@ 
 	 * @param array $discount An array of discount details. name, initial_discount, and recurring_discount are required. Include discount_code if the discount is from a discount code.
 	 * @since 1.0.19
 	 */
-	public function add_discount( $discount ) {
-		$this->discounts[ $discount['name'] ]   = $discount;
-		$this->totals['discount']['initial']   += wpinv_sanitize_amount( $discount['initial_discount'] );
-		$this->totals['discount']['recurring'] += wpinv_sanitize_amount( $discount['recurring_discount'] );
+	public function add_discount($discount) {
+		$this->discounts[$discount['name']]   = $discount;
+		$this->totals['discount']['initial']   += wpinv_sanitize_amount($discount['initial_discount']);
+		$this->totals['discount']['recurring'] += wpinv_sanitize_amount($discount['recurring_discount']);
 	}
 
 	/**
@@ -645,12 +645,12 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function remove_discount( $name ) {
+	public function remove_discount($name) {
 
-		if ( isset( $this->discounts[ $name ] ) ) {
-			$this->totals['discount']['initial']   -= $this->discounts[ $name ]['initial_discount'];
-			$this->totals['discount']['recurring'] -= $this->discounts[ $name ]['recurring_discount'];
-			unset( $this->discounts[ $name ] );
+		if (isset($this->discounts[$name])) {
+			$this->totals['discount']['initial']   -= $this->discounts[$name]['initial_discount'];
+			$this->totals['discount']['recurring'] -= $this->discounts[$name]['recurring_discount'];
+			unset($this->discounts[$name]);
 		}
 
 	}
@@ -662,7 +662,7 @@ 
 	 * @return bool
 	 */
 	public function has_discount_code() {
-		return ! empty( $this->discounts['discount_code'] );
+		return !empty($this->discounts['discount_code']);
 	}
 
 	/**
@@ -719,13 +719,13 @@ 
 	 */
 	public function process_fees() {
 
-		$fees_processor = new GetPaid_Payment_Form_Submission_Fees( $this );
+		$fees_processor = new GetPaid_Payment_Form_Submission_Fees($this);
 
-		foreach ( $fees_processor->fees as $fee ) {
-			$this->add_fee( $fee );
+		foreach ($fees_processor->fees as $fee) {
+			$this->add_fee($fee);
 		}
 
-		do_action_ref_array( 'getpaid_submissions_process_fees', array( &$this ) );
+		do_action_ref_array('getpaid_submissions_process_fees', array(&$this));
 	}
 
 	/**
@@ -734,17 +734,17 @@ 
 	 * @param array $fee An array of fee details. name, initial_fee, and recurring_fee are required.
 	 * @since 1.0.19
 	 */
-	public function add_fee( $fee ) {
+	public function add_fee($fee) {
 
-		if ( $fee['name'] == 'shipping' ) {
-			$this->totals['shipping']['initial']   += wpinv_sanitize_amount( $fee['initial_fee'] );
-			$this->totals['shipping']['recurring'] += wpinv_sanitize_amount( $fee['recurring_fee'] );
+		if ($fee['name'] == 'shipping') {
+			$this->totals['shipping']['initial']   += wpinv_sanitize_amount($fee['initial_fee']);
+			$this->totals['shipping']['recurring'] += wpinv_sanitize_amount($fee['recurring_fee']);
 			return;
 		}
 
-		$this->fees[ $fee['name'] ]         = $fee;
-		$this->totals['fees']['initial']   += wpinv_sanitize_amount( $fee['initial_fee'] );
-		$this->totals['fees']['recurring'] += wpinv_sanitize_amount( $fee['recurring_fee'] );
+		$this->fees[$fee['name']]         = $fee;
+		$this->totals['fees']['initial']   += wpinv_sanitize_amount($fee['initial_fee']);
+		$this->totals['fees']['recurring'] += wpinv_sanitize_amount($fee['recurring_fee']);
 
 	}
 
@@ -753,15 +753,15 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function remove_fee( $name ) {
+	public function remove_fee($name) {
 
-		if ( isset( $this->fees[ $name ] ) ) {
-			$this->totals['fees']['initial']   -= $this->fees[ $name ]['initial_fee'];
-			$this->totals['fees']['recurring'] -= $this->fees[ $name ]['recurring_fee'];
-			unset( $this->fees[ $name ] );
+		if (isset($this->fees[$name])) {
+			$this->totals['fees']['initial']   -= $this->fees[$name]['initial_fee'];
+			$this->totals['fees']['recurring'] -= $this->fees[$name]['recurring_fee'];
+			unset($this->fees[$name]);
 		}
 
-		if ( 'shipping' == $name ) {
+		if ('shipping' == $name) {
 			$this->totals['shipping']['initial']   = 0;
 			$this->totals['shipping']['recurring'] = 0;
 		}
@@ -802,7 +802,7 @@ 
 	 * @since 1.0.19
 	 */
 	public function has_fees() {
-		return count( $this->fees ) !== 0;
+		return count($this->fees) !== 0;
 	}
 
 	/*
@@ -838,7 +838,7 @@ 
 	 * @since 1.0.19
 	 */
 	public function has_shipping() {
-		return apply_filters( 'getpaid_payment_form_has_shipping', false, $this );
+		return apply_filters('getpaid_payment_form_has_shipping', false, $this);
 	}
 
 	/**
@@ -848,7 +848,7 @@ 
 	 * @since 1.0.19
 	 */
 	public function is_initial_fetch() {
-		return isset( $this->data['initial_state'] ) && empty( $this->data['initial_state'] );
+		return isset($this->data['initial_state']) && empty($this->data['initial_state']);
 	}
 
 	/**
@@ -858,7 +858,7 @@ 
 	 */
 	public function get_total() {
 		$total = $this->get_subtotal() + $this->get_fee() + $this->get_tax() + $this->get_shipping() - $this->get_discount();
-		return max( $total, 0 );
+		return max($total, 0);
 	}
 
 	/**
@@ -868,7 +868,7 @@ 
 	 */
 	public function get_recurring_total() {
 		$total = $this->get_recurring_subtotal() + $this->get_recurring_fee() + $this->get_recurring_tax() + $this->get_recurring_shipping() - $this->get_recurring_discount();
-		return max( $total, 0 );
+		return max($total, 0);
 	}
 
 	/**
@@ -880,12 +880,12 @@ 
 		$initial   = $this->get_total();
 		$recurring = $this->get_recurring_total();
 
-		if ( $this->has_recurring == 0 ) {
+		if ($this->has_recurring == 0) {
 			$recurring = 0;
 		}
 
 		$collect = $initial > 0 || $recurring > 0;
-		return apply_filters( 'getpaid_submission_should_collect_payment_details', $collect, $this );
+		return apply_filters('getpaid_submission_should_collect_payment_details', $collect, $this);
 	}
 
 	/**
@@ -894,7 +894,7 @@ 
 	 * @since 1.0.19
 	 */
 	public function get_billing_email() {
-		return apply_filters( 'getpaid_get_submission_billing_email', $this->get_field( 'billing_email' ), $this );
+		return apply_filters('getpaid_get_submission_billing_email', $this->get_field('billing_email'), $this);
 	}
 
 	/**
@@ -904,7 +904,7 @@ 
 	 */
 	public function has_billing_email() {
 		$billing_email = $this->get_billing_email();
-		return ! empty( $billing_email ) && is_email( $billing_email );
+		return !empty($billing_email) && is_email($billing_email);
 	}
 
 	/**
@@ -934,8 +934,8 @@ 
 	 * @since 1.0.19
 	 * @return mixed|null
 	 */
-	public function get_field( $field, $sub_array_key = null ) {
-		return getpaid_get_array_field( $this->data, $field, $sub_array_key );
+	public function get_field($field, $sub_array_key = null) {
+		return getpaid_get_array_field($this->data, $field, $sub_array_key);
 	}
 
 	/**
@@ -943,8 +943,8 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function is_required_field_set( $field ) {
-		return empty( $field['required'] ) || ! empty( $this->data[ $field['id'] ] );
+	public function is_required_field_set($field) {
+		return empty($field['required']) || !empty($this->data[$field['id']]);
 	}
 
 	/**
@@ -952,8 +952,8 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function format_amount( $amount ) {
-		return wpinv_price( $amount, $this->get_currency() );
+	public function format_amount($amount) {
+		return wpinv_price($amount, $this->get_currency());
 	}
 
 }

templates/invoice/line-totals.php

Indentation +5 added lines, -5 removed lines

@@ -52,27 +52,27 @@
 
                                 // Total Fee.
                                 if ( 'fee' === $key ) {
-								wpinv_the_price( $invoice->get_total_fees(), $invoice->get_currency() );
+                                wpinv_the_price( $invoice->get_total_fees(), $invoice->get_currency() );
                                 }
 
                                 // Total discount.
                                 if ( 'discount' === $key ) {
-								wpinv_the_price( $invoice->get_total_discount(), $invoice->get_currency() );
+                                wpinv_the_price( $invoice->get_total_discount(), $invoice->get_currency() );
                                 }
 
                                 // Shipping.
                                 if ( 'shipping' === $key ) {
-								wpinv_the_price( $invoice->get_shipping(), $invoice->get_currency() );
+                                wpinv_the_price( $invoice->get_shipping(), $invoice->get_currency() );
                                 }
 
                                 // Sub total.
                                 if ( 'subtotal' === $key ) {
-								wpinv_the_price( $invoice->get_subtotal(), $invoice->get_currency() );
+                                wpinv_the_price( $invoice->get_subtotal(), $invoice->get_currency() );
                                 }
 
                                 // Total.
                                 if ( 'total' === $key ) {
-								wpinv_the_price( $invoice->get_total(), $invoice->get_currency() );
+                                wpinv_the_price( $invoice->get_total(), $invoice->get_currency() );
                                 }
 
                                 // Fires when printing a cart total.

Spacing +29 added lines, -29 removed lines

@@ -9,26 +9,26 @@ 
  * @var WPInv_Invoice $invoice
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Totals rows.
-$totals = getpaid_invoice_totals_rows( $invoice );
+$totals = getpaid_invoice_totals_rows($invoice);
 
-do_action( 'getpaid_before_invoice_line_totals', $invoice, $totals );
+do_action('getpaid_before_invoice_line_totals', $invoice, $totals);
 
 ?>
 <div class='getpaid-invoice-line-totals'>
     <div class="row">
         <div class="col-12 offset-sm-6 col-sm-6 border-sm-left pl-sm-0">
 
-            <?php foreach ( $totals as $key => $label ) : ?>
+            <?php foreach ($totals as $key => $label) : ?>
 
-                <div class="getpaid-invoice-line-totals-col <?php echo esc_attr( $key ); ?>">
+                <div class="getpaid-invoice-line-totals-col <?php echo esc_attr($key); ?>">
 
                     <div class="form-row row">
 
                         <div class="col-8 getpaid-invoice-line-totals-label">
-                            <?php echo esc_html( $label ); ?>
+                            <?php echo esc_html($label); ?>
                         </div>
 
                         <div class="col-4 getpaid-invoice-line-totals-value pl-0">
@@ -36,62 +36,62 @@ 
                             <?php
 
                                 // Total tax.
-                                if ( 'tax' === $key ) {
-                                    wpinv_the_price( $invoice->get_total_tax(), $invoice->get_currency() );
+                                if ('tax' === $key) {
+                                    wpinv_the_price($invoice->get_total_tax(), $invoice->get_currency());
 
-                                    if ( wpinv_use_taxes() && ! $invoice->get_disable_taxes() ) {
+                                    if (wpinv_use_taxes() && !$invoice->get_disable_taxes()) {
 
                                         $taxes = $invoice->get_total_tax();
-                                        if ( empty( $taxes ) && GetPaid_Payment_Form_Submission_Taxes::is_eu_transaction( $invoice->get_country() ) ) {
+                                        if (empty($taxes) && GetPaid_Payment_Form_Submission_Taxes::is_eu_transaction($invoice->get_country())) {
                                             echo ' <em class="text-muted small">';
-                                            _x( '(Reverse charged)', 'This is a legal term for reverse charging tax in the EU', 'invoicing' );
+                                            _x('(Reverse charged)', 'This is a legal term for reverse charging tax in the EU', 'invoicing');
                                             echo '</em>';
                                         }
                                     }
                                 }
 
                                 // Check if field starts with tax__.
-                                if ( 0 === strpos( $key, 'tax__' ) ) {
-                                    $tax_amount = $invoice->get_tax_total_by_name( str_replace( 'tax__', '', $key ) );
-                                    wpinv_the_price( $tax_amount, $invoice->get_currency() );
+                                if (0 === strpos($key, 'tax__')) {
+                                    $tax_amount = $invoice->get_tax_total_by_name(str_replace('tax__', '', $key));
+                                    wpinv_the_price($tax_amount, $invoice->get_currency());
 
-                                    if ( wpinv_use_taxes() && ! $invoice->get_disable_taxes() ) {
+                                    if (wpinv_use_taxes() && !$invoice->get_disable_taxes()) {
 
-                                        if ( empty( $tax_amount ) && GetPaid_Payment_Form_Submission_Taxes::is_eu_transaction( $invoice->get_country() ) ) {
+                                        if (empty($tax_amount) && GetPaid_Payment_Form_Submission_Taxes::is_eu_transaction($invoice->get_country())) {
                                             echo ' <em class="text-muted small">';
-                                            _x( '(Reverse charged)', 'This is a legal term for reverse charging tax in the EU', 'invoicing' );
+                                            _x('(Reverse charged)', 'This is a legal term for reverse charging tax in the EU', 'invoicing');
                                             echo '</em>';
                                         }
                                     }
                                 }
 
                                 // Total Fee.
-                                if ( 'fee' === $key ) {
-								wpinv_the_price( $invoice->get_total_fees(), $invoice->get_currency() );
+                                if ('fee' === $key) {
+								wpinv_the_price($invoice->get_total_fees(), $invoice->get_currency());
                                 }
 
                                 // Total discount.
-                                if ( 'discount' === $key ) {
-								wpinv_the_price( $invoice->get_total_discount(), $invoice->get_currency() );
+                                if ('discount' === $key) {
+								wpinv_the_price($invoice->get_total_discount(), $invoice->get_currency());
                                 }
 
                                 // Shipping.
-                                if ( 'shipping' === $key ) {
-								wpinv_the_price( $invoice->get_shipping(), $invoice->get_currency() );
+                                if ('shipping' === $key) {
+								wpinv_the_price($invoice->get_shipping(), $invoice->get_currency());
                                 }
 
                                 // Sub total.
-                                if ( 'subtotal' === $key ) {
-								wpinv_the_price( $invoice->get_subtotal(), $invoice->get_currency() );
+                                if ('subtotal' === $key) {
+								wpinv_the_price($invoice->get_subtotal(), $invoice->get_currency());
                                 }
 
                                 // Total.
-                                if ( 'total' === $key ) {
-								wpinv_the_price( $invoice->get_total(), $invoice->get_currency() );
+                                if ('total' === $key) {
+								wpinv_the_price($invoice->get_total(), $invoice->get_currency());
                                 }
 
                                 // Fires when printing a cart total.
-                                do_action( "getpaid_invoice_cart_totals_$key", $invoice );
+                                do_action("getpaid_invoice_cart_totals_$key", $invoice);
 
                             ?>
 
@@ -105,4 +105,4 @@ 
     </div>
 </div> <!-- end .getpaid-invoice-line-totals -->
 
-<?php do_action( 'getpaid_after_invoice_line_totals', $invoice, $totals ); ?>
+<?php do_action('getpaid_after_invoice_line_totals', $invoice, $totals); ?>

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

Indentation +276 added lines, -276 removed lines

@@ -12,294 +12,294 @@
  */
 class GetPaid_Reports_Helper {
 
-	/**
-	 * Get report totals such as invoice totals and discount amounts.
-	 *
-	 * Data example:
-	 *
-	 * 'subtotal' => array(
-	 *     'type'     => 'invoice_data',
-	 *     'function' => 'SUM',
-	 *     'name'     => 'subtotal'
-	 * )
-	 *
-	 * @param  array $args
-	 * @return mixed depending on query_type
-	 */
-	public static function get_invoice_report_data( $args = array() ) {
-		global $wpdb;
-
-		$default_args = array(
-			'data'                  => array(), // The data to retrieve.
-			'where'                 => array(), // An array of where queries.
-			'query_type'            => 'get_row', // wpdb query to run.
-			'group_by'              => '', // What to group results by.
-			'order_by'              => '', // What to order by.
-			'limit'                 => '', // Results limit.
-			'filter_range'          => array(), // An array of before and after dates to limit results by.
-			'invoice_types'         => array( 'wpi_invoice' ), // An array of post types to retrieve.
-			'invoice_status'        => array( 'publish', 'wpi-processing', 'wpi-onhold' ),
-			'parent_invoice_status' => false, // Optionally filter by parent invoice status.
-		);
-
-		$args         = apply_filters( 'getpaid_reports_get_invoice_report_data_args', $args );
-		$args         = wp_parse_args( $args, $default_args );
-
-		extract( $args );
-
-		if ( empty( $data ) ) {
-			return '';
-		}
-
-		$query           = array();
-		$query['select'] = 'SELECT ' . implode( ',', self::prepare_invoice_data( $data ) );
-		$query['from']   = "FROM {$wpdb->posts} AS posts";
-		$query['join']   = implode( ' ', self::prepare_invoice_joins( $data + $where, ! empty( $parent_invoice_status ) ) );
-
-		$query['where']  = "
+    /**
+     * Get report totals such as invoice totals and discount amounts.
+     *
+     * Data example:
+     *
+     * 'subtotal' => array(
+     *     'type'     => 'invoice_data',
+     *     'function' => 'SUM',
+     *     'name'     => 'subtotal'
+     * )
+     *
+     * @param  array $args
+     * @return mixed depending on query_type
+     */
+    public static function get_invoice_report_data( $args = array() ) {
+        global $wpdb;
+
+        $default_args = array(
+            'data'                  => array(), // The data to retrieve.
+            'where'                 => array(), // An array of where queries.
+            'query_type'            => 'get_row', // wpdb query to run.
+            'group_by'              => '', // What to group results by.
+            'order_by'              => '', // What to order by.
+            'limit'                 => '', // Results limit.
+            'filter_range'          => array(), // An array of before and after dates to limit results by.
+            'invoice_types'         => array( 'wpi_invoice' ), // An array of post types to retrieve.
+            'invoice_status'        => array( 'publish', 'wpi-processing', 'wpi-onhold' ),
+            'parent_invoice_status' => false, // Optionally filter by parent invoice status.
+        );
+
+        $args         = apply_filters( 'getpaid_reports_get_invoice_report_data_args', $args );
+        $args         = wp_parse_args( $args, $default_args );
+
+        extract( $args );
+
+        if ( empty( $data ) ) {
+            return '';
+        }
+
+        $query           = array();
+        $query['select'] = 'SELECT ' . implode( ',', self::prepare_invoice_data( $data ) );
+        $query['from']   = "FROM {$wpdb->posts} AS posts";
+        $query['join']   = implode( ' ', self::prepare_invoice_joins( $data + $where, ! empty( $parent_invoice_status ) ) );
+
+        $query['where']  = "
 			WHERE 	posts.post_type 	IN ( '" . implode( "','", $invoice_types ) . "' )
 			";
 
-		if ( ! empty( $invoice_status ) ) {
-			$query['where'] .= "
+        if ( ! empty( $invoice_status ) ) {
+            $query['where'] .= "
 				AND 	posts.post_status 	IN ( '" . implode( "','", $invoice_status ) . "' )
 			";
-		}
-
-		if ( ! empty( $parent_invoice_status ) ) {
-			if ( ! empty( $invoice_status ) ) {
-				$query['where'] .= " AND ( parent.post_status IN ( '" . implode( "','", $parent_invoice_status ) . "' ) OR parent.ID IS NULL ) ";
-			} else {
-				$query['where'] .= " AND parent.post_status IN ( '" . implode( "','", $parent_invoice_status ) . "' ) ";
-			}
-		}
-
-		if ( ! empty( $filter_range['before'] ) ) {
-			$query['where'] .= "
+        }
+
+        if ( ! empty( $parent_invoice_status ) ) {
+            if ( ! empty( $invoice_status ) ) {
+                $query['where'] .= " AND ( parent.post_status IN ( '" . implode( "','", $parent_invoice_status ) . "' ) OR parent.ID IS NULL ) ";
+            } else {
+                $query['where'] .= " AND parent.post_status IN ( '" . implode( "','", $parent_invoice_status ) . "' ) ";
+            }
+        }
+
+        if ( ! empty( $filter_range['before'] ) ) {
+            $query['where'] .= "
 				AND 	posts.post_date <= '" . gmdate( 'Y-m-d 23:59:59', strtotime( $filter_range['before'] ) ) . "'
 			";
-		}
+        }
 
-		if ( ! empty( $filter_range['after'] ) ) {
-			$query['where'] .= "
+        if ( ! empty( $filter_range['after'] ) ) {
+            $query['where'] .= "
 				AND 	posts.post_date >= '" . gmdate( 'Y-m-d 00:00:00', strtotime( $filter_range['after'] ) ) . "'
 			";
-		}
+        }
 
-		if ( ! empty( $where ) ) {
+        if ( ! empty( $where ) ) {
 
-			foreach ( $where as $value ) {
+            foreach ( $where as $value ) {
 
-				if ( strtolower( $value['operator'] ) === 'in' || strtolower( $value['operator'] ) === 'not in' ) {
-
-					if ( is_array( $value['value'] ) ) {
-						$value['value'] = implode( "','", $value['value'] );
-					}
-
-					if ( ! empty( $value['value'] ) ) {
-						$where_value = "{$value['operator']} ('{$value['value']}')";
-					}
-				} else {
-					$where_value = "{$value['operator']} '{$value['value']}'";
-				}
-
-				if ( ! empty( $where_value ) ) {
-					$query['where'] .= " AND {$value['key']} {$where_value}";
-				}
-			}
-		}
-
-		if ( $group_by ) {
-			$query['group_by'] = "GROUP BY {$group_by}";
-		}
-
-		if ( $order_by ) {
-			$query['order_by'] = "ORDER BY {$order_by}";
-		}
-
-		if ( $limit ) {
-			$query['limit'] = "LIMIT {$limit}";
-		}
-
-		$query = apply_filters( 'getpaid_reports_get_invoice_report_query', $query, $data );
-		$query = implode( ' ', $query );
-
-		return self::execute( $query_type, $query );
-
-	}
-
-	/**
-	 * Prepares the data to select.
-	 *
-	 *
-	 * @param  array $data
-	 * @return array
-	 */
-	public static function prepare_invoice_data( $data ) {
-
-		$prepared = array();
-
-		foreach ( $data as $raw_key => $value ) {
-			$key      = sanitize_key( $raw_key );
-			$distinct = '';
-
-			if ( isset( $value['distinct'] ) ) {
-				$distinct = 'DISTINCT';
-			}
-
-			$get_key = self::get_invoice_table_key( $key, $value['type'] );
-
-			if ( false === $get_key ) {
-				// Skip to the next foreach iteration else the query will be invalid.
-				continue;
-			}
-
-			if ( ! empty( $value['function'] ) ) {
-				$get = "{$value['function']}({$distinct} {$get_key})";
-			} else {
-				$get = "{$distinct} {$get_key}";
-			}
-
-			$prepared[] = "{$get} as {$value['name']}";
-		}
-
-		return $prepared;
-
-	}
-
-	/**
-	 * Prepares the joins to use.
-	 *
-	 *
-	 * @param  array $data
-	 * @param  bool $with_parent
-	 * @return array
-	 */
-	public static function prepare_invoice_joins( $data, $with_parent ) {
-		global $wpdb;
-
-		$prepared = array();
-
-		foreach ( $data as $raw_key => $value ) {
-			$join_type = isset( $value['join_type'] ) ? $value['join_type'] : 'INNER';
-			$type      = isset( $value['type'] ) ? $value['type'] : false;
-			$key       = sanitize_key( $raw_key );
-
-			switch ( $type ) {
-				case 'meta':
-					$prepared[ "meta_{$key}" ] = "{$join_type} JOIN {$wpdb->postmeta} AS meta_{$key} ON ( posts.ID = meta_{$key}.post_id AND meta_{$key}.meta_key = '{$raw_key}' )";
-					break;
-				case 'parent_meta':
-					$prepared[ "parent_meta_{$key}" ] = "{$join_type} JOIN {$wpdb->postmeta} AS parent_meta_{$key} ON (posts.post_parent = parent_meta_{$key}.post_id) AND (parent_meta_{$key}.meta_key = '{$raw_key}')";
-					break;
-				case 'invoice_data':
-					$prepared['invoices'] = "{$join_type} JOIN {$wpdb->prefix}getpaid_invoices AS invoices ON posts.ID = invoices.post_id";
-					break;
-				case 'invoice_item':
-					$prepared['invoice_items'] = "{$join_type} JOIN {$wpdb->prefix}getpaid_invoice_items AS invoice_items ON posts.ID = invoice_items.post_id";
-					break;
-			}
-		}
-
-		if ( $with_parent ) {
-			$prepared['parent'] = "LEFT JOIN {$wpdb->posts} AS parent ON posts.post_parent = parent.ID";
-		}
-
-		return $prepared;
-
-	}
-
-	/**
-	 * Retrieves the appropriate table key to use.
-	 *
-	 *
-	 * @param  string $key
-	 * @param  string $table
-	 * @return string|false
-	 */
-	public static function get_invoice_table_key( $key, $table ) {
-
-		$keys = array(
-			'meta'         => "meta_{$key}.meta_value",
-			'parent_meta'  => "parent_meta_{$key}.meta_value",
-			'post_data'    => "posts.{$key}",
-			'invoice_data' => "invoices.{$key}",
-			'invoice_item' => "invoice_items.{$key}",
-		);
-
-		return isset( $keys[ $table ] ) ? $keys[ $table ] : false;
-
-	}
-
-	/**
-	 * Executes a query and caches the result for a minute.
-	 *
-	 *
-	 * @param  string $query_type
-	 * @param  string $query
-	 * @return mixed depending on query_type
-	 */
-	public static function execute( $query_type, $query ) {
-		global $wpdb;
-
-		$query_hash = md5( $query_type . $query );
-		$result     = self::get_cached_query( $query_hash );
-		if ( $result === false ) {
-			self::enable_big_selects();
-
-			$result = $wpdb->$query_type( $query );
-			self::set_cached_query( $query_hash, $result );
-		}
-
-		return $result;
-
-	}
-
-	/**
-	 * Enables big mysql selects for reports, just once for this session.
-	 */
-	protected static function enable_big_selects() {
-		static $big_selects = false;
-
-		global $wpdb;
-
-		if ( ! $big_selects ) {
-			$wpdb->query( 'SET SESSION SQL_BIG_SELECTS=1' );
-			$big_selects = true;
-		}
-	}
-
-	/**
-	 * Get the cached query result or null if it's not in the cache.
-	 *
-	 * @param string $query_hash The query hash.
-	 *
-	 * @return mixed|false The cache contents on success, false on failure to retrieve contents.
-	 */
-	protected static function get_cached_query( $query_hash ) {
-
-		return wp_cache_get(
-			$query_hash,
-			strtolower( __CLASS__ )
-		);
-
-	}
-
-	/**
-	 * Set the cached query result.
-	 *
-	 * @param string $query_hash The query hash.
-	 * @param mixed  $data The data to cache.
-	 */
-	protected static function set_cached_query( $query_hash, $data ) {
-
-		wp_cache_set(
-			$query_hash,
-			$data,
-			strtolower( __CLASS__ ),
-			MINUTE_IN_SECONDS
-		);
-
-	}
+                if ( strtolower( $value['operator'] ) === 'in' || strtolower( $value['operator'] ) === 'not in' ) {
+
+                    if ( is_array( $value['value'] ) ) {
+                        $value['value'] = implode( "','", $value['value'] );
+                    }
+
+                    if ( ! empty( $value['value'] ) ) {
+                        $where_value = "{$value['operator']} ('{$value['value']}')";
+                    }
+                } else {
+                    $where_value = "{$value['operator']} '{$value['value']}'";
+                }
+
+                if ( ! empty( $where_value ) ) {
+                    $query['where'] .= " AND {$value['key']} {$where_value}";
+                }
+            }
+        }
+
+        if ( $group_by ) {
+            $query['group_by'] = "GROUP BY {$group_by}";
+        }
+
+        if ( $order_by ) {
+            $query['order_by'] = "ORDER BY {$order_by}";
+        }
+
+        if ( $limit ) {
+            $query['limit'] = "LIMIT {$limit}";
+        }
+
+        $query = apply_filters( 'getpaid_reports_get_invoice_report_query', $query, $data );
+        $query = implode( ' ', $query );
+
+        return self::execute( $query_type, $query );
+
+    }
+
+    /**
+     * Prepares the data to select.
+     *
+     *
+     * @param  array $data
+     * @return array
+     */
+    public static function prepare_invoice_data( $data ) {
+
+        $prepared = array();
+
+        foreach ( $data as $raw_key => $value ) {
+            $key      = sanitize_key( $raw_key );
+            $distinct = '';
+
+            if ( isset( $value['distinct'] ) ) {
+                $distinct = 'DISTINCT';
+            }
+
+            $get_key = self::get_invoice_table_key( $key, $value['type'] );
+
+            if ( false === $get_key ) {
+                // Skip to the next foreach iteration else the query will be invalid.
+                continue;
+            }
+
+            if ( ! empty( $value['function'] ) ) {
+                $get = "{$value['function']}({$distinct} {$get_key})";
+            } else {
+                $get = "{$distinct} {$get_key}";
+            }
+
+            $prepared[] = "{$get} as {$value['name']}";
+        }
+
+        return $prepared;
+
+    }
+
+    /**
+     * Prepares the joins to use.
+     *
+     *
+     * @param  array $data
+     * @param  bool $with_parent
+     * @return array
+     */
+    public static function prepare_invoice_joins( $data, $with_parent ) {
+        global $wpdb;
+
+        $prepared = array();
+
+        foreach ( $data as $raw_key => $value ) {
+            $join_type = isset( $value['join_type'] ) ? $value['join_type'] : 'INNER';
+            $type      = isset( $value['type'] ) ? $value['type'] : false;
+            $key       = sanitize_key( $raw_key );
+
+            switch ( $type ) {
+                case 'meta':
+                    $prepared[ "meta_{$key}" ] = "{$join_type} JOIN {$wpdb->postmeta} AS meta_{$key} ON ( posts.ID = meta_{$key}.post_id AND meta_{$key}.meta_key = '{$raw_key}' )";
+                    break;
+                case 'parent_meta':
+                    $prepared[ "parent_meta_{$key}" ] = "{$join_type} JOIN {$wpdb->postmeta} AS parent_meta_{$key} ON (posts.post_parent = parent_meta_{$key}.post_id) AND (parent_meta_{$key}.meta_key = '{$raw_key}')";
+                    break;
+                case 'invoice_data':
+                    $prepared['invoices'] = "{$join_type} JOIN {$wpdb->prefix}getpaid_invoices AS invoices ON posts.ID = invoices.post_id";
+                    break;
+                case 'invoice_item':
+                    $prepared['invoice_items'] = "{$join_type} JOIN {$wpdb->prefix}getpaid_invoice_items AS invoice_items ON posts.ID = invoice_items.post_id";
+                    break;
+            }
+        }
+
+        if ( $with_parent ) {
+            $prepared['parent'] = "LEFT JOIN {$wpdb->posts} AS parent ON posts.post_parent = parent.ID";
+        }
+
+        return $prepared;
+
+    }
+
+    /**
+     * Retrieves the appropriate table key to use.
+     *
+     *
+     * @param  string $key
+     * @param  string $table
+     * @return string|false
+     */
+    public static function get_invoice_table_key( $key, $table ) {
+
+        $keys = array(
+            'meta'         => "meta_{$key}.meta_value",
+            'parent_meta'  => "parent_meta_{$key}.meta_value",
+            'post_data'    => "posts.{$key}",
+            'invoice_data' => "invoices.{$key}",
+            'invoice_item' => "invoice_items.{$key}",
+        );
+
+        return isset( $keys[ $table ] ) ? $keys[ $table ] : false;
+
+    }
+
+    /**
+     * Executes a query and caches the result for a minute.
+     *
+     *
+     * @param  string $query_type
+     * @param  string $query
+     * @return mixed depending on query_type
+     */
+    public static function execute( $query_type, $query ) {
+        global $wpdb;
+
+        $query_hash = md5( $query_type . $query );
+        $result     = self::get_cached_query( $query_hash );
+        if ( $result === false ) {
+            self::enable_big_selects();
+
+            $result = $wpdb->$query_type( $query );
+            self::set_cached_query( $query_hash, $result );
+        }
+
+        return $result;
+
+    }
+
+    /**
+     * Enables big mysql selects for reports, just once for this session.
+     */
+    protected static function enable_big_selects() {
+        static $big_selects = false;
+
+        global $wpdb;
+
+        if ( ! $big_selects ) {
+            $wpdb->query( 'SET SESSION SQL_BIG_SELECTS=1' );
+            $big_selects = true;
+        }
+    }
+
+    /**
+     * Get the cached query result or null if it's not in the cache.
+     *
+     * @param string $query_hash The query hash.
+     *
+     * @return mixed|false The cache contents on success, false on failure to retrieve contents.
+     */
+    protected static function get_cached_query( $query_hash ) {
+
+        return wp_cache_get(
+            $query_hash,
+            strtolower( __CLASS__ )
+        );
+
+    }
+
+    /**
+     * Set the cached query result.
+     *
+     * @param string $query_hash The query hash.
+     * @param mixed  $data The data to cache.
+     */
+    protected static function set_cached_query( $query_hash, $data ) {
+
+        wp_cache_set(
+            $query_hash,
+            $data,
+            strtolower( __CLASS__ ),
+            MINUTE_IN_SECONDS
+        );
+
+    }
 
 }

Spacing +64 added lines, -64 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports_Helper Class.
@@ -26,7 +26,7 @@ 
 	 * @param  array $args
 	 * @return mixed depending on query_type
 	 */
-	public static function get_invoice_report_data( $args = array() ) {
+	public static function get_invoice_report_data($args = array()) {
 		global $wpdb;
 
 		$default_args = array(
@@ -37,94 +37,94 @@ 
 			'order_by'              => '', // What to order by.
 			'limit'                 => '', // Results limit.
 			'filter_range'          => array(), // An array of before and after dates to limit results by.
-			'invoice_types'         => array( 'wpi_invoice' ), // An array of post types to retrieve.
-			'invoice_status'        => array( 'publish', 'wpi-processing', 'wpi-onhold' ),
+			'invoice_types'         => array('wpi_invoice'), // An array of post types to retrieve.
+			'invoice_status'        => array('publish', 'wpi-processing', 'wpi-onhold'),
 			'parent_invoice_status' => false, // Optionally filter by parent invoice status.
 		);
 
-		$args         = apply_filters( 'getpaid_reports_get_invoice_report_data_args', $args );
-		$args         = wp_parse_args( $args, $default_args );
+		$args         = apply_filters('getpaid_reports_get_invoice_report_data_args', $args);
+		$args         = wp_parse_args($args, $default_args);
 
-		extract( $args );
+		extract($args);
 
-		if ( empty( $data ) ) {
+		if (empty($data)) {
 			return '';
 		}
 
 		$query           = array();
-		$query['select'] = 'SELECT ' . implode( ',', self::prepare_invoice_data( $data ) );
+		$query['select'] = 'SELECT ' . implode(',', self::prepare_invoice_data($data));
 		$query['from']   = "FROM {$wpdb->posts} AS posts";
-		$query['join']   = implode( ' ', self::prepare_invoice_joins( $data + $where, ! empty( $parent_invoice_status ) ) );
+		$query['join']   = implode(' ', self::prepare_invoice_joins($data + $where, !empty($parent_invoice_status)));
 
 		$query['where']  = "
-			WHERE 	posts.post_type 	IN ( '" . implode( "','", $invoice_types ) . "' )
+			WHERE 	posts.post_type 	IN ( '" . implode("','", $invoice_types) . "' )
 			";
 
-		if ( ! empty( $invoice_status ) ) {
+		if (!empty($invoice_status)) {
 			$query['where'] .= "
-				AND 	posts.post_status 	IN ( '" . implode( "','", $invoice_status ) . "' )
+				AND 	posts.post_status 	IN ( '" . implode("','", $invoice_status) . "' )
 			";
 		}
 
-		if ( ! empty( $parent_invoice_status ) ) {
-			if ( ! empty( $invoice_status ) ) {
-				$query['where'] .= " AND ( parent.post_status IN ( '" . implode( "','", $parent_invoice_status ) . "' ) OR parent.ID IS NULL ) ";
+		if (!empty($parent_invoice_status)) {
+			if (!empty($invoice_status)) {
+				$query['where'] .= " AND ( parent.post_status IN ( '" . implode("','", $parent_invoice_status) . "' ) OR parent.ID IS NULL ) ";
 			} else {
-				$query['where'] .= " AND parent.post_status IN ( '" . implode( "','", $parent_invoice_status ) . "' ) ";
+				$query['where'] .= " AND parent.post_status IN ( '" . implode("','", $parent_invoice_status) . "' ) ";
 			}
 		}
 
-		if ( ! empty( $filter_range['before'] ) ) {
+		if (!empty($filter_range['before'])) {
 			$query['where'] .= "
-				AND 	posts.post_date <= '" . gmdate( 'Y-m-d 23:59:59', strtotime( $filter_range['before'] ) ) . "'
+				AND 	posts.post_date <= '" . gmdate('Y-m-d 23:59:59', strtotime($filter_range['before'])) . "'
 			";
 		}
 
-		if ( ! empty( $filter_range['after'] ) ) {
+		if (!empty($filter_range['after'])) {
 			$query['where'] .= "
-				AND 	posts.post_date >= '" . gmdate( 'Y-m-d 00:00:00', strtotime( $filter_range['after'] ) ) . "'
+				AND 	posts.post_date >= '" . gmdate('Y-m-d 00:00:00', strtotime($filter_range['after'])) . "'
 			";
 		}
 
-		if ( ! empty( $where ) ) {
+		if (!empty($where)) {
 
-			foreach ( $where as $value ) {
+			foreach ($where as $value) {
 
-				if ( strtolower( $value['operator'] ) === 'in' || strtolower( $value['operator'] ) === 'not in' ) {
+				if (strtolower($value['operator']) === 'in' || strtolower($value['operator']) === 'not in') {
 
-					if ( is_array( $value['value'] ) ) {
-						$value['value'] = implode( "','", $value['value'] );
+					if (is_array($value['value'])) {
+						$value['value'] = implode("','", $value['value']);
 					}
 
-					if ( ! empty( $value['value'] ) ) {
+					if (!empty($value['value'])) {
 						$where_value = "{$value['operator']} ('{$value['value']}')";
 					}
 				} else {
 					$where_value = "{$value['operator']} '{$value['value']}'";
 				}
 
-				if ( ! empty( $where_value ) ) {
+				if (!empty($where_value)) {
 					$query['where'] .= " AND {$value['key']} {$where_value}";
 				}
 			}
 		}
 
-		if ( $group_by ) {
+		if ($group_by) {
 			$query['group_by'] = "GROUP BY {$group_by}";
 		}
 
-		if ( $order_by ) {
+		if ($order_by) {
 			$query['order_by'] = "ORDER BY {$order_by}";
 		}
 
-		if ( $limit ) {
+		if ($limit) {
 			$query['limit'] = "LIMIT {$limit}";
 		}
 
-		$query = apply_filters( 'getpaid_reports_get_invoice_report_query', $query, $data );
-		$query = implode( ' ', $query );
+		$query = apply_filters('getpaid_reports_get_invoice_report_query', $query, $data);
+		$query = implode(' ', $query);
 
-		return self::execute( $query_type, $query );
+		return self::execute($query_type, $query);
 
 	}
 
@@ -135,26 +135,26 @@ 
 	 * @param  array $data
 	 * @return array
 	 */
-	public static function prepare_invoice_data( $data ) {
+	public static function prepare_invoice_data($data) {
 
 		$prepared = array();
 
-		foreach ( $data as $raw_key => $value ) {
-			$key      = sanitize_key( $raw_key );
+		foreach ($data as $raw_key => $value) {
+			$key      = sanitize_key($raw_key);
 			$distinct = '';
 
-			if ( isset( $value['distinct'] ) ) {
+			if (isset($value['distinct'])) {
 				$distinct = 'DISTINCT';
 			}
 
-			$get_key = self::get_invoice_table_key( $key, $value['type'] );
+			$get_key = self::get_invoice_table_key($key, $value['type']);
 
-			if ( false === $get_key ) {
+			if (false === $get_key) {
 				// Skip to the next foreach iteration else the query will be invalid.
 				continue;
 			}
 
-			if ( ! empty( $value['function'] ) ) {
+			if (!empty($value['function'])) {
 				$get = "{$value['function']}({$distinct} {$get_key})";
 			} else {
 				$get = "{$distinct} {$get_key}";
@@ -175,22 +175,22 @@ 
 	 * @param  bool $with_parent
 	 * @return array
 	 */
-	public static function prepare_invoice_joins( $data, $with_parent ) {
+	public static function prepare_invoice_joins($data, $with_parent) {
 		global $wpdb;
 
 		$prepared = array();
 
-		foreach ( $data as $raw_key => $value ) {
-			$join_type = isset( $value['join_type'] ) ? $value['join_type'] : 'INNER';
-			$type      = isset( $value['type'] ) ? $value['type'] : false;
-			$key       = sanitize_key( $raw_key );
+		foreach ($data as $raw_key => $value) {
+			$join_type = isset($value['join_type']) ? $value['join_type'] : 'INNER';
+			$type      = isset($value['type']) ? $value['type'] : false;
+			$key       = sanitize_key($raw_key);
 
-			switch ( $type ) {
+			switch ($type) {
 				case 'meta':
-					$prepared[ "meta_{$key}" ] = "{$join_type} JOIN {$wpdb->postmeta} AS meta_{$key} ON ( posts.ID = meta_{$key}.post_id AND meta_{$key}.meta_key = '{$raw_key}' )";
+					$prepared["meta_{$key}"] = "{$join_type} JOIN {$wpdb->postmeta} AS meta_{$key} ON ( posts.ID = meta_{$key}.post_id AND meta_{$key}.meta_key = '{$raw_key}' )";
 					break;
 				case 'parent_meta':
-					$prepared[ "parent_meta_{$key}" ] = "{$join_type} JOIN {$wpdb->postmeta} AS parent_meta_{$key} ON (posts.post_parent = parent_meta_{$key}.post_id) AND (parent_meta_{$key}.meta_key = '{$raw_key}')";
+					$prepared["parent_meta_{$key}"] = "{$join_type} JOIN {$wpdb->postmeta} AS parent_meta_{$key} ON (posts.post_parent = parent_meta_{$key}.post_id) AND (parent_meta_{$key}.meta_key = '{$raw_key}')";
 					break;
 				case 'invoice_data':
 					$prepared['invoices'] = "{$join_type} JOIN {$wpdb->prefix}getpaid_invoices AS invoices ON posts.ID = invoices.post_id";
@@ -201,7 +201,7 @@ 
 			}
 		}
 
-		if ( $with_parent ) {
+		if ($with_parent) {
 			$prepared['parent'] = "LEFT JOIN {$wpdb->posts} AS parent ON posts.post_parent = parent.ID";
 		}
 
@@ -217,7 +217,7 @@ 
 	 * @param  string $table
 	 * @return string|false
 	 */
-	public static function get_invoice_table_key( $key, $table ) {
+	public static function get_invoice_table_key($key, $table) {
 
 		$keys = array(
 			'meta'         => "meta_{$key}.meta_value",
@@ -227,7 +227,7 @@ 
 			'invoice_item' => "invoice_items.{$key}",
 		);
 
-		return isset( $keys[ $table ] ) ? $keys[ $table ] : false;
+		return isset($keys[$table]) ? $keys[$table] : false;
 
 	}
 
@@ -239,16 +239,16 @@ 
 	 * @param  string $query
 	 * @return mixed depending on query_type
 	 */
-	public static function execute( $query_type, $query ) {
+	public static function execute($query_type, $query) {
 		global $wpdb;
 
-		$query_hash = md5( $query_type . $query );
-		$result     = self::get_cached_query( $query_hash );
-		if ( $result === false ) {
+		$query_hash = md5($query_type . $query);
+		$result     = self::get_cached_query($query_hash);
+		if ($result === false) {
 			self::enable_big_selects();
 
-			$result = $wpdb->$query_type( $query );
-			self::set_cached_query( $query_hash, $result );
+			$result = $wpdb->$query_type($query);
+			self::set_cached_query($query_hash, $result);
 		}
 
 		return $result;
@@ -263,8 +263,8 @@ 
 
 		global $wpdb;
 
-		if ( ! $big_selects ) {
-			$wpdb->query( 'SET SESSION SQL_BIG_SELECTS=1' );
+		if (!$big_selects) {
+			$wpdb->query('SET SESSION SQL_BIG_SELECTS=1');
 			$big_selects = true;
 		}
 	}
@@ -276,11 +276,11 @@ 
 	 *
 	 * @return mixed|false The cache contents on success, false on failure to retrieve contents.
 	 */
-	protected static function get_cached_query( $query_hash ) {
+	protected static function get_cached_query($query_hash) {
 
 		return wp_cache_get(
 			$query_hash,
-			strtolower( __CLASS__ )
+			strtolower(__CLASS__)
 		);
 
 	}
@@ -291,12 +291,12 @@ 
 	 * @param string $query_hash The query hash.
 	 * @param mixed  $data The data to cache.
 	 */
-	protected static function set_cached_query( $query_hash, $data ) {
+	protected static function set_cached_query($query_hash, $data) {
 
 		wp_cache_set(
 			$query_hash,
 			$data,
-			strtolower( __CLASS__ ),
+			strtolower(__CLASS__),
 			MINUTE_IN_SECONDS
 		);
 

templates/subscriptions/subscription-details.php

Indentation +46 added lines, -46 removed lines

@@ -39,62 +39,62 @@ 
 				<td style="width: 65%">
 					<?php
 
-						switch ( $key ) {
+                        switch ( $key ) {
 
-						case 'status':
-							echo esc_html( $subscription->get_status_label() );
-							break;
+                        case 'status':
+                            echo esc_html( $subscription->get_status_label() );
+                            break;
 
-						case 'start_date':
-							echo esc_html( getpaid_format_date_value( $subscription->get_date_created() ) );
-							break;
+                        case 'start_date':
+                            echo esc_html( getpaid_format_date_value( $subscription->get_date_created() ) );
+                            break;
 
-						case 'expiry_date':
-							echo esc_html( getpaid_format_date_value( $subscription->get_next_renewal_date() ) );
-							break;
+                        case 'expiry_date':
+                            echo esc_html( getpaid_format_date_value( $subscription->get_next_renewal_date() ) );
+                            break;
 
-						case 'initial_amount':
-							echo wp_kses_post( wpinv_price( $subscription->get_initial_amount(), $subscription->get_parent_payment()->get_currency() ) );
+                        case 'initial_amount':
+                            echo wp_kses_post( wpinv_price( $subscription->get_initial_amount(), $subscription->get_parent_payment()->get_currency() ) );
 
-							if ( $subscription->has_trial_period() ) {
+                            if ( $subscription->has_trial_period() ) {
 
-								echo "<small class='text-muted'>&nbsp;";
-								printf(
-									esc_html_x( '( %1$s trial )', 'Subscription trial period. (e.g.: 1 month trial)', 'invoicing' ),
-									esc_html( $subscription->get_trial_period() )
-								);
-								echo '</small>';
+                                echo "<small class='text-muted'>&nbsp;";
+                                printf(
+                                    esc_html_x( '( %1$s trial )', 'Subscription trial period. (e.g.: 1 month trial)', 'invoicing' ),
+                                    esc_html( $subscription->get_trial_period() )
+                                );
+                                echo '</small>';
 
-							}
+                            }
 
-							break;
+                            break;
 
-						case 'recurring_amount':
-							$frequency = getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' );
-							$amount    = wpinv_price( $subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency() );
-							echo wp_kses_post( strtolower( "<strong style='font-weight: 500;'>$amount</strong> / <span class='getpaid-item-recurring-period'>$frequency</span>" ) );
-							break;
+                        case 'recurring_amount':
+                            $frequency = getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' );
+                            $amount    = wpinv_price( $subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency() );
+                            echo wp_kses_post( strtolower( "<strong style='font-weight: 500;'>$amount</strong> / <span class='getpaid-item-recurring-period'>$frequency</span>" ) );
+                            break;
 
-						case 'item':
-							if ( empty( $subscription_group ) ) {
-								echo wp_kses_post( WPInv_Subscriptions_List_Table::generate_item_markup( $subscription->get_product_id() ) );
-							} else {
-								$markup = array_map( array( 'WPInv_Subscriptions_List_Table', 'generate_item_markup' ), array_keys( $subscription_group['items'] ) );
-								echo wp_kses_post( implode( ' | ', $markup ) );
-							}
+                        case 'item':
+                            if ( empty( $subscription_group ) ) {
+                                echo wp_kses_post( WPInv_Subscriptions_List_Table::generate_item_markup( $subscription->get_product_id() ) );
+                            } else {
+                                $markup = array_map( array( 'WPInv_Subscriptions_List_Table', 'generate_item_markup' ), array_keys( $subscription_group['items'] ) );
+                                echo wp_kses_post( implode( ' | ', $markup ) );
+                            }
 
-							break;
+                            break;
 
-						case 'payments':
-							$max_activations = (int) $subscription->get_bill_times();
-							echo ( (int) $subscription->get_times_billed() ) . ' / ' . ( empty( $max_activations ) ? '&infin;' : (int) $max_activations );
+                        case 'payments':
+                            $max_activations = (int) $subscription->get_bill_times();
+                            echo ( (int) $subscription->get_times_billed() ) . ' / ' . ( empty( $max_activations ) ? '&infin;' : (int) $max_activations );
 
-							break;
+                            break;
 
-						}
-						do_action( "getpaid_render_single_subscription_column_$key", $subscription );
+                        }
+                        do_action( "getpaid_render_single_subscription_column_$key", $subscription );
 
-					?>
+                    ?>
 				</td>
 
 			</tr>
@@ -121,17 +121,17 @@ 
 <span class="form-text">
 
 	<?php
-		if ( $subscription->can_cancel() ) {
-		printf(
+        if ( $subscription->can_cancel() ) {
+        printf(
             '<a href="%s" class="btn btn-danger btn-sm" onclick="return confirm(\'%s\')">%s</a>&nbsp;&nbsp;',
             esc_url( $subscription->get_cancel_url() ),
             esc_attr__( 'Are you sure you want to cancel this subscription?', 'invoicing' ),
             esc_html__( 'Cancel Subscription', 'invoicing' )
         );
-		}
+        }
 
-		do_action( 'getpaid-single-subscription-page-actions', $subscription );
-	?>
+        do_action( 'getpaid-single-subscription-page-actions', $subscription );
+    ?>
 
 	<a href="<?php echo esc_url( getpaid_get_tab_url( 'gp-subscriptions', get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) ) ); ?>" class="btn btn-secondary btn-sm"><?php esc_html_e( 'Go Back', 'invoicing' ); ?></a>
 </span>

Switch Indentation +48 added lines, -48 removed lines

@@ -1,4 +1,4 @@ 
-<?php
+    <?php
 
 /**
  * Template that prints a single subscription's details
@@ -10,19 +10,19 @@ 
  * @var WPInv_Subscriptions_Widget $widget
  */
 
-defined( 'ABSPATH' ) || exit;
+    defined( 'ABSPATH' ) || exit;
 
-do_action( 'getpaid_single_subscription_before_notices', $subscription );
+    do_action( 'getpaid_single_subscription_before_notices', $subscription );
 
-// Display errors and notices.
-wpinv_print_errors();
+    // Display errors and notices.
+    wpinv_print_errors();
 
-$subscription_groups = getpaid_get_invoice_subscription_groups( $subscription->get_parent_invoice_id() );
-$subscription_group  = getpaid_get_invoice_subscription_group( $subscription->get_parent_invoice_id(), $subscription->get_id() );
+    $subscription_groups = getpaid_get_invoice_subscription_groups( $subscription->get_parent_invoice_id() );
+    $subscription_group  = getpaid_get_invoice_subscription_group( $subscription->get_parent_invoice_id(), $subscription->get_id() );
 
-do_action( 'getpaid_before_single_subscription', $subscription, $subscription_groups );
+    do_action( 'getpaid_before_single_subscription', $subscription, $subscription_groups );
 
-?>
+    ?>
 
 <h2 class="mb-1 h4"><?php esc_html_e( 'Subscription Details', 'invoicing' ); ?></h2>
 <table class="table table-bordered">
@@ -39,59 +39,59 @@ 
 				<td style="width: 65%">
 					<?php
 
-						switch ( $key ) {
+						    switch ( $key ) {
 
-						case 'status':
-							echo esc_html( $subscription->get_status_label() );
-							break;
+						        case 'status':
+							        echo esc_html( $subscription->get_status_label() );
+							        break;
 
-						case 'start_date':
-							echo esc_html( getpaid_format_date_value( $subscription->get_date_created() ) );
-							break;
+						        case 'start_date':
+							        echo esc_html( getpaid_format_date_value( $subscription->get_date_created() ) );
+							        break;
 
-						case 'expiry_date':
-							echo esc_html( getpaid_format_date_value( $subscription->get_next_renewal_date() ) );
-							break;
+						        case 'expiry_date':
+							        echo esc_html( getpaid_format_date_value( $subscription->get_next_renewal_date() ) );
+							        break;
 
-						case 'initial_amount':
-							echo wp_kses_post( wpinv_price( $subscription->get_initial_amount(), $subscription->get_parent_payment()->get_currency() ) );
+						        case 'initial_amount':
+							        echo wp_kses_post( wpinv_price( $subscription->get_initial_amount(), $subscription->get_parent_payment()->get_currency() ) );
 
-							if ( $subscription->has_trial_period() ) {
+							        if ( $subscription->has_trial_period() ) {
 
-								echo "<small class='text-muted'>&nbsp;";
-								printf(
-									esc_html_x( '( %1$s trial )', 'Subscription trial period. (e.g.: 1 month trial)', 'invoicing' ),
-									esc_html( $subscription->get_trial_period() )
-								);
-								echo '</small>';
+								        echo "<small class='text-muted'>&nbsp;";
+								        printf(
+									        esc_html_x( '( %1$s trial )', 'Subscription trial period. (e.g.: 1 month trial)', 'invoicing' ),
+									        esc_html( $subscription->get_trial_period() )
+								        );
+								        echo '</small>';
 
-							}
+							        }
 
-							break;
+							        break;
 
-						case 'recurring_amount':
-							$frequency = getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' );
-							$amount    = wpinv_price( $subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency() );
-							echo wp_kses_post( strtolower( "<strong style='font-weight: 500;'>$amount</strong> / <span class='getpaid-item-recurring-period'>$frequency</span>" ) );
-							break;
+						        case 'recurring_amount':
+							        $frequency = getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' );
+							        $amount    = wpinv_price( $subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency() );
+							        echo wp_kses_post( strtolower( "<strong style='font-weight: 500;'>$amount</strong> / <span class='getpaid-item-recurring-period'>$frequency</span>" ) );
+							        break;
 
-						case 'item':
-							if ( empty( $subscription_group ) ) {
-								echo wp_kses_post( WPInv_Subscriptions_List_Table::generate_item_markup( $subscription->get_product_id() ) );
-							} else {
-								$markup = array_map( array( 'WPInv_Subscriptions_List_Table', 'generate_item_markup' ), array_keys( $subscription_group['items'] ) );
-								echo wp_kses_post( implode( ' | ', $markup ) );
-							}
+						        case 'item':
+							        if ( empty( $subscription_group ) ) {
+								        echo wp_kses_post( WPInv_Subscriptions_List_Table::generate_item_markup( $subscription->get_product_id() ) );
+							        } else {
+								        $markup = array_map( array( 'WPInv_Subscriptions_List_Table', 'generate_item_markup' ), array_keys( $subscription_group['items'] ) );
+								        echo wp_kses_post( implode( ' | ', $markup ) );
+							        }
 
-							break;
+							        break;
 
-						case 'payments':
-							$max_activations = (int) $subscription->get_bill_times();
-							echo ( (int) $subscription->get_times_billed() ) . ' / ' . ( empty( $max_activations ) ? '&infin;' : (int) $max_activations );
+						        case 'payments':
+							        $max_activations = (int) $subscription->get_bill_times();
+							        echo ( (int) $subscription->get_times_billed() ) . ' / ' . ( empty( $max_activations ) ? '&infin;' : (int) $max_activations );
 
-							break;
+							        break;
 
-						}
+						    }
 						do_action( "getpaid_render_single_subscription_column_$key", $subscription );
 
 					?>

Spacing +40 added lines, -40 removed lines

@@ -10,58 +10,58 @@ 
  * @var WPInv_Subscriptions_Widget $widget
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-do_action( 'getpaid_single_subscription_before_notices', $subscription );
+do_action('getpaid_single_subscription_before_notices', $subscription);
 
 // Display errors and notices.
 wpinv_print_errors();
 
-$subscription_groups = getpaid_get_invoice_subscription_groups( $subscription->get_parent_invoice_id() );
-$subscription_group  = getpaid_get_invoice_subscription_group( $subscription->get_parent_invoice_id(), $subscription->get_id() );
+$subscription_groups = getpaid_get_invoice_subscription_groups($subscription->get_parent_invoice_id());
+$subscription_group  = getpaid_get_invoice_subscription_group($subscription->get_parent_invoice_id(), $subscription->get_id());
 
-do_action( 'getpaid_before_single_subscription', $subscription, $subscription_groups );
+do_action('getpaid_before_single_subscription', $subscription, $subscription_groups);
 
 ?>
 
-<h2 class="mb-1 h4"><?php esc_html_e( 'Subscription Details', 'invoicing' ); ?></h2>
+<h2 class="mb-1 h4"><?php esc_html_e('Subscription Details', 'invoicing'); ?></h2>
 <table class="table table-bordered">
 	<tbody>
 
-		<?php foreach ( $widget->get_single_subscription_columns( $subscription ) as $key => $label ) : ?>
+		<?php foreach ($widget->get_single_subscription_columns($subscription) as $key => $label) : ?>
 
-			<tr class="getpaid-subscription-meta-<?php echo esc_attr( $key ); ?>">
+			<tr class="getpaid-subscription-meta-<?php echo esc_attr($key); ?>">
 
 				<th class="font-weight-bold" style="width: 35%">
-					<?php echo esc_html( $label ); ?>
+					<?php echo esc_html($label); ?>
 				</th>
 
 				<td style="width: 65%">
 					<?php
 
-						switch ( $key ) {
+						switch ($key) {
 
 						case 'status':
-							echo esc_html( $subscription->get_status_label() );
+							echo esc_html($subscription->get_status_label());
 							break;
 
 						case 'start_date':
-							echo esc_html( getpaid_format_date_value( $subscription->get_date_created() ) );
+							echo esc_html(getpaid_format_date_value($subscription->get_date_created()));
 							break;
 
 						case 'expiry_date':
-							echo esc_html( getpaid_format_date_value( $subscription->get_next_renewal_date() ) );
+							echo esc_html(getpaid_format_date_value($subscription->get_next_renewal_date()));
 							break;
 
 						case 'initial_amount':
-							echo wp_kses_post( wpinv_price( $subscription->get_initial_amount(), $subscription->get_parent_payment()->get_currency() ) );
+							echo wp_kses_post(wpinv_price($subscription->get_initial_amount(), $subscription->get_parent_payment()->get_currency()));
 
-							if ( $subscription->has_trial_period() ) {
+							if ($subscription->has_trial_period()) {
 
 								echo "<small class='text-muted'>&nbsp;";
 								printf(
-									esc_html_x( '( %1$s trial )', 'Subscription trial period. (e.g.: 1 month trial)', 'invoicing' ),
-									esc_html( $subscription->get_trial_period() )
+									esc_html_x('( %1$s trial )', 'Subscription trial period. (e.g.: 1 month trial)', 'invoicing'),
+									esc_html($subscription->get_trial_period())
 								);
 								echo '</small>';
 
@@ -70,29 +70,29 @@ 
 							break;
 
 						case 'recurring_amount':
-							$frequency = getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' );
-							$amount    = wpinv_price( $subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency() );
-							echo wp_kses_post( strtolower( "<strong style='font-weight: 500;'>$amount</strong> / <span class='getpaid-item-recurring-period'>$frequency</span>" ) );
+							$frequency = getpaid_get_subscription_period_label($subscription->get_period(), $subscription->get_frequency(), '');
+							$amount    = wpinv_price($subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency());
+							echo wp_kses_post(strtolower("<strong style='font-weight: 500;'>$amount</strong> / <span class='getpaid-item-recurring-period'>$frequency</span>"));
 							break;
 
 						case 'item':
-							if ( empty( $subscription_group ) ) {
-								echo wp_kses_post( WPInv_Subscriptions_List_Table::generate_item_markup( $subscription->get_product_id() ) );
+							if (empty($subscription_group)) {
+								echo wp_kses_post(WPInv_Subscriptions_List_Table::generate_item_markup($subscription->get_product_id()));
 							} else {
-								$markup = array_map( array( 'WPInv_Subscriptions_List_Table', 'generate_item_markup' ), array_keys( $subscription_group['items'] ) );
-								echo wp_kses_post( implode( ' | ', $markup ) );
+								$markup = array_map(array('WPInv_Subscriptions_List_Table', 'generate_item_markup'), array_keys($subscription_group['items']));
+								echo wp_kses_post(implode(' | ', $markup));
 							}
 
 							break;
 
 						case 'payments':
 							$max_activations = (int) $subscription->get_bill_times();
-							echo ( (int) $subscription->get_times_billed() ) . ' / ' . ( empty( $max_activations ) ? '&infin;' : (int) $max_activations );
+							echo ((int) $subscription->get_times_billed()) . ' / ' . (empty($max_activations) ? '&infin;' : (int) $max_activations);
 
 							break;
 
 						}
-						do_action( "getpaid_render_single_subscription_column_$key", $subscription );
+						do_action("getpaid_render_single_subscription_column_$key", $subscription);
 
 					?>
 				</td>
@@ -104,34 +104,34 @@ 
 	</tbody>
 </table>
 
-<?php if ( ! empty( $subscription_group ) ) : ?>
-	<h2 class='mt-5 mb-1 h4'><?php esc_html_e( 'Subscription Items', 'invoicing' ); ?></h2>
-	<?php getpaid_admin_subscription_item_details_metabox( $subscription ); ?>
+<?php if (!empty($subscription_group)) : ?>
+	<h2 class='mt-5 mb-1 h4'><?php esc_html_e('Subscription Items', 'invoicing'); ?></h2>
+	<?php getpaid_admin_subscription_item_details_metabox($subscription); ?>
 <?php endif; ?>
 
-<h2 class='mt-5 mb-1 h4'><?php esc_html_e( 'Related Invoices', 'invoicing' ); ?></h2>
+<h2 class='mt-5 mb-1 h4'><?php esc_html_e('Related Invoices', 'invoicing'); ?></h2>
 
-<?php ob_start();getpaid_admin_subscription_invoice_details_metabox( $subscription ); $invoice_details = ob_get_clean(); echo wp_kses_post( $invoice_details ); ?>
+<?php ob_start(); getpaid_admin_subscription_invoice_details_metabox($subscription); $invoice_details = ob_get_clean(); echo wp_kses_post($invoice_details); ?>
 
-<?php if ( 1 < count( $subscription_groups ) ) : ?>
-	<h2 class='mt-5 mb-1 h4'><?php esc_html_e( 'Related Subscriptions', 'invoicing' ); ?></h2>
-	<?php getpaid_admin_subscription_related_subscriptions_metabox( $subscription ); ?>
+<?php if (1 < count($subscription_groups)) : ?>
+	<h2 class='mt-5 mb-1 h4'><?php esc_html_e('Related Subscriptions', 'invoicing'); ?></h2>
+	<?php getpaid_admin_subscription_related_subscriptions_metabox($subscription); ?>
 <?php endif; ?>
 
 <span class="form-text">
 
 	<?php
-		if ( $subscription->can_cancel() ) {
+		if ($subscription->can_cancel()) {
 		printf(
             '<a href="%s" class="btn btn-danger btn-sm" onclick="return confirm(\'%s\')">%s</a>&nbsp;&nbsp;',
-            esc_url( $subscription->get_cancel_url() ),
-            esc_attr__( 'Are you sure you want to cancel this subscription?', 'invoicing' ),
-            esc_html__( 'Cancel Subscription', 'invoicing' )
+            esc_url($subscription->get_cancel_url()),
+            esc_attr__('Are you sure you want to cancel this subscription?', 'invoicing'),
+            esc_html__('Cancel Subscription', 'invoicing')
         );
 		}
 
-		do_action( 'getpaid-single-subscription-page-actions', $subscription );
+		do_action('getpaid-single-subscription-page-actions', $subscription);
 	?>
 
-	<a href="<?php echo esc_url( getpaid_get_tab_url( 'gp-subscriptions', get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) ) ); ?>" class="btn btn-secondary btn-sm"><?php esc_html_e( 'Go Back', 'invoicing' ); ?></a>
+	<a href="<?php echo esc_url(getpaid_get_tab_url('gp-subscriptions', get_permalink((int) wpinv_get_option('invoice_subscription_page')))); ?>" class="btn btn-secondary btn-sm"><?php esc_html_e('Go Back', 'invoicing'); ?></a>
 </span>

includes/admin/meta-boxes/class-getpaid-meta-box-invoice-address.php

Indentation +277 added lines, -277 removed lines

@@ -8,7 +8,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -16,85 +16,85 @@ 
  */
 class GetPaid_Meta_Box_Invoice_Address {
 
-	/**
-	 * Output the metabox.
-	 *
-	 * @param WP_Post $post
-	 */
-	public static function output( $post ) {
-
-		// Prepare the invoice.
-		$invoice  = new WPInv_Invoice( $post );
-		$customer = $invoice->exists() ? $invoice->get_user_id( 'edit' ) : get_current_user_id();
-		$customer = new WP_User( $customer );
-		$display  = sprintf( _x( '%1$s (%2$s)', 'user dropdown', 'invoicing' ), $customer->display_name, $customer->user_email );
-		wp_nonce_field( 'getpaid_meta_nonce', 'getpaid_meta_nonce' );
-
-		// Address fields.
-		$address_fields = array(
-			'first_name' => array(
-				'label' => __( 'First Name', 'invoicing' ),
-				'type'  => 'text',
-			),
-			'last_name'  => array(
-				'label' => __( 'Last Name', 'invoicing' ),
-				'type'  => 'text',
-			),
-			'company'    => array(
-				'label' => __( 'Company', 'invoicing' ),
-				'type'  => 'text',
-				'class' => 'getpaid-recalculate-prices-on-change',
-			),
-			'vat_number' => array(
-				'label' => __( 'VAT Number', 'invoicing' ),
-				'type'  => 'text',
-				'class' => 'getpaid-recalculate-prices-on-change',
-			),
-			'address'    => array(
-				'label' => __( 'Address', 'invoicing' ),
-				'type'  => 'text',
-			),
-			'city'       => array(
-				'label' => __( 'City', 'invoicing' ),
-				'type'  => 'text',
-			),
-			'country'    => array(
-				'label'       => __( 'Country', 'invoicing' ),
-				'type'        => 'select',
-				'class'       => 'getpaid-recalculate-prices-on-change',
-				'options'     => wpinv_get_country_list(),
-				'placeholder' => __( 'Choose a country', 'invoicing' ),
-			),
-			'state'      => array(
-				'label' => __( 'State', 'invoicing' ),
-				'type'  => 'text',
-				'class' => 'getpaid-recalculate-prices-on-change',
-			),
-			'zip'        => array(
-				'label' => __( 'Zip', 'invoicing' ),
-				'type'  => 'text',
-			),
-			'phone'      => array(
-				'label' => __( 'Phone', 'invoicing' ),
-				'type'  => 'text',
-			),
-		);
-
-		$states = wpinv_get_country_states( $invoice->get_country( 'edit' ) );
-
-		if ( ! empty( $states ) ) {
-			$address_fields['state']['type']        = 'select';
-			$address_fields['state']['options']     = $states;
-			$address_fields['state']['placeholder'] = __( 'Choose a state', 'invoicing' );
-		}
-
-		// Maybe remove the VAT field.
-		if ( ! wpinv_use_taxes() ) {
-			unset( $address_fields['vat_number'] );
-		}
-
-		$address_fields = apply_filters( 'getpaid_admin_edit_invoice_address_fields', $address_fields, $invoice );
-		?>
+    /**
+     * Output the metabox.
+     *
+     * @param WP_Post $post
+     */
+    public static function output( $post ) {
+
+        // Prepare the invoice.
+        $invoice  = new WPInv_Invoice( $post );
+        $customer = $invoice->exists() ? $invoice->get_user_id( 'edit' ) : get_current_user_id();
+        $customer = new WP_User( $customer );
+        $display  = sprintf( _x( '%1$s (%2$s)', 'user dropdown', 'invoicing' ), $customer->display_name, $customer->user_email );
+        wp_nonce_field( 'getpaid_meta_nonce', 'getpaid_meta_nonce' );
+
+        // Address fields.
+        $address_fields = array(
+            'first_name' => array(
+                'label' => __( 'First Name', 'invoicing' ),
+                'type'  => 'text',
+            ),
+            'last_name'  => array(
+                'label' => __( 'Last Name', 'invoicing' ),
+                'type'  => 'text',
+            ),
+            'company'    => array(
+                'label' => __( 'Company', 'invoicing' ),
+                'type'  => 'text',
+                'class' => 'getpaid-recalculate-prices-on-change',
+            ),
+            'vat_number' => array(
+                'label' => __( 'VAT Number', 'invoicing' ),
+                'type'  => 'text',
+                'class' => 'getpaid-recalculate-prices-on-change',
+            ),
+            'address'    => array(
+                'label' => __( 'Address', 'invoicing' ),
+                'type'  => 'text',
+            ),
+            'city'       => array(
+                'label' => __( 'City', 'invoicing' ),
+                'type'  => 'text',
+            ),
+            'country'    => array(
+                'label'       => __( 'Country', 'invoicing' ),
+                'type'        => 'select',
+                'class'       => 'getpaid-recalculate-prices-on-change',
+                'options'     => wpinv_get_country_list(),
+                'placeholder' => __( 'Choose a country', 'invoicing' ),
+            ),
+            'state'      => array(
+                'label' => __( 'State', 'invoicing' ),
+                'type'  => 'text',
+                'class' => 'getpaid-recalculate-prices-on-change',
+            ),
+            'zip'        => array(
+                'label' => __( 'Zip', 'invoicing' ),
+                'type'  => 'text',
+            ),
+            'phone'      => array(
+                'label' => __( 'Phone', 'invoicing' ),
+                'type'  => 'text',
+            ),
+        );
+
+        $states = wpinv_get_country_states( $invoice->get_country( 'edit' ) );
+
+        if ( ! empty( $states ) ) {
+            $address_fields['state']['type']        = 'select';
+            $address_fields['state']['options']     = $states;
+            $address_fields['state']['placeholder'] = __( 'Choose a state', 'invoicing' );
+        }
+
+        // Maybe remove the VAT field.
+        if ( ! wpinv_use_taxes() ) {
+            unset( $address_fields['vat_number'] );
+        }
+
+        $address_fields = apply_filters( 'getpaid_admin_edit_invoice_address_fields', $address_fields, $invoice );
+        ?>
 
 		<style>
 			#wpinv-address label {
@@ -119,19 +119,19 @@ 
 							<div id="getpaid-invoice-email-wrapper" class="d-none">
 								<input type="hidden" id="getpaid-invoice-create-new-user" name="wpinv_new_user" value="" />
 								<?php
-									aui()->input(
-										array(
-											'type'        => 'text',
-											'id'          => 'getpaid-invoice-new-user-email',
-											'name'        => 'wpinv_email',
-											'label'       => __( 'Email', 'invoicing' ) . '<span class="required">*</span>',
-											'label_type'  => 'vertical',
-											'placeholder' => 'john@doe.com',
-											'class'       => 'form-control-sm',
-										),
-										true
-									);
-								?>
+                                    aui()->input(
+                                        array(
+                                            'type'        => 'text',
+                                            'id'          => 'getpaid-invoice-new-user-email',
+                                            'name'        => 'wpinv_email',
+                                            'label'       => __( 'Email', 'invoicing' ) . '<span class="required">*</span>',
+                                            'label_type'  => 'vertical',
+                                            'placeholder' => 'john@doe.com',
+                                            'class'       => 'form-control-sm',
+                                        ),
+                                        true
+                                    );
+                                ?>
 							</div>
 						</div>
 						<div class="col-12 col-sm-6 form-group mb-3 mt-sm-4">
@@ -155,39 +155,39 @@ 
 							<div class="col-12 col-sm-6 getpaid-invoice-address-field__<?php echo esc_attr( $key ); ?>--wrapper">
 								<?php
 
-									if ( 'select' === $field['type'] ) {
-										aui()->select(
-											array(
-												'id'               => 'wpinv_' . $key,
-												'name'             => 'wpinv_' . $key,
-												'label'            => $field['label'],
-												'label_type'       => 'vertical',
-												'placeholder'      => isset( $field['placeholder'] ) ? $field['placeholder'] : '',
-												'class'            => 'form-control-sm ' . ( isset( $field['class'] ) ? $field['class'] : '' ),
-												'value'            => $invoice->get( $key, 'edit' ),
-												'options'          => $field['options'],
-												'data-allow-clear' => 'false',
-												'select2'          => true,
-											),
-											true
-										);
-									} else {
-										aui()->input(
-											array(
-												'type'        => $field['type'],
-												'id'          => 'wpinv_' . $key,
-												'name'        => 'wpinv_' . $key,
-												'label'       => $field['label'],
-												'label_type'  => 'vertical',
-												'placeholder' => isset( $field['placeholder'] ) ? $field['placeholder'] : '',
-												'class'       => 'form-control-sm ' . ( isset( $field['class'] ) ? $field['class'] : '' ),
-												'value'       => $invoice->get( $key, 'edit' ),
-											),
-											true
-										);
-									}
-
-								?>
+                                    if ( 'select' === $field['type'] ) {
+                                        aui()->select(
+                                            array(
+                                                'id'               => 'wpinv_' . $key,
+                                                'name'             => 'wpinv_' . $key,
+                                                'label'            => $field['label'],
+                                                'label_type'       => 'vertical',
+                                                'placeholder'      => isset( $field['placeholder'] ) ? $field['placeholder'] : '',
+                                                'class'            => 'form-control-sm ' . ( isset( $field['class'] ) ? $field['class'] : '' ),
+                                                'value'            => $invoice->get( $key, 'edit' ),
+                                                'options'          => $field['options'],
+                                                'data-allow-clear' => 'false',
+                                                'select2'          => true,
+                                            ),
+                                            true
+                                        );
+                                    } else {
+                                        aui()->input(
+                                            array(
+                                                'type'        => $field['type'],
+                                                'id'          => 'wpinv_' . $key,
+                                                'name'        => 'wpinv_' . $key,
+                                                'label'       => $field['label'],
+                                                'label_type'  => 'vertical',
+                                                'placeholder' => isset( $field['placeholder'] ) ? $field['placeholder'] : '',
+                                                'class'       => 'form-control-sm ' . ( isset( $field['class'] ) ? $field['class'] : '' ),
+                                                'value'       => $invoice->get( $key, 'edit' ),
+                                            ),
+                                            true
+                                        );
+                                    }
+
+                                ?>
 							</div>
 						<?php endforeach; ?>
 					</div>
@@ -198,48 +198,48 @@ 
 						<div class="row">
 							<div class="col-12 col-sm-6">
 								<?php
-									aui()->select(
-										array(
-											'id'          => 'wpinv_template',
-											'name'        => 'wpinv_template',
-											'label'       => __( 'Template', 'invoicing' ),
-											'label_type'  => 'vertical',
-											'placeholder' => __( 'Choose a template', 'invoicing' ),
-											'class'       => 'form-control-sm',
-											'value'       => $invoice->get_template( 'edit' ),
-											'options'     => array(
-												'quantity' => __( 'Quantity', 'invoicing' ),
-												'hours'    => __( 'Hours', 'invoicing' ),
-											),
-											'data-allow-clear' => 'false',
-											'select2'     => true,
-										),
-										true
-									);
-								?>
+                                    aui()->select(
+                                        array(
+                                            'id'          => 'wpinv_template',
+                                            'name'        => 'wpinv_template',
+                                            'label'       => __( 'Template', 'invoicing' ),
+                                            'label_type'  => 'vertical',
+                                            'placeholder' => __( 'Choose a template', 'invoicing' ),
+                                            'class'       => 'form-control-sm',
+                                            'value'       => $invoice->get_template( 'edit' ),
+                                            'options'     => array(
+                                                'quantity' => __( 'Quantity', 'invoicing' ),
+                                                'hours'    => __( 'Hours', 'invoicing' ),
+                                            ),
+                                            'data-allow-clear' => 'false',
+                                            'select2'     => true,
+                                        ),
+                                        true
+                                    );
+                                ?>
 							</div>
 							<div class="col-12 col-sm-6">
 								<?php
 
-									// Set currency.
-									aui()->select(
-										array(
-											'id'          => 'wpinv_currency',
-											'name'        => 'wpinv_currency',
-											'label'       => __( 'Currency', 'invoicing' ),
-											'label_type'  => 'vertical',
-											'placeholder' => __( 'Select Invoice Currency', 'invoicing' ),
-											'class'       => 'form-control-sm getpaid-recalculate-prices-on-change',
-											'value'       => $invoice->get_currency( 'edit' ),
-											'required'    => false,
-											'data-allow-clear' => 'false',
-											'select2'     => true,
-											'options'     => wpinv_get_currencies(),
-										),
-										true
-									);
-
-								?>
+                                    // Set currency.
+                                    aui()->select(
+                                        array(
+                                            'id'          => 'wpinv_currency',
+                                            'name'        => 'wpinv_currency',
+                                            'label'       => __( 'Currency', 'invoicing' ),
+                                            'label_type'  => 'vertical',
+                                            'placeholder' => __( 'Select Invoice Currency', 'invoicing' ),
+                                            'class'       => 'form-control-sm getpaid-recalculate-prices-on-change',
+                                            'value'       => $invoice->get_currency( 'edit' ),
+                                            'required'    => false,
+                                            'data-allow-clear' => 'false',
+                                            'select2'     => true,
+                                            'options'     => wpinv_get_currencies(),
+                                        ),
+                                        true
+                                    );
+
+                                ?>
 							</div>
 						</div>
 
@@ -249,123 +249,123 @@ 
 					<div class="row">
 						<div class="col-12 col-sm-6">
 							<?php
-								aui()->input(
-									array(
-										'type'        => 'text',
-										'id'          => 'wpinv_company_id',
-										'name'        => 'wpinv_company_id',
-										'label'       => __( 'Company ID', 'invoicing' ),
-										'label_type'  => 'vertical',
-										'placeholder' => '',
-										'class'       => 'form-control-sm',
-										'value'       => $invoice->get_company_id( 'edit' ),
-									),
-									true
-								);
-							?>
+                                aui()->input(
+                                    array(
+                                        'type'        => 'text',
+                                        'id'          => 'wpinv_company_id',
+                                        'name'        => 'wpinv_company_id',
+                                        'label'       => __( 'Company ID', 'invoicing' ),
+                                        'label_type'  => 'vertical',
+                                        'placeholder' => '',
+                                        'class'       => 'form-control-sm',
+                                        'value'       => $invoice->get_company_id( 'edit' ),
+                                    ),
+                                    true
+                                );
+                            ?>
 						</div>
 					</div>
 
 					<?php do_action( 'getpaid_after_metabox_invoice_address', $invoice ); ?>
 			</div>
 		<?php
-	}
-
-	/**
-	 * Save meta box data.
-	 *
-	 * @param int $post_id
-	 * @param array $posted the posted data.
-	 */
-	public static function save( $post_id, $posted ) {
-
-		// Prepare the invoice.
-		$invoice = new WPInv_Invoice( $post_id );
-
-		// Load new data.
-		$invoice->set_props(
-			array(
-				'template'       => isset( $posted['wpinv_template'] ) ? wpinv_clean( $posted['wpinv_template'] ) : null,
-				'email_cc'       => isset( $posted['wpinv_cc'] ) ? wpinv_clean( $posted['wpinv_cc'] ) : null,
-				'disable_taxes'  => ! empty( $posted['disable_taxes'] ),
-				'currency'       => isset( $posted['wpinv_currency'] ) ? wpinv_clean( $posted['wpinv_currency'] ) : null,
-				'gateway'        => ( $invoice->needs_payment() && isset( $posted['wpinv_gateway'] ) ) ? wpinv_clean( $posted['wpinv_gateway'] ) : null,
-				'address'        => isset( $posted['wpinv_address'] ) ? wpinv_clean( $posted['wpinv_address'] ) : null,
-				'vat_number'     => isset( $posted['wpinv_vat_number'] ) ? wpinv_clean( $posted['wpinv_vat_number'] ) : null,
-				'company'        => isset( $posted['wpinv_company'] ) ? wpinv_clean( $posted['wpinv_company'] ) : null,
-				'company_id'     => isset( $posted['wpinv_company_id'] ) ? wpinv_clean( $posted['wpinv_company_id'] ) : null,
-				'zip'            => isset( $posted['wpinv_zip'] ) ? wpinv_clean( $posted['wpinv_zip'] ) : null,
-				'state'          => isset( $posted['wpinv_state'] ) ? wpinv_clean( $posted['wpinv_state'] ) : null,
-				'city'           => isset( $posted['wpinv_city'] ) ? wpinv_clean( $posted['wpinv_city'] ) : null,
-				'country'        => isset( $posted['wpinv_country'] ) ? wpinv_clean( $posted['wpinv_country'] ) : null,
-				'phone'          => isset( $posted['wpinv_phone'] ) ? wpinv_clean( $posted['wpinv_phone'] ) : null,
-				'first_name'     => isset( $posted['wpinv_first_name'] ) ? wpinv_clean( $posted['wpinv_first_name'] ) : null,
-				'last_name'      => isset( $posted['wpinv_last_name'] ) ? wpinv_clean( $posted['wpinv_last_name'] ) : null,
-				'author'         => isset( $posted['post_author_override'] ) ? wpinv_clean( $posted['post_author_override'] ) : null,
-				'date_created'   => isset( $posted['date_created'] ) ? wpinv_clean( $posted['date_created'] ) : null,
-				'date_completed' => isset( $posted['wpinv_date_completed'] ) ? wpinv_clean( $posted['wpinv_date_completed'] ) : null,
-				'due_date'       => isset( $posted['wpinv_due_date'] ) ? wpinv_clean( $posted['wpinv_due_date'] ) : null,
-				'number'         => isset( $posted['wpinv_number'] ) ? wpinv_clean( $posted['wpinv_number'] ) : null,
-				'status'         => isset( $posted['wpinv_status'] ) ? wpinv_clean( $posted['wpinv_status'] ) : null,
-			)
-		);
-
-		// Discount code.
-		if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
-
-			if ( isset( $posted['wpinv_discount_code'] ) ) {
-				$invoice->set_discount_code( wpinv_clean( $posted['wpinv_discount_code'] ) );
-			}
-
-			$discount = new WPInv_Discount( $invoice->get_discount_code() );
-			if ( $discount->exists() ) {
-				$invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
-			} else {
-				$invoice->remove_discount( 'discount_code' );
-			}
-
-			// Recalculate totals.
-			$invoice->recalculate_total();
-
-		}
-
-		// If we're creating a new user...
-		if ( ! empty( $posted['wpinv_new_user'] ) && is_email( stripslashes( $posted['wpinv_email'] ) ) ) {
-
-			// Attempt to create the user.
-			$user = wpinv_create_user( sanitize_email( stripslashes( $posted['wpinv_email'] ) ), $invoice->get_first_name() . $invoice->get_last_name() );
-
-			// If successful, update the invoice author.
-			if ( is_numeric( $user ) ) {
-				$invoice->set_author( $user );
-			} else {
-				wpinv_error_log( $user->get_error_message(), __( 'Invoice add new user', 'invoicing' ), __FILE__, __LINE__ );
-			}
-		}
-
-		// Do not send new invoice notifications.
-		$GLOBALS['wpinv_skip_invoice_notification'] = true;
-
-		// Save the invoice.
-		$invoice->save();
-
-		// Save the user address.
-		getpaid_save_invoice_user_address( $invoice );
-
-		// Undo do not send new invoice notifications.
-		$GLOBALS['wpinv_skip_invoice_notification'] = false;
-
-		// (Maybe) send new user notification.
-		$should_send_notification = wpinv_get_option( 'disable_new_user_emails' );
-		if ( ! empty( $user ) && is_numeric( $user ) && apply_filters( 'getpaid_send_new_user_notification', empty( $should_send_notification ) ) ) {
-			wp_send_new_user_notifications( $user, 'user' );
-		}
-
-		if ( ! empty( $posted['send_to_customer'] ) && ! $invoice->is_draft() ) {
-			getpaid()->get( 'invoice_emails' )->user_invoice( $invoice, true );
-		}
-
-		// Fires after an invoice is saved.
-		do_action( 'wpinv_invoice_metabox_saved', $invoice );
-	}
+    }
+
+    /**
+     * Save meta box data.
+     *
+     * @param int $post_id
+     * @param array $posted the posted data.
+     */
+    public static function save( $post_id, $posted ) {
+
+        // Prepare the invoice.
+        $invoice = new WPInv_Invoice( $post_id );
+
+        // Load new data.
+        $invoice->set_props(
+            array(
+                'template'       => isset( $posted['wpinv_template'] ) ? wpinv_clean( $posted['wpinv_template'] ) : null,
+                'email_cc'       => isset( $posted['wpinv_cc'] ) ? wpinv_clean( $posted['wpinv_cc'] ) : null,
+                'disable_taxes'  => ! empty( $posted['disable_taxes'] ),
+                'currency'       => isset( $posted['wpinv_currency'] ) ? wpinv_clean( $posted['wpinv_currency'] ) : null,
+                'gateway'        => ( $invoice->needs_payment() && isset( $posted['wpinv_gateway'] ) ) ? wpinv_clean( $posted['wpinv_gateway'] ) : null,
+                'address'        => isset( $posted['wpinv_address'] ) ? wpinv_clean( $posted['wpinv_address'] ) : null,
+                'vat_number'     => isset( $posted['wpinv_vat_number'] ) ? wpinv_clean( $posted['wpinv_vat_number'] ) : null,
+                'company'        => isset( $posted['wpinv_company'] ) ? wpinv_clean( $posted['wpinv_company'] ) : null,
+                'company_id'     => isset( $posted['wpinv_company_id'] ) ? wpinv_clean( $posted['wpinv_company_id'] ) : null,
+                'zip'            => isset( $posted['wpinv_zip'] ) ? wpinv_clean( $posted['wpinv_zip'] ) : null,
+                'state'          => isset( $posted['wpinv_state'] ) ? wpinv_clean( $posted['wpinv_state'] ) : null,
+                'city'           => isset( $posted['wpinv_city'] ) ? wpinv_clean( $posted['wpinv_city'] ) : null,
+                'country'        => isset( $posted['wpinv_country'] ) ? wpinv_clean( $posted['wpinv_country'] ) : null,
+                'phone'          => isset( $posted['wpinv_phone'] ) ? wpinv_clean( $posted['wpinv_phone'] ) : null,
+                'first_name'     => isset( $posted['wpinv_first_name'] ) ? wpinv_clean( $posted['wpinv_first_name'] ) : null,
+                'last_name'      => isset( $posted['wpinv_last_name'] ) ? wpinv_clean( $posted['wpinv_last_name'] ) : null,
+                'author'         => isset( $posted['post_author_override'] ) ? wpinv_clean( $posted['post_author_override'] ) : null,
+                'date_created'   => isset( $posted['date_created'] ) ? wpinv_clean( $posted['date_created'] ) : null,
+                'date_completed' => isset( $posted['wpinv_date_completed'] ) ? wpinv_clean( $posted['wpinv_date_completed'] ) : null,
+                'due_date'       => isset( $posted['wpinv_due_date'] ) ? wpinv_clean( $posted['wpinv_due_date'] ) : null,
+                'number'         => isset( $posted['wpinv_number'] ) ? wpinv_clean( $posted['wpinv_number'] ) : null,
+                'status'         => isset( $posted['wpinv_status'] ) ? wpinv_clean( $posted['wpinv_status'] ) : null,
+            )
+        );
+
+        // Discount code.
+        if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
+
+            if ( isset( $posted['wpinv_discount_code'] ) ) {
+                $invoice->set_discount_code( wpinv_clean( $posted['wpinv_discount_code'] ) );
+            }
+
+            $discount = new WPInv_Discount( $invoice->get_discount_code() );
+            if ( $discount->exists() ) {
+                $invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
+            } else {
+                $invoice->remove_discount( 'discount_code' );
+            }
+
+            // Recalculate totals.
+            $invoice->recalculate_total();
+
+        }
+
+        // If we're creating a new user...
+        if ( ! empty( $posted['wpinv_new_user'] ) && is_email( stripslashes( $posted['wpinv_email'] ) ) ) {
+
+            // Attempt to create the user.
+            $user = wpinv_create_user( sanitize_email( stripslashes( $posted['wpinv_email'] ) ), $invoice->get_first_name() . $invoice->get_last_name() );
+
+            // If successful, update the invoice author.
+            if ( is_numeric( $user ) ) {
+                $invoice->set_author( $user );
+            } else {
+                wpinv_error_log( $user->get_error_message(), __( 'Invoice add new user', 'invoicing' ), __FILE__, __LINE__ );
+            }
+        }
+
+        // Do not send new invoice notifications.
+        $GLOBALS['wpinv_skip_invoice_notification'] = true;
+
+        // Save the invoice.
+        $invoice->save();
+
+        // Save the user address.
+        getpaid_save_invoice_user_address( $invoice );
+
+        // Undo do not send new invoice notifications.
+        $GLOBALS['wpinv_skip_invoice_notification'] = false;
+
+        // (Maybe) send new user notification.
+        $should_send_notification = wpinv_get_option( 'disable_new_user_emails' );
+        if ( ! empty( $user ) && is_numeric( $user ) && apply_filters( 'getpaid_send_new_user_notification', empty( $should_send_notification ) ) ) {
+            wp_send_new_user_notifications( $user, 'user' );
+        }
+
+        if ( ! empty( $posted['send_to_customer'] ) && ! $invoice->is_draft() ) {
+            getpaid()->get( 'invoice_emails' )->user_invoice( $invoice, true );
+        }
+
+        // Fires after an invoice is saved.
+        do_action( 'wpinv_invoice_metabox_saved', $invoice );
+    }
 }

Spacing +98 added lines, -98 removed lines

@@ -7,7 +7,7 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -21,79 +21,79 @@ 
 	 *
 	 * @param WP_Post $post
 	 */
-	public static function output( $post ) {
+	public static function output($post) {
 
 		// Prepare the invoice.
-		$invoice  = new WPInv_Invoice( $post );
-		$customer = $invoice->exists() ? $invoice->get_user_id( 'edit' ) : get_current_user_id();
-		$customer = new WP_User( $customer );
-		$display  = sprintf( _x( '%1$s (%2$s)', 'user dropdown', 'invoicing' ), $customer->display_name, $customer->user_email );
-		wp_nonce_field( 'getpaid_meta_nonce', 'getpaid_meta_nonce' );
+		$invoice  = new WPInv_Invoice($post);
+		$customer = $invoice->exists() ? $invoice->get_user_id('edit') : get_current_user_id();
+		$customer = new WP_User($customer);
+		$display  = sprintf(_x('%1$s (%2$s)', 'user dropdown', 'invoicing'), $customer->display_name, $customer->user_email);
+		wp_nonce_field('getpaid_meta_nonce', 'getpaid_meta_nonce');
 
 		// Address fields.
 		$address_fields = array(
 			'first_name' => array(
-				'label' => __( 'First Name', 'invoicing' ),
+				'label' => __('First Name', 'invoicing'),
 				'type'  => 'text',
 			),
 			'last_name'  => array(
-				'label' => __( 'Last Name', 'invoicing' ),
+				'label' => __('Last Name', 'invoicing'),
 				'type'  => 'text',
 			),
 			'company'    => array(
-				'label' => __( 'Company', 'invoicing' ),
+				'label' => __('Company', 'invoicing'),
 				'type'  => 'text',
 				'class' => 'getpaid-recalculate-prices-on-change',
 			),
 			'vat_number' => array(
-				'label' => __( 'VAT Number', 'invoicing' ),
+				'label' => __('VAT Number', 'invoicing'),
 				'type'  => 'text',
 				'class' => 'getpaid-recalculate-prices-on-change',
 			),
 			'address'    => array(
-				'label' => __( 'Address', 'invoicing' ),
+				'label' => __('Address', 'invoicing'),
 				'type'  => 'text',
 			),
 			'city'       => array(
-				'label' => __( 'City', 'invoicing' ),
+				'label' => __('City', 'invoicing'),
 				'type'  => 'text',
 			),
 			'country'    => array(
-				'label'       => __( 'Country', 'invoicing' ),
+				'label'       => __('Country', 'invoicing'),
 				'type'        => 'select',
 				'class'       => 'getpaid-recalculate-prices-on-change',
 				'options'     => wpinv_get_country_list(),
-				'placeholder' => __( 'Choose a country', 'invoicing' ),
+				'placeholder' => __('Choose a country', 'invoicing'),
 			),
 			'state'      => array(
-				'label' => __( 'State', 'invoicing' ),
+				'label' => __('State', 'invoicing'),
 				'type'  => 'text',
 				'class' => 'getpaid-recalculate-prices-on-change',
 			),
 			'zip'        => array(
-				'label' => __( 'Zip', 'invoicing' ),
+				'label' => __('Zip', 'invoicing'),
 				'type'  => 'text',
 			),
 			'phone'      => array(
-				'label' => __( 'Phone', 'invoicing' ),
+				'label' => __('Phone', 'invoicing'),
 				'type'  => 'text',
 			),
 		);
 
-		$states = wpinv_get_country_states( $invoice->get_country( 'edit' ) );
+		$states = wpinv_get_country_states($invoice->get_country('edit'));
 
-		if ( ! empty( $states ) ) {
+		if (!empty($states)) {
 			$address_fields['state']['type']        = 'select';
 			$address_fields['state']['options']     = $states;
-			$address_fields['state']['placeholder'] = __( 'Choose a state', 'invoicing' );
+			$address_fields['state']['placeholder'] = __('Choose a state', 'invoicing');
 		}
 
 		// Maybe remove the VAT field.
-		if ( ! wpinv_use_taxes() ) {
-			unset( $address_fields['vat_number'] );
+		if (!wpinv_use_taxes()) {
+			unset($address_fields['vat_number']);
 		}
 
-		$address_fields = apply_filters( 'getpaid_admin_edit_invoice_address_fields', $address_fields, $invoice );
+		$address_fields = apply_filters('getpaid_admin_edit_invoice_address_fields', $address_fields, $invoice);
 		?>
 
 		<style>
@@ -107,11 +107,11 @@ 
 						<div class="col-12 col-sm-6">
 							<div id="getpaid-invoice-user-id-wrapper" class="form-group mb-3">
 								<div>
-									<label for="post_author_override"><?php esc_html_e( 'Customer', 'invoicing' ); ?></label>
+									<label for="post_author_override"><?php esc_html_e('Customer', 'invoicing'); ?></label>
 								</div>
 								<div>
-									<select name="post_author_override" id="wpinv_post_author_override" class="getpaid-customer-search form-control regular-text" data-placeholder="<?php esc_attr_e( 'Search for a customer by email or name', 'invoicing' ); ?>">
-										<option selected="selected" value="<?php echo (int) $customer->ID; ?>"><?php echo esc_html( $display ); ?> </option>)
+									<select name="post_author_override" id="wpinv_post_author_override" class="getpaid-customer-search form-control regular-text" data-placeholder="<?php esc_attr_e('Search for a customer by email or name', 'invoicing'); ?>">
+										<option selected="selected" value="<?php echo (int) $customer->ID; ?>"><?php echo esc_html($display); ?> </option>)
 									</select>
 								</div>
 							</div>
@@ -124,7 +124,7 @@ 
 											'type'        => 'text',
 											'id'          => 'getpaid-invoice-new-user-email',
 											'name'        => 'wpinv_email',
-											'label'       => __( 'Email', 'invoicing' ) . '<span class="required">*</span>',
+											'label'       => __('Email', 'invoicing') . '<span class="required">*</span>',
 											'label_type'  => 'vertical',
 											'placeholder' => 'john@doe.com',
 											'class'       => 'form-control-sm',
@@ -135,36 +135,36 @@ 
 							</div>
 						</div>
 						<div class="col-12 col-sm-6 form-group mb-3 mt-sm-4">
-							<?php if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) : ?>
+							<?php if (!$invoice->is_paid() && !$invoice->is_refunded()) : ?>
 								<a id="getpaid-invoice-fill-user-details" class="button button-small button-secondary" href="javascript:void(0)">
 									<i aria-hidden="true" class="fa fa-refresh"></i>
-									<?php esc_html_e( 'Fill User Details', 'invoicing' ); ?>
+									<?php esc_html_e('Fill User Details', 'invoicing'); ?>
 								</a>
 								<a id="getpaid-invoice-create-new-user-button" class="button button-small button-secondary" href="javascript:void(0)">
 									<i aria-hidden="true" class="fa fa-plus"></i>
-									<?php esc_html_e( 'Add New User', 'invoicing' ); ?>
+									<?php esc_html_e('Add New User', 'invoicing'); ?>
 								</a>
 								<a id="getpaid-invoice-cancel-create-new-user" class="button button-small button-secondary d-none" href="javascript:void(0)">
 									<i aria-hidden="true" class="fa fa-close"></i>
-									<?php esc_html_e( 'Cancel', 'invoicing' ); ?>
+									<?php esc_html_e('Cancel', 'invoicing'); ?>
 								</a>
 							<?php endif; ?>
 						</div>
 
-						<?php foreach ( $address_fields as $key => $field ) : ?>
-							<div class="col-12 col-sm-6 getpaid-invoice-address-field__<?php echo esc_attr( $key ); ?>--wrapper">
+						<?php foreach ($address_fields as $key => $field) : ?>
+							<div class="col-12 col-sm-6 getpaid-invoice-address-field__<?php echo esc_attr($key); ?>--wrapper">
 								<?php
 
-									if ( 'select' === $field['type'] ) {
+									if ('select' === $field['type']) {
 										aui()->select(
 											array(
 												'id'               => 'wpinv_' . $key,
 												'name'             => 'wpinv_' . $key,
 												'label'            => $field['label'],
 												'label_type'       => 'vertical',
-												'placeholder'      => isset( $field['placeholder'] ) ? $field['placeholder'] : '',
-												'class'            => 'form-control-sm ' . ( isset( $field['class'] ) ? $field['class'] : '' ),
-												'value'            => $invoice->get( $key, 'edit' ),
+												'placeholder'      => isset($field['placeholder']) ? $field['placeholder'] : '',
+												'class'            => 'form-control-sm ' . (isset($field['class']) ? $field['class'] : ''),
+												'value'            => $invoice->get($key, 'edit'),
 												'options'          => $field['options'],
 												'data-allow-clear' => 'false',
 												'select2'          => true,
@@ -179,9 +179,9 @@ 
 												'name'        => 'wpinv_' . $key,
 												'label'       => $field['label'],
 												'label_type'  => 'vertical',
-												'placeholder' => isset( $field['placeholder'] ) ? $field['placeholder'] : '',
-												'class'       => 'form-control-sm ' . ( isset( $field['class'] ) ? $field['class'] : '' ),
-												'value'       => $invoice->get( $key, 'edit' ),
+												'placeholder' => isset($field['placeholder']) ? $field['placeholder'] : '',
+												'class'       => 'form-control-sm ' . (isset($field['class']) ? $field['class'] : ''),
+												'value'       => $invoice->get($key, 'edit'),
 											),
 											true
 										);
@@ -192,8 +192,8 @@ 
 						<?php endforeach; ?>
 					</div>
 
-					<?php if ( ! apply_filters( 'getpaid_use_new_invoice_items_metabox', false ) ) : ?>
-						<?php do_action( 'wpinv_meta_box_before_invoice_template_row', $invoice->get_id() ); ?>
+					<?php if (!apply_filters('getpaid_use_new_invoice_items_metabox', false)) : ?>
+						<?php do_action('wpinv_meta_box_before_invoice_template_row', $invoice->get_id()); ?>
 
 						<div class="row">
 							<div class="col-12 col-sm-6">
@@ -202,14 +202,14 @@ 
 										array(
 											'id'          => 'wpinv_template',
 											'name'        => 'wpinv_template',
-											'label'       => __( 'Template', 'invoicing' ),
+											'label'       => __('Template', 'invoicing'),
 											'label_type'  => 'vertical',
-											'placeholder' => __( 'Choose a template', 'invoicing' ),
+											'placeholder' => __('Choose a template', 'invoicing'),
 											'class'       => 'form-control-sm',
-											'value'       => $invoice->get_template( 'edit' ),
+											'value'       => $invoice->get_template('edit'),
 											'options'     => array(
-												'quantity' => __( 'Quantity', 'invoicing' ),
-												'hours'    => __( 'Hours', 'invoicing' ),
+												'quantity' => __('Quantity', 'invoicing'),
+												'hours'    => __('Hours', 'invoicing'),
 											),
 											'data-allow-clear' => 'false',
 											'select2'     => true,
@@ -226,11 +226,11 @@ 
 										array(
 											'id'          => 'wpinv_currency',
 											'name'        => 'wpinv_currency',
-											'label'       => __( 'Currency', 'invoicing' ),
+											'label'       => __('Currency', 'invoicing'),
 											'label_type'  => 'vertical',
-											'placeholder' => __( 'Select Invoice Currency', 'invoicing' ),
+											'placeholder' => __('Select Invoice Currency', 'invoicing'),
 											'class'       => 'form-control-sm getpaid-recalculate-prices-on-change',
-											'value'       => $invoice->get_currency( 'edit' ),
+											'value'       => $invoice->get_currency('edit'),
 											'required'    => false,
 											'data-allow-clear' => 'false',
 											'select2'     => true,
@@ -243,7 +243,7 @@ 
 							</div>
 						</div>
 
-						<?php do_action( 'wpinv_meta_box_invoice_template_row', $invoice->get_id() ); ?>
+						<?php do_action('wpinv_meta_box_invoice_template_row', $invoice->get_id()); ?>
 					<?php endif; ?>
 
 					<div class="row">
@@ -254,11 +254,11 @@ 
 										'type'        => 'text',
 										'id'          => 'wpinv_company_id',
 										'name'        => 'wpinv_company_id',
-										'label'       => __( 'Company ID', 'invoicing' ),
+										'label'       => __('Company ID', 'invoicing'),
 										'label_type'  => 'vertical',
 										'placeholder' => '',
 										'class'       => 'form-control-sm',
-										'value'       => $invoice->get_company_id( 'edit' ),
+										'value'       => $invoice->get_company_id('edit'),
 									),
 									true
 								);
@@ -266,7 +266,7 @@ 
 						</div>
 					</div>
 
-					<?php do_action( 'getpaid_after_metabox_invoice_address', $invoice ); ?>
+					<?php do_action('getpaid_after_metabox_invoice_address', $invoice); ?>
 			</div>
 		<?php
 	}
@@ -277,51 +277,51 @@ 
 	 * @param int $post_id
 	 * @param array $posted the posted data.
 	 */
-	public static function save( $post_id, $posted ) {
+	public static function save($post_id, $posted) {
 
 		// Prepare the invoice.
-		$invoice = new WPInv_Invoice( $post_id );
+		$invoice = new WPInv_Invoice($post_id);
 
 		// Load new data.
 		$invoice->set_props(
 			array(
-				'template'       => isset( $posted['wpinv_template'] ) ? wpinv_clean( $posted['wpinv_template'] ) : null,
-				'email_cc'       => isset( $posted['wpinv_cc'] ) ? wpinv_clean( $posted['wpinv_cc'] ) : null,
-				'disable_taxes'  => ! empty( $posted['disable_taxes'] ),
-				'currency'       => isset( $posted['wpinv_currency'] ) ? wpinv_clean( $posted['wpinv_currency'] ) : null,
-				'gateway'        => ( $invoice->needs_payment() && isset( $posted['wpinv_gateway'] ) ) ? wpinv_clean( $posted['wpinv_gateway'] ) : null,
-				'address'        => isset( $posted['wpinv_address'] ) ? wpinv_clean( $posted['wpinv_address'] ) : null,
-				'vat_number'     => isset( $posted['wpinv_vat_number'] ) ? wpinv_clean( $posted['wpinv_vat_number'] ) : null,
-				'company'        => isset( $posted['wpinv_company'] ) ? wpinv_clean( $posted['wpinv_company'] ) : null,
-				'company_id'     => isset( $posted['wpinv_company_id'] ) ? wpinv_clean( $posted['wpinv_company_id'] ) : null,
-				'zip'            => isset( $posted['wpinv_zip'] ) ? wpinv_clean( $posted['wpinv_zip'] ) : null,
-				'state'          => isset( $posted['wpinv_state'] ) ? wpinv_clean( $posted['wpinv_state'] ) : null,
-				'city'           => isset( $posted['wpinv_city'] ) ? wpinv_clean( $posted['wpinv_city'] ) : null,
-				'country'        => isset( $posted['wpinv_country'] ) ? wpinv_clean( $posted['wpinv_country'] ) : null,
-				'phone'          => isset( $posted['wpinv_phone'] ) ? wpinv_clean( $posted['wpinv_phone'] ) : null,
-				'first_name'     => isset( $posted['wpinv_first_name'] ) ? wpinv_clean( $posted['wpinv_first_name'] ) : null,
-				'last_name'      => isset( $posted['wpinv_last_name'] ) ? wpinv_clean( $posted['wpinv_last_name'] ) : null,
-				'author'         => isset( $posted['post_author_override'] ) ? wpinv_clean( $posted['post_author_override'] ) : null,
-				'date_created'   => isset( $posted['date_created'] ) ? wpinv_clean( $posted['date_created'] ) : null,
-				'date_completed' => isset( $posted['wpinv_date_completed'] ) ? wpinv_clean( $posted['wpinv_date_completed'] ) : null,
-				'due_date'       => isset( $posted['wpinv_due_date'] ) ? wpinv_clean( $posted['wpinv_due_date'] ) : null,
-				'number'         => isset( $posted['wpinv_number'] ) ? wpinv_clean( $posted['wpinv_number'] ) : null,
-				'status'         => isset( $posted['wpinv_status'] ) ? wpinv_clean( $posted['wpinv_status'] ) : null,
+				'template'       => isset($posted['wpinv_template']) ? wpinv_clean($posted['wpinv_template']) : null,
+				'email_cc'       => isset($posted['wpinv_cc']) ? wpinv_clean($posted['wpinv_cc']) : null,
+				'disable_taxes'  => !empty($posted['disable_taxes']),
+				'currency'       => isset($posted['wpinv_currency']) ? wpinv_clean($posted['wpinv_currency']) : null,
+				'gateway'        => ($invoice->needs_payment() && isset($posted['wpinv_gateway'])) ? wpinv_clean($posted['wpinv_gateway']) : null,
+				'address'        => isset($posted['wpinv_address']) ? wpinv_clean($posted['wpinv_address']) : null,
+				'vat_number'     => isset($posted['wpinv_vat_number']) ? wpinv_clean($posted['wpinv_vat_number']) : null,
+				'company'        => isset($posted['wpinv_company']) ? wpinv_clean($posted['wpinv_company']) : null,
+				'company_id'     => isset($posted['wpinv_company_id']) ? wpinv_clean($posted['wpinv_company_id']) : null,
+				'zip'            => isset($posted['wpinv_zip']) ? wpinv_clean($posted['wpinv_zip']) : null,
+				'state'          => isset($posted['wpinv_state']) ? wpinv_clean($posted['wpinv_state']) : null,
+				'city'           => isset($posted['wpinv_city']) ? wpinv_clean($posted['wpinv_city']) : null,
+				'country'        => isset($posted['wpinv_country']) ? wpinv_clean($posted['wpinv_country']) : null,
+				'phone'          => isset($posted['wpinv_phone']) ? wpinv_clean($posted['wpinv_phone']) : null,
+				'first_name'     => isset($posted['wpinv_first_name']) ? wpinv_clean($posted['wpinv_first_name']) : null,
+				'last_name'      => isset($posted['wpinv_last_name']) ? wpinv_clean($posted['wpinv_last_name']) : null,
+				'author'         => isset($posted['post_author_override']) ? wpinv_clean($posted['post_author_override']) : null,
+				'date_created'   => isset($posted['date_created']) ? wpinv_clean($posted['date_created']) : null,
+				'date_completed' => isset($posted['wpinv_date_completed']) ? wpinv_clean($posted['wpinv_date_completed']) : null,
+				'due_date'       => isset($posted['wpinv_due_date']) ? wpinv_clean($posted['wpinv_due_date']) : null,
+				'number'         => isset($posted['wpinv_number']) ? wpinv_clean($posted['wpinv_number']) : null,
+				'status'         => isset($posted['wpinv_status']) ? wpinv_clean($posted['wpinv_status']) : null,
 			)
 		);
 
 		// Discount code.
-		if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
+		if (!$invoice->is_paid() && !$invoice->is_refunded()) {
 
-			if ( isset( $posted['wpinv_discount_code'] ) ) {
-				$invoice->set_discount_code( wpinv_clean( $posted['wpinv_discount_code'] ) );
+			if (isset($posted['wpinv_discount_code'])) {
+				$invoice->set_discount_code(wpinv_clean($posted['wpinv_discount_code']));
 			}
 
-			$discount = new WPInv_Discount( $invoice->get_discount_code() );
-			if ( $discount->exists() ) {
-				$invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
+			$discount = new WPInv_Discount($invoice->get_discount_code());
+			if ($discount->exists()) {
+				$invoice->add_discount(getpaid_calculate_invoice_discount($invoice, $discount));
 			} else {
-				$invoice->remove_discount( 'discount_code' );
+				$invoice->remove_discount('discount_code');
 			}
 
 			// Recalculate totals.
@@ -330,16 +330,16 @@ 
 		}
 
 		// If we're creating a new user...
-		if ( ! empty( $posted['wpinv_new_user'] ) && is_email( stripslashes( $posted['wpinv_email'] ) ) ) {
+		if (!empty($posted['wpinv_new_user']) && is_email(stripslashes($posted['wpinv_email']))) {
 
 			// Attempt to create the user.
-			$user = wpinv_create_user( sanitize_email( stripslashes( $posted['wpinv_email'] ) ), $invoice->get_first_name() . $invoice->get_last_name() );
+			$user = wpinv_create_user(sanitize_email(stripslashes($posted['wpinv_email'])), $invoice->get_first_name() . $invoice->get_last_name());
 
 			// If successful, update the invoice author.
-			if ( is_numeric( $user ) ) {
-				$invoice->set_author( $user );
+			if (is_numeric($user)) {
+				$invoice->set_author($user);
 			} else {
-				wpinv_error_log( $user->get_error_message(), __( 'Invoice add new user', 'invoicing' ), __FILE__, __LINE__ );
+				wpinv_error_log($user->get_error_message(), __('Invoice add new user', 'invoicing'), __FILE__, __LINE__);
 			}
 		}
 
@@ -350,22 +350,22 @@ 
 		$invoice->save();
 
 		// Save the user address.
-		getpaid_save_invoice_user_address( $invoice );
+		getpaid_save_invoice_user_address($invoice);
 
 		// Undo do not send new invoice notifications.
 		$GLOBALS['wpinv_skip_invoice_notification'] = false;
 
 		// (Maybe) send new user notification.
-		$should_send_notification = wpinv_get_option( 'disable_new_user_emails' );
-		if ( ! empty( $user ) && is_numeric( $user ) && apply_filters( 'getpaid_send_new_user_notification', empty( $should_send_notification ) ) ) {
-			wp_send_new_user_notifications( $user, 'user' );
+		$should_send_notification = wpinv_get_option('disable_new_user_emails');
+		if (!empty($user) && is_numeric($user) && apply_filters('getpaid_send_new_user_notification', empty($should_send_notification))) {
+			wp_send_new_user_notifications($user, 'user');
 		}
 
-		if ( ! empty( $posted['send_to_customer'] ) && ! $invoice->is_draft() ) {
-			getpaid()->get( 'invoice_emails' )->user_invoice( $invoice, true );
+		if (!empty($posted['send_to_customer']) && !$invoice->is_draft()) {
+			getpaid()->get('invoice_emails')->user_invoice($invoice, true);
 		}
 
 		// Fires after an invoice is saved.
-		do_action( 'wpinv_invoice_metabox_saved', $invoice );
+		do_action('wpinv_invoice_metabox_saved', $invoice);
 	}
 }

vendor/ayecode/wp-font-awesome-settings/wp-font-awesome-settings.php

Braces +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
 
 				if( !$version || version_compare($version,'5.999','>')){
 					$url .= 'assets/js/fa-iconpicker-v6.min.js';
-				}else{
+				} else{
 					$url .= 'assets/js/fa-iconpicker-v5.min.js';
 				}
 

Indentation +821 added lines, -821 removed lines

@@ -13,7 +13,7 @@ 
  * Bail if we are not in WP.
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -21,406 +21,406 @@ 
  */
 if ( ! class_exists( 'WP_Font_Awesome_Settings' ) ) {
 
-	/**
-	 * A Class to be able to change settings for Font Awesome.
-	 *
-	 * Class WP_Font_Awesome_Settings
-	 */
-	class WP_Font_Awesome_Settings {
-
-		/**
-		 * Class version version.
-		 *
-		 * @var string
-		 */
-		public $version = '1.1.7';
-
-		/**
-		 * Class textdomain.
-		 *
-		 * @var string
-		 */
-		public $textdomain = 'font-awesome-settings';
-
-		/**
-		 * Latest version of Font Awesome at time of publish published.
-		 *
-		 * @var string
-		 */
-		public $latest = "6.4.2";
-
-		/**
-		 * The title.
-		 *
-		 * @var string
-		 */
-		public $name = 'Font Awesome';
-
-		/**
-		 * Holds the settings values.
-		 *
-		 * @var array
-		 */
-		private $settings;
-
-		/**
-		 * WP_Font_Awesome_Settings instance.
-		 *
-		 * @access private
-		 * @since  1.0.0
-		 * @var    WP_Font_Awesome_Settings There can be only one!
-		 */
-		private static $instance = null;
-
-		/**
-		 * Main WP_Font_Awesome_Settings Instance.
-		 *
-		 * Ensures only one instance of WP_Font_Awesome_Settings is loaded or can be loaded.
-		 *
-		 * @since 1.0.0
-		 * @static
-		 * @return WP_Font_Awesome_Settings - Main instance.
-		 */
-		public static function instance() {
-			if ( ! isset( self::$instance ) && ! ( self::$instance instanceof WP_Font_Awesome_Settings ) ) {
-				self::$instance = new WP_Font_Awesome_Settings;
-
-				add_action( 'init', array( self::$instance, 'init' ) ); // set settings
-
-				if ( is_admin() ) {
-					add_action( 'admin_menu', array( self::$instance, 'menu_item' ) );
-					add_action( 'admin_init', array( self::$instance, 'register_settings' ) );
-					add_action( 'admin_init', array( self::$instance, 'constants' ) );
-					add_action( 'admin_notices', array( self::$instance, 'admin_notices' ) );
-				}
-
-				do_action( 'wp_font_awesome_settings_loaded' );
-			}
-
-			return self::$instance;
-		}
-
-		/**
+    /**
+     * A Class to be able to change settings for Font Awesome.
+     *
+     * Class WP_Font_Awesome_Settings
+     */
+    class WP_Font_Awesome_Settings {
+
+        /**
+         * Class version version.
+         *
+         * @var string
+         */
+        public $version = '1.1.7';
+
+        /**
+         * Class textdomain.
+         *
+         * @var string
+         */
+        public $textdomain = 'font-awesome-settings';
+
+        /**
+         * Latest version of Font Awesome at time of publish published.
+         *
+         * @var string
+         */
+        public $latest = "6.4.2";
+
+        /**
+         * The title.
+         *
+         * @var string
+         */
+        public $name = 'Font Awesome';
+
+        /**
+         * Holds the settings values.
+         *
+         * @var array
+         */
+        private $settings;
+
+        /**
+         * WP_Font_Awesome_Settings instance.
+         *
+         * @access private
+         * @since  1.0.0
+         * @var    WP_Font_Awesome_Settings There can be only one!
+         */
+        private static $instance = null;
+
+        /**
+         * Main WP_Font_Awesome_Settings Instance.
+         *
+         * Ensures only one instance of WP_Font_Awesome_Settings is loaded or can be loaded.
+         *
+         * @since 1.0.0
+         * @static
+         * @return WP_Font_Awesome_Settings - Main instance.
+         */
+        public static function instance() {
+            if ( ! isset( self::$instance ) && ! ( self::$instance instanceof WP_Font_Awesome_Settings ) ) {
+                self::$instance = new WP_Font_Awesome_Settings;
+
+                add_action( 'init', array( self::$instance, 'init' ) ); // set settings
+
+                if ( is_admin() ) {
+                    add_action( 'admin_menu', array( self::$instance, 'menu_item' ) );
+                    add_action( 'admin_init', array( self::$instance, 'register_settings' ) );
+                    add_action( 'admin_init', array( self::$instance, 'constants' ) );
+                    add_action( 'admin_notices', array( self::$instance, 'admin_notices' ) );
+                }
+
+                do_action( 'wp_font_awesome_settings_loaded' );
+            }
+
+            return self::$instance;
+        }
+
+        /**
          * Define any constants that may be needed by other packages.
          *
-		 * @return void
-		 */
-		public function constants(){
+         * @return void
+         */
+        public function constants(){
 
-			// register iconpicker constant
-			if ( ! defined( 'FAS_ICONPICKER_JS_URL' ) ) {
-				$url = $this->get_path_url();
-				$version = $this->settings['version'];
+            // register iconpicker constant
+            if ( ! defined( 'FAS_ICONPICKER_JS_URL' ) ) {
+                $url = $this->get_path_url();
+                $version = $this->settings['version'];
 
-				if( !$version || version_compare($version,'5.999','>')){
-					$url .= 'assets/js/fa-iconpicker-v6.min.js';
-				}else{
-					$url .= 'assets/js/fa-iconpicker-v5.min.js';
-				}
+                if( !$version || version_compare($version,'5.999','>')){
+                    $url .= 'assets/js/fa-iconpicker-v6.min.js';
+                }else{
+                    $url .= 'assets/js/fa-iconpicker-v5.min.js';
+                }
 
-				define( 'FAS_ICONPICKER_JS_URL', $url );
+                define( 'FAS_ICONPICKER_JS_URL', $url );
 
-			}
+            }
 
             // Set a constant if pro enbaled
-			if ( ! defined( 'FAS_PRO' ) && $this->settings['pro'] ) {
-				define( 'FAS_PRO', true );
-			}
-		}
-
-		/**
-		 * Get the url path to the current folder.
-		 *
-		 * @return string
-		 */
-		public function get_path_url() {
-			$content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
-			$content_url = untrailingslashit( WP_CONTENT_URL );
-
-			// Replace http:// to https://.
-			if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
-				$content_url = str_replace( 'http://', 'https://', $content_url );
-			}
-
-			// Check if we are inside a plugin
-			$file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
-			$url = str_replace( $content_dir, $content_url, $file_dir );
-
-			return trailingslashit( $url );
-		}
-
-		/**
-		 * Initiate the settings and add the required action hooks.
-		 *
-		 * @since 1.0.8 Settings name wrong - FIXED
-		 */
-		public function init() {
-			// Download fontawesome locally.
-			add_action( 'add_option_wp-font-awesome-settings', array( $this, 'add_option_wp_font_awesome_settings' ), 10, 2 );
-			add_action( 'update_option_wp-font-awesome-settings', array( $this, 'update_option_wp_font_awesome_settings' ), 10, 2 );
-
-			$this->settings = $this->get_settings();
-
-			// Check if the official plugin is active and use that instead if so.
-			if ( ! defined( 'FONTAWESOME_PLUGIN_FILE' ) ) {
-				if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
-					add_action( 'admin_head', array( $this, 'add_generator' ), 99 );
-				}
-
-				if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
-					add_action( 'wp_head', array( $this, 'add_generator' ), 99 );
-				}
-
-				if ( $this->settings['type'] == 'CSS' ) {
-					if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
-						add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );
-						//add_action( 'wp_footer', array( $this, 'enqueue_style' ), 5000 ); // not sure why this was added, seems to break frontend
-					}
-
-					if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
-						add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );
-						add_filter( 'block_editor_settings_all', array( $this, 'enqueue_editor_styles' ), 10, 2 );
-					}
-				} else {
-					if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
-						add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );
-					}
-
-					if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
-						add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );
-						add_filter( 'block_editor_settings_all', array( $this, 'enqueue_editor_scripts' ), 10, 2 );
-					}
-				}
-
-				// remove font awesome if set to do so
-				if ( $this->settings['dequeue'] == '1' ) {
-					add_action( 'clean_url', array( $this, 'remove_font_awesome' ), 5000, 3 );
-				}
-			}
-
-		}
-
-		/**
-		 * Add FA to the FSE.
-		 *
-		 * @param $editor_settings
-		 * @param $block_editor_context
-		 *
-		 * @return array
-		 */
-		public function enqueue_editor_styles( $editor_settings, $block_editor_context ){
-
-			if ( ! empty( $editor_settings['__unstableResolvedAssets']['styles'] ) ) {
-				$url = $this->get_url();
-				$editor_settings['__unstableResolvedAssets']['styles'] .= "<link rel='stylesheet' id='font-awesome-css'  href='$url' media='all' />";
-			}
-
-			return $editor_settings;
-		}
-
-		/**
-		 * Add FA to the FSE.
-		 *
-		 * @param $editor_settings
-		 * @param $block_editor_context
-		 *
-		 * @return array
-		 */
-		public function enqueue_editor_scripts( $editor_settings, $block_editor_context ){
-
-			$url = $this->get_url();
-			$editor_settings['__unstableResolvedAssets']['scripts'] .= "<script src='$url' id='font-awesome-js'></script>";
-
-			return $editor_settings;
-		}
-
-		/**
-		 * Adds the Font Awesome styles.
-		 */
-		public function enqueue_style() {
-			// build url
-			$url = $this->get_url();
-			$version = ! empty( $this->settings['local'] ) && empty( $this->settings['pro'] ) ? strip_tags( $this->settings['local_version'] ) : null;
-
-			wp_deregister_style( 'font-awesome' ); // deregister in case its already there
-			wp_register_style( 'font-awesome', $url, array(), $version );
-			wp_enqueue_style( 'font-awesome' );
-
-			// RTL language support CSS.
-			if ( is_rtl() ) {
-				wp_add_inline_style( 'font-awesome', $this->rtl_inline_css() );
-			}
-
-			if ( $this->settings['shims'] ) {
-				$url = $this->get_url( true );
-				wp_deregister_style( 'font-awesome-shims' ); // deregister in case its already there
-				wp_register_style( 'font-awesome-shims', $url, array(), $version );
-				wp_enqueue_style( 'font-awesome-shims' );
-			}
-		}
-
-		/**
-		 * Adds the Font Awesome JS.
-		 */
-		public function enqueue_scripts() {
-			// build url
-			$url = $this->get_url();
-
-			$deregister_function = 'wp' . '_' . 'deregister' . '_' . 'script';
-			call_user_func( $deregister_function, 'font-awesome' ); // deregister in case its already there
-			wp_register_script( 'font-awesome', $url, array(), null );
-			wp_enqueue_script( 'font-awesome' );
-
-			if ( $this->settings['shims'] ) {
-				$url = $this->get_url( true );
-				call_user_func( $deregister_function, 'font-awesome-shims' ); // deregister in case its already there
-				wp_register_script( 'font-awesome-shims', $url, array(), null );
-				wp_enqueue_script( 'font-awesome-shims' );
-			}
-		}
-
-		/**
-		 * Get the url of the Font Awesome files.
-		 *
-		 * @param bool $shims If this is a shim file or not.
-		 * @param bool $local Load locally if allowed.
-		 *
-		 * @return string The url to the file.
-		 */
-		public function get_url( $shims = false, $local = true ) {
-			$script  = $shims ? 'v4-shims' : 'all';
-			$sub     = $this->settings['pro'] ? 'pro' : 'use';
-			$type    = $this->settings['type'];
-			$version = $this->settings['version'];
-			$kit_url = $this->settings['kit-url'] ? esc_url( $this->settings['kit-url'] ) : '';
-			$url     = '';
-
-			if ( $type == 'KIT' && $kit_url ) {
-				if ( $shims ) {
-					// if its a kit then we don't add shims here
-					return '';
-				}
-				$url .= $kit_url; // CDN
-				$url .= "?wpfas=true"; // set our var so our version is not removed
-			} else {
-				$v = '';
-				// Check and load locally.
-				if ( $local && $this->has_local() ) {
-					$script .= ".min";
-					$v .= '&ver=' . strip_tags( $this->settings['local_version'] );
-					$url .= $this->get_fonts_url(); // Local fonts url.
-				} else {
-					$url .= "https://$sub.fontawesome.com/releases/"; // CDN
-					$url .= ! empty( $version ) ? "v" . $version . '/' : "v" . $this->get_latest_version() . '/'; // version
-				}
-				$url .= $type == 'CSS' ? 'css/' : 'js/'; // type
-				$url .= $type == 'CSS' ? $script . '.css' : $script . '.js'; // type
-				$url .= "?wpfas=true" . $v; // set our var so our version is not removed
-			}
-
-			return $url;
-		}
-
-		/**
-		 * Try and remove any other versions of Font Awesome added by other plugins/themes.
-		 *
-		 * Uses the clean_url filter to try and remove any other Font Awesome files added, it can also add pseudo-elements flag for the JS version.
-		 *
-		 * @param $url
-		 * @param $original_url
-		 * @param $_context
-		 *
-		 * @return string The filtered url.
-		 */
-		public function remove_font_awesome( $url, $original_url, $_context ) {
-
-			if ( $_context == 'display'
-			     && ( strstr( $url, "fontawesome" ) !== false || strstr( $url, "font-awesome" ) !== false )
-			     && ( strstr( $url, ".js" ) !== false || strstr( $url, ".css" ) !== false )
-			) {// it's a font-awesome-url (probably)
-
-				if ( strstr( $url, "wpfas=true" ) !== false ) {
-					if ( $this->settings['type'] == 'JS' ) {
-						if ( $this->settings['js-pseudo'] ) {
-							$url .= "' data-search-pseudo-elements defer='defer";
-						} else {
-							$url .= "' defer='defer";
-						}
-					}
-				} else {
-					$url = ''; // removing the url removes the file
-				}
-
-			}
-
-			return $url;
-		}
-
-		/**
-		 * Register the database settings with WordPress.
-		 */
-		public function register_settings() {
-			register_setting( 'wp-font-awesome-settings', 'wp-font-awesome-settings' );
-		}
-
-		/**
-		 * Add the WordPress settings menu item.
-		 * @since 1.0.10 Calling function name direct will fail theme check so we don't.
-		 */
-		public function menu_item() {
-			$menu_function = 'add' . '_' . 'options' . '_' . 'page'; // won't pass theme check if function name present in theme
-			call_user_func( $menu_function, $this->name, $this->name, 'manage_options', 'wp-font-awesome-settings', array(
-				$this,
-				'settings_page'
-			) );
-		}
-
-		/**
-		 * Get the current Font Awesome output settings.
-		 *
-		 * @return array The array of settings.
-		 */
-		public function get_settings() {
-			$db_settings = get_option( 'wp-font-awesome-settings' );
-
-			$defaults = array(
-				'type'      => 'CSS', // type to use, CSS or JS or KIT
-				'version'   => '', // latest
-				'enqueue'   => '', // front and backend
-				'shims'     => '0', // default OFF now in 2020
-				'js-pseudo' => '0', // if the pseudo elements flag should be set (CPU intensive)
-				'dequeue'   => '0', // if we should try to remove other versions added by other plugins/themes
-				'pro'       => '0', // if pro CDN url should be used
-				'local'     => '0', // Store fonts locally.
-				'local_version' => '', // Local fonts version.
-				'kit-url'   => '', // the kit url
-			);
-
-			$settings = wp_parse_args( $db_settings, $defaults );
-
-			/**
-			 * Filter the Font Awesome settings.
-			 *
-			 * @todo if we add this filer people might use it and then it defeates the purpose of this class :/
-			 */
-			return $this->settings = apply_filters( 'wp-font-awesome-settings', $settings, $db_settings, $defaults );
-		}
-
-		/**
-		 * The settings page html output.
-		 */
-		public function settings_page() {
-			if ( ! current_user_can( 'manage_options' ) ) {
-				wp_die( __( 'You do not have sufficient permissions to access this page.', 'ayecode-connect' ) );
-			}
-
-			// a hidden way to force the update of the version number via api instead of waiting the 48 hours
-			if ( isset( $_REQUEST['force-version-check'] ) ) {
-				$this->get_latest_version( $force_api = true );
-			}
-
-			if ( ! defined( 'FONTAWESOME_PLUGIN_FILE' ) ) {
-				?>
+            if ( ! defined( 'FAS_PRO' ) && $this->settings['pro'] ) {
+                define( 'FAS_PRO', true );
+            }
+        }
+
+        /**
+         * Get the url path to the current folder.
+         *
+         * @return string
+         */
+        public function get_path_url() {
+            $content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
+            $content_url = untrailingslashit( WP_CONTENT_URL );
+
+            // Replace http:// to https://.
+            if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
+                $content_url = str_replace( 'http://', 'https://', $content_url );
+            }
+
+            // Check if we are inside a plugin
+            $file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
+            $url = str_replace( $content_dir, $content_url, $file_dir );
+
+            return trailingslashit( $url );
+        }
+
+        /**
+         * Initiate the settings and add the required action hooks.
+         *
+         * @since 1.0.8 Settings name wrong - FIXED
+         */
+        public function init() {
+            // Download fontawesome locally.
+            add_action( 'add_option_wp-font-awesome-settings', array( $this, 'add_option_wp_font_awesome_settings' ), 10, 2 );
+            add_action( 'update_option_wp-font-awesome-settings', array( $this, 'update_option_wp_font_awesome_settings' ), 10, 2 );
+
+            $this->settings = $this->get_settings();
+
+            // Check if the official plugin is active and use that instead if so.
+            if ( ! defined( 'FONTAWESOME_PLUGIN_FILE' ) ) {
+                if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
+                    add_action( 'admin_head', array( $this, 'add_generator' ), 99 );
+                }
+
+                if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
+                    add_action( 'wp_head', array( $this, 'add_generator' ), 99 );
+                }
+
+                if ( $this->settings['type'] == 'CSS' ) {
+                    if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
+                        add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );
+                        //add_action( 'wp_footer', array( $this, 'enqueue_style' ), 5000 ); // not sure why this was added, seems to break frontend
+                    }
+
+                    if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
+                        add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );
+                        add_filter( 'block_editor_settings_all', array( $this, 'enqueue_editor_styles' ), 10, 2 );
+                    }
+                } else {
+                    if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
+                        add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );
+                    }
+
+                    if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
+                        add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );
+                        add_filter( 'block_editor_settings_all', array( $this, 'enqueue_editor_scripts' ), 10, 2 );
+                    }
+                }
+
+                // remove font awesome if set to do so
+                if ( $this->settings['dequeue'] == '1' ) {
+                    add_action( 'clean_url', array( $this, 'remove_font_awesome' ), 5000, 3 );
+                }
+            }
+
+        }
+
+        /**
+         * Add FA to the FSE.
+         *
+         * @param $editor_settings
+         * @param $block_editor_context
+         *
+         * @return array
+         */
+        public function enqueue_editor_styles( $editor_settings, $block_editor_context ){
+
+            if ( ! empty( $editor_settings['__unstableResolvedAssets']['styles'] ) ) {
+                $url = $this->get_url();
+                $editor_settings['__unstableResolvedAssets']['styles'] .= "<link rel='stylesheet' id='font-awesome-css'  href='$url' media='all' />";
+            }
+
+            return $editor_settings;
+        }
+
+        /**
+         * Add FA to the FSE.
+         *
+         * @param $editor_settings
+         * @param $block_editor_context
+         *
+         * @return array
+         */
+        public function enqueue_editor_scripts( $editor_settings, $block_editor_context ){
+
+            $url = $this->get_url();
+            $editor_settings['__unstableResolvedAssets']['scripts'] .= "<script src='$url' id='font-awesome-js'></script>";
+
+            return $editor_settings;
+        }
+
+        /**
+         * Adds the Font Awesome styles.
+         */
+        public function enqueue_style() {
+            // build url
+            $url = $this->get_url();
+            $version = ! empty( $this->settings['local'] ) && empty( $this->settings['pro'] ) ? strip_tags( $this->settings['local_version'] ) : null;
+
+            wp_deregister_style( 'font-awesome' ); // deregister in case its already there
+            wp_register_style( 'font-awesome', $url, array(), $version );
+            wp_enqueue_style( 'font-awesome' );
+
+            // RTL language support CSS.
+            if ( is_rtl() ) {
+                wp_add_inline_style( 'font-awesome', $this->rtl_inline_css() );
+            }
+
+            if ( $this->settings['shims'] ) {
+                $url = $this->get_url( true );
+                wp_deregister_style( 'font-awesome-shims' ); // deregister in case its already there
+                wp_register_style( 'font-awesome-shims', $url, array(), $version );
+                wp_enqueue_style( 'font-awesome-shims' );
+            }
+        }
+
+        /**
+         * Adds the Font Awesome JS.
+         */
+        public function enqueue_scripts() {
+            // build url
+            $url = $this->get_url();
+
+            $deregister_function = 'wp' . '_' . 'deregister' . '_' . 'script';
+            call_user_func( $deregister_function, 'font-awesome' ); // deregister in case its already there
+            wp_register_script( 'font-awesome', $url, array(), null );
+            wp_enqueue_script( 'font-awesome' );
+
+            if ( $this->settings['shims'] ) {
+                $url = $this->get_url( true );
+                call_user_func( $deregister_function, 'font-awesome-shims' ); // deregister in case its already there
+                wp_register_script( 'font-awesome-shims', $url, array(), null );
+                wp_enqueue_script( 'font-awesome-shims' );
+            }
+        }
+
+        /**
+         * Get the url of the Font Awesome files.
+         *
+         * @param bool $shims If this is a shim file or not.
+         * @param bool $local Load locally if allowed.
+         *
+         * @return string The url to the file.
+         */
+        public function get_url( $shims = false, $local = true ) {
+            $script  = $shims ? 'v4-shims' : 'all';
+            $sub     = $this->settings['pro'] ? 'pro' : 'use';
+            $type    = $this->settings['type'];
+            $version = $this->settings['version'];
+            $kit_url = $this->settings['kit-url'] ? esc_url( $this->settings['kit-url'] ) : '';
+            $url     = '';
+
+            if ( $type == 'KIT' && $kit_url ) {
+                if ( $shims ) {
+                    // if its a kit then we don't add shims here
+                    return '';
+                }
+                $url .= $kit_url; // CDN
+                $url .= "?wpfas=true"; // set our var so our version is not removed
+            } else {
+                $v = '';
+                // Check and load locally.
+                if ( $local && $this->has_local() ) {
+                    $script .= ".min";
+                    $v .= '&ver=' . strip_tags( $this->settings['local_version'] );
+                    $url .= $this->get_fonts_url(); // Local fonts url.
+                } else {
+                    $url .= "https://$sub.fontawesome.com/releases/"; // CDN
+                    $url .= ! empty( $version ) ? "v" . $version . '/' : "v" . $this->get_latest_version() . '/'; // version
+                }
+                $url .= $type == 'CSS' ? 'css/' : 'js/'; // type
+                $url .= $type == 'CSS' ? $script . '.css' : $script . '.js'; // type
+                $url .= "?wpfas=true" . $v; // set our var so our version is not removed
+            }
+
+            return $url;
+        }
+
+        /**
+         * Try and remove any other versions of Font Awesome added by other plugins/themes.
+         *
+         * Uses the clean_url filter to try and remove any other Font Awesome files added, it can also add pseudo-elements flag for the JS version.
+         *
+         * @param $url
+         * @param $original_url
+         * @param $_context
+         *
+         * @return string The filtered url.
+         */
+        public function remove_font_awesome( $url, $original_url, $_context ) {
+
+            if ( $_context == 'display'
+                 && ( strstr( $url, "fontawesome" ) !== false || strstr( $url, "font-awesome" ) !== false )
+                 && ( strstr( $url, ".js" ) !== false || strstr( $url, ".css" ) !== false )
+            ) {// it's a font-awesome-url (probably)
+
+                if ( strstr( $url, "wpfas=true" ) !== false ) {
+                    if ( $this->settings['type'] == 'JS' ) {
+                        if ( $this->settings['js-pseudo'] ) {
+                            $url .= "' data-search-pseudo-elements defer='defer";
+                        } else {
+                            $url .= "' defer='defer";
+                        }
+                    }
+                } else {
+                    $url = ''; // removing the url removes the file
+                }
+
+            }
+
+            return $url;
+        }
+
+        /**
+         * Register the database settings with WordPress.
+         */
+        public function register_settings() {
+            register_setting( 'wp-font-awesome-settings', 'wp-font-awesome-settings' );
+        }
+
+        /**
+         * Add the WordPress settings menu item.
+         * @since 1.0.10 Calling function name direct will fail theme check so we don't.
+         */
+        public function menu_item() {
+            $menu_function = 'add' . '_' . 'options' . '_' . 'page'; // won't pass theme check if function name present in theme
+            call_user_func( $menu_function, $this->name, $this->name, 'manage_options', 'wp-font-awesome-settings', array(
+                $this,
+                'settings_page'
+            ) );
+        }
+
+        /**
+         * Get the current Font Awesome output settings.
+         *
+         * @return array The array of settings.
+         */
+        public function get_settings() {
+            $db_settings = get_option( 'wp-font-awesome-settings' );
+
+            $defaults = array(
+                'type'      => 'CSS', // type to use, CSS or JS or KIT
+                'version'   => '', // latest
+                'enqueue'   => '', // front and backend
+                'shims'     => '0', // default OFF now in 2020
+                'js-pseudo' => '0', // if the pseudo elements flag should be set (CPU intensive)
+                'dequeue'   => '0', // if we should try to remove other versions added by other plugins/themes
+                'pro'       => '0', // if pro CDN url should be used
+                'local'     => '0', // Store fonts locally.
+                'local_version' => '', // Local fonts version.
+                'kit-url'   => '', // the kit url
+            );
+
+            $settings = wp_parse_args( $db_settings, $defaults );
+
+            /**
+             * Filter the Font Awesome settings.
+             *
+             * @todo if we add this filer people might use it and then it defeates the purpose of this class :/
+             */
+            return $this->settings = apply_filters( 'wp-font-awesome-settings', $settings, $db_settings, $defaults );
+        }
+
+        /**
+         * The settings page html output.
+         */
+        public function settings_page() {
+            if ( ! current_user_can( 'manage_options' ) ) {
+                wp_die( __( 'You do not have sufficient permissions to access this page.', 'ayecode-connect' ) );
+            }
+
+            // a hidden way to force the update of the version number via api instead of waiting the 48 hours
+            if ( isset( $_REQUEST['force-version-check'] ) ) {
+                $this->get_latest_version( $force_api = true );
+            }
+
+            if ( ! defined( 'FONTAWESOME_PLUGIN_FILE' ) ) {
+                ?>
                 <style>
                     .wpfas-kit-show {
                         display: none;
@@ -446,16 +446,16 @@ 
                     <h1><?php echo $this->name; ?></h1>
                     <form method="post" action="options.php" class="fas-settings-form">
 						<?php
-						settings_fields( 'wp-font-awesome-settings' );
-						do_settings_sections( 'wp-font-awesome-settings' );
-						$table_class = '';
-						if ( $this->settings['type'] ) {
-							$table_class .= 'wpfas-' . sanitize_html_class( strtolower( $this->settings['type'] ) ) . '-set';
-						}
-						if ( ! empty( $this->settings['pro'] ) ) {
-							$table_class .= ' wpfas-has-pro';
-						}
-						?>
+                        settings_fields( 'wp-font-awesome-settings' );
+                        do_settings_sections( 'wp-font-awesome-settings' );
+                        $table_class = '';
+                        if ( $this->settings['type'] ) {
+                            $table_class .= 'wpfas-' . sanitize_html_class( strtolower( $this->settings['type'] ) ) . '-set';
+                        }
+                        if ( ! empty( $this->settings['pro'] ) ) {
+                            $table_class .= ' wpfas-has-pro';
+                        }
+                        ?>
 						<?php if ( $this->settings['type'] != 'KIT' && ! empty( $this->settings['local'] ) && empty( $this->settings['pro'] ) ) { ?>
 							<?php if ( $this->has_local() ) { ?>
                                 <div class="notice notice-info"><p><strong><?php _e( 'Font Awesome fonts are loading locally.', 'ayecode-connect' ); ?></strong></p></div>
@@ -480,12 +480,12 @@ 
                                 <td>
                                     <input class="regular-text" id="wpfas-kit-url" type="url" name="wp-font-awesome-settings[kit-url]" value="<?php echo esc_attr( $this->settings['kit-url'] ); ?>" placeholder="<?php echo 'https://kit.font';echo 'awesome.com/123abc.js'; // this won't pass theme check :(?>"/>
                                     <span><?php
-										echo wp_sprintf(
-											__( 'Requires a free account with Font Awesome. %sGet kit url%s', 'ayecode-connect' ),
-											'<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/kits"><i class="fas fa-external-link-alt"></i>',
-											'</a>'
-										);
-										?></span>
+                                        echo wp_sprintf(
+                                            __( 'Requires a free account with Font Awesome. %sGet kit url%s', 'ayecode-connect' ),
+                                            '<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/kits"><i class="fas fa-external-link-alt"></i>',
+                                            '</a>'
+                                        );
+                                        ?></span>
                                 </td>
                             </tr>
 
@@ -526,14 +526,14 @@ 
                                     <input type="hidden" name="wp-font-awesome-settings[pro]" value="0"/>
                                     <input type="checkbox" name="wp-font-awesome-settings[pro]" value="1" <?php checked( $this->settings['pro'], '1' ); ?> id="wpfas-pro" onchange="if(jQuery(this).is(':checked')){jQuery('.wpfas-table-settings').addClass('wpfas-has-pro')}else{jQuery('.wpfas-table-settings').removeClass('wpfas-has-pro')}"/>
                                     <span><?php
-										echo wp_sprintf(
-											__( 'Requires a subscription. %sLearn more%s  %sManage my allowed domains%s', 'ayecode-connect' ),
-											'<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/referral?a=c9b89e1418">',
-											' <i class="fas fa-external-link-alt"></i></a>',
-											'<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/account/cdn">',
-											' <i class="fas fa-external-link-alt"></i></a>'
-										);
-										?></span>
+                                        echo wp_sprintf(
+                                            __( 'Requires a subscription. %sLearn more%s  %sManage my allowed domains%s', 'ayecode-connect' ),
+                                            '<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/referral?a=c9b89e1418">',
+                                            ' <i class="fas fa-external-link-alt"></i></a>',
+                                            '<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/account/cdn">',
+                                            ' <i class="fas fa-external-link-alt"></i></a>'
+                                        );
+                                        ?></span>
                                 </td>
                             </tr>
 
@@ -587,8 +587,8 @@ 
                         </table>
                         <div class="fas-buttons">
 							<?php
-							submit_button();
-							?>
+                            submit_button();
+                            ?>
                             <p class="submit"><a href="https://fontawesome.com/referral?a=c9b89e1418" class="button button-secondary"><?php _e('Get 24,000+ more icons with Font Awesome Pro','ayecode-connect'); ?> <i class="fas fa-external-link-alt"></i></a></p>
 
                         </div>
@@ -597,414 +597,414 @@ 
                     <div id="wpfas-version"><?php echo wp_sprintf(__( 'Version: %s (affiliate links provided)', 'ayecode-connect' ), $this->version ); ?></div>
                 </div>
 				<?php
-			}
-		}
-
-		/**
-		 * Check a version number is valid and if so return it or else return an empty string.
-		 *
-		 * @param $version string The version number to check.
-		 *
-		 * @since 1.0.6
-		 *
-		 * @return string Either a valid version number or an empty string.
-		 */
-		public function validate_version_number( $version ) {
-
-			if ( version_compare( $version, '0.0.1', '>=' ) >= 0 ) {
-				// valid
-			} else {
-				$version = '';// not validated
-			}
-
-			return $version;
-		}
-
-
-		/**
-		 * Get the latest version of Font Awesome.
-		 *
-		 * We check for a cached version and if none we will check for a live version via API and then cache it for 48 hours.
-		 *
-		 * @since 1.0.7
-		 * @return mixed|string The latest version number found.
-		 */
-		public function get_latest_version( $force_api = false ) {
-			$latest_version = $this->latest;
-
-			$cache = get_transient( 'wp-font-awesome-settings-version' );
-
-			if ( $cache === false || $force_api ) { // its not set
-				$api_ver = $this->get_latest_version_from_api();
-				if ( version_compare( $api_ver, $this->latest, '>=' ) >= 0 ) {
-					$latest_version = $api_ver;
-					set_transient( 'wp-font-awesome-settings-version', $api_ver, 48 * HOUR_IN_SECONDS );
-				}
-			} elseif ( $this->validate_version_number( $cache ) ) {
-				if ( version_compare( $cache, $this->latest, '>=' ) >= 0 ) {
-					$latest_version = $cache;
-				}
-			}
-
-			// Check and auto download fonts locally.
-			if ( empty( $this->settings['pro'] ) && empty( $this->settings['version'] ) && $this->settings['type'] != 'KIT' && ! empty( $this->settings['local'] ) && ! empty( $this->settings['local_version'] ) && ! empty( $latest_version ) ) {
-				if ( version_compare( $latest_version, $this->settings['local_version'], '>' ) && is_admin() && ! wp_doing_ajax() ) {
-					$this->download_package( $latest_version );
-				}
-			}
-
-			return $latest_version;
-		}
-
-		/**
-		 * Get the latest Font Awesome version from the github API.
-		 *
-		 * @since 1.0.7
-		 * @return string The latest version number or `0` on API fail.
-		 */
-		public function get_latest_version_from_api() {
-			$version  = "0";
-			$response = wp_remote_get( "https://api.github.com/repos/FortAwesome/Font-Awesome/releases/latest" );
-			if ( ! is_wp_error( $response ) && is_array( $response ) ) {
-				$api_response = json_decode( wp_remote_retrieve_body( $response ), true );
-				if ( isset( $api_response['tag_name'] ) && version_compare( $api_response['tag_name'], $this->latest, '>=' ) >= 0 && empty( $api_response['prerelease'] ) ) {
-					$version = $api_response['tag_name'];
-				}
-			}
-
-			return $version;
-		}
-
-		/**
-		 * Inline CSS for RTL language support.
-		 *
-		 * @since 1.0.13
-		 * @return string Inline CSS.
-		 */
-		public function rtl_inline_css() {
-			$inline_css = '[dir=rtl] .fa-address,[dir=rtl] .fa-address-card,[dir=rtl] .fa-adjust,[dir=rtl] .fa-alarm-clock,[dir=rtl] .fa-align-left,[dir=rtl] .fa-align-right,[dir=rtl] .fa-analytics,[dir=rtl] .fa-angle-double-left,[dir=rtl] .fa-angle-double-right,[dir=rtl] .fa-angle-left,[dir=rtl] .fa-angle-right,[dir=rtl] .fa-arrow-alt-circle-left,[dir=rtl] .fa-arrow-alt-circle-right,[dir=rtl] .fa-arrow-alt-from-left,[dir=rtl] .fa-arrow-alt-from-right,[dir=rtl] .fa-arrow-alt-left,[dir=rtl] .fa-arrow-alt-right,[dir=rtl] .fa-arrow-alt-square-left,[dir=rtl] .fa-arrow-alt-square-right,[dir=rtl] .fa-arrow-alt-to-left,[dir=rtl] .fa-arrow-alt-to-right,[dir=rtl] .fa-arrow-circle-left,[dir=rtl] .fa-arrow-circle-right,[dir=rtl] .fa-arrow-from-left,[dir=rtl] .fa-arrow-from-right,[dir=rtl] .fa-arrow-left,[dir=rtl] .fa-arrow-right,[dir=rtl] .fa-arrow-square-left,[dir=rtl] .fa-arrow-square-right,[dir=rtl] .fa-arrow-to-left,[dir=rtl] .fa-arrow-to-right,[dir=rtl] .fa-balance-scale-left,[dir=rtl] .fa-balance-scale-right,[dir=rtl] .fa-bed,[dir=rtl] .fa-bed-bunk,[dir=rtl] .fa-bed-empty,[dir=rtl] .fa-border-left,[dir=rtl] .fa-border-right,[dir=rtl] .fa-calendar-check,[dir=rtl] .fa-caret-circle-left,[dir=rtl] .fa-caret-circle-right,[dir=rtl] .fa-caret-left,[dir=rtl] .fa-caret-right,[dir=rtl] .fa-caret-square-left,[dir=rtl] .fa-caret-square-right,[dir=rtl] .fa-cart-arrow-down,[dir=rtl] .fa-cart-plus,[dir=rtl] .fa-chart-area,[dir=rtl] .fa-chart-bar,[dir=rtl] .fa-chart-line,[dir=rtl] .fa-chart-line-down,[dir=rtl] .fa-chart-network,[dir=rtl] .fa-chart-pie,[dir=rtl] .fa-chart-pie-alt,[dir=rtl] .fa-chart-scatter,[dir=rtl] .fa-check-circle,[dir=rtl] .fa-check-square,[dir=rtl] .fa-chevron-circle-left,[dir=rtl] .fa-chevron-circle-right,[dir=rtl] .fa-chevron-double-left,[dir=rtl] .fa-chevron-double-right,[dir=rtl] .fa-chevron-left,[dir=rtl] .fa-chevron-right,[dir=rtl] .fa-chevron-square-left,[dir=rtl] .fa-chevron-square-right,[dir=rtl] .fa-clock,[dir=rtl] .fa-file,[dir=rtl] .fa-file-alt,[dir=rtl] .fa-file-archive,[dir=rtl] .fa-file-audio,[dir=rtl] .fa-file-chart-line,[dir=rtl] .fa-file-chart-pie,[dir=rtl] .fa-file-code,[dir=rtl] .fa-file-excel,[dir=rtl] .fa-file-image,[dir=rtl] .fa-file-pdf,[dir=rtl] .fa-file-powerpoint,[dir=rtl] .fa-file-video,[dir=rtl] .fa-file-word,[dir=rtl] .fa-flag,[dir=rtl] .fa-folder,[dir=rtl] .fa-folder-open,[dir=rtl] .fa-hand-lizard,[dir=rtl] .fa-hand-point-down,[dir=rtl] .fa-hand-point-left,[dir=rtl] .fa-hand-point-right,[dir=rtl] .fa-hand-point-up,[dir=rtl] .fa-hand-scissors,[dir=rtl] .fa-image,[dir=rtl] .fa-long-arrow-alt-left,[dir=rtl] .fa-long-arrow-alt-right,[dir=rtl] .fa-long-arrow-left,[dir=rtl] .fa-long-arrow-right,[dir=rtl] .fa-luggage-cart,[dir=rtl] .fa-moon,[dir=rtl] .fa-pencil,[dir=rtl] .fa-pencil-alt,[dir=rtl] .fa-play-circle,[dir=rtl] .fa-project-diagram,[dir=rtl] .fa-quote-left,[dir=rtl] .fa-quote-right,[dir=rtl] .fa-shopping-cart,[dir=rtl] .fa-thumbs-down,[dir=rtl] .fa-thumbs-up,[dir=rtl] .fa-user-chart{filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);transform:scale(-1,1)}[dir=rtl] .fa-spin{animation-direction:reverse}';
-
-			return $inline_css;
-		}
-
-		/**
-		 * Show any warnings as an admin notice.
-		 *
-		 * @return void
-		 */
-		public function admin_notices() {
-			$settings = $this->settings;
-
-			if ( defined( 'FONTAWESOME_PLUGIN_FILE' ) ) {
-				if ( ! empty( $_REQUEST['page'] ) && $_REQUEST['page'] == 'wp-font-awesome-settings' ) {
-					?>
+            }
+        }
+
+        /**
+         * Check a version number is valid and if so return it or else return an empty string.
+         *
+         * @param $version string The version number to check.
+         *
+         * @since 1.0.6
+         *
+         * @return string Either a valid version number or an empty string.
+         */
+        public function validate_version_number( $version ) {
+
+            if ( version_compare( $version, '0.0.1', '>=' ) >= 0 ) {
+                // valid
+            } else {
+                $version = '';// not validated
+            }
+
+            return $version;
+        }
+
+
+        /**
+         * Get the latest version of Font Awesome.
+         *
+         * We check for a cached version and if none we will check for a live version via API and then cache it for 48 hours.
+         *
+         * @since 1.0.7
+         * @return mixed|string The latest version number found.
+         */
+        public function get_latest_version( $force_api = false ) {
+            $latest_version = $this->latest;
+
+            $cache = get_transient( 'wp-font-awesome-settings-version' );
+
+            if ( $cache === false || $force_api ) { // its not set
+                $api_ver = $this->get_latest_version_from_api();
+                if ( version_compare( $api_ver, $this->latest, '>=' ) >= 0 ) {
+                    $latest_version = $api_ver;
+                    set_transient( 'wp-font-awesome-settings-version', $api_ver, 48 * HOUR_IN_SECONDS );
+                }
+            } elseif ( $this->validate_version_number( $cache ) ) {
+                if ( version_compare( $cache, $this->latest, '>=' ) >= 0 ) {
+                    $latest_version = $cache;
+                }
+            }
+
+            // Check and auto download fonts locally.
+            if ( empty( $this->settings['pro'] ) && empty( $this->settings['version'] ) && $this->settings['type'] != 'KIT' && ! empty( $this->settings['local'] ) && ! empty( $this->settings['local_version'] ) && ! empty( $latest_version ) ) {
+                if ( version_compare( $latest_version, $this->settings['local_version'], '>' ) && is_admin() && ! wp_doing_ajax() ) {
+                    $this->download_package( $latest_version );
+                }
+            }
+
+            return $latest_version;
+        }
+
+        /**
+         * Get the latest Font Awesome version from the github API.
+         *
+         * @since 1.0.7
+         * @return string The latest version number or `0` on API fail.
+         */
+        public function get_latest_version_from_api() {
+            $version  = "0";
+            $response = wp_remote_get( "https://api.github.com/repos/FortAwesome/Font-Awesome/releases/latest" );
+            if ( ! is_wp_error( $response ) && is_array( $response ) ) {
+                $api_response = json_decode( wp_remote_retrieve_body( $response ), true );
+                if ( isset( $api_response['tag_name'] ) && version_compare( $api_response['tag_name'], $this->latest, '>=' ) >= 0 && empty( $api_response['prerelease'] ) ) {
+                    $version = $api_response['tag_name'];
+                }
+            }
+
+            return $version;
+        }
+
+        /**
+         * Inline CSS for RTL language support.
+         *
+         * @since 1.0.13
+         * @return string Inline CSS.
+         */
+        public function rtl_inline_css() {
+            $inline_css = '[dir=rtl] .fa-address,[dir=rtl] .fa-address-card,[dir=rtl] .fa-adjust,[dir=rtl] .fa-alarm-clock,[dir=rtl] .fa-align-left,[dir=rtl] .fa-align-right,[dir=rtl] .fa-analytics,[dir=rtl] .fa-angle-double-left,[dir=rtl] .fa-angle-double-right,[dir=rtl] .fa-angle-left,[dir=rtl] .fa-angle-right,[dir=rtl] .fa-arrow-alt-circle-left,[dir=rtl] .fa-arrow-alt-circle-right,[dir=rtl] .fa-arrow-alt-from-left,[dir=rtl] .fa-arrow-alt-from-right,[dir=rtl] .fa-arrow-alt-left,[dir=rtl] .fa-arrow-alt-right,[dir=rtl] .fa-arrow-alt-square-left,[dir=rtl] .fa-arrow-alt-square-right,[dir=rtl] .fa-arrow-alt-to-left,[dir=rtl] .fa-arrow-alt-to-right,[dir=rtl] .fa-arrow-circle-left,[dir=rtl] .fa-arrow-circle-right,[dir=rtl] .fa-arrow-from-left,[dir=rtl] .fa-arrow-from-right,[dir=rtl] .fa-arrow-left,[dir=rtl] .fa-arrow-right,[dir=rtl] .fa-arrow-square-left,[dir=rtl] .fa-arrow-square-right,[dir=rtl] .fa-arrow-to-left,[dir=rtl] .fa-arrow-to-right,[dir=rtl] .fa-balance-scale-left,[dir=rtl] .fa-balance-scale-right,[dir=rtl] .fa-bed,[dir=rtl] .fa-bed-bunk,[dir=rtl] .fa-bed-empty,[dir=rtl] .fa-border-left,[dir=rtl] .fa-border-right,[dir=rtl] .fa-calendar-check,[dir=rtl] .fa-caret-circle-left,[dir=rtl] .fa-caret-circle-right,[dir=rtl] .fa-caret-left,[dir=rtl] .fa-caret-right,[dir=rtl] .fa-caret-square-left,[dir=rtl] .fa-caret-square-right,[dir=rtl] .fa-cart-arrow-down,[dir=rtl] .fa-cart-plus,[dir=rtl] .fa-chart-area,[dir=rtl] .fa-chart-bar,[dir=rtl] .fa-chart-line,[dir=rtl] .fa-chart-line-down,[dir=rtl] .fa-chart-network,[dir=rtl] .fa-chart-pie,[dir=rtl] .fa-chart-pie-alt,[dir=rtl] .fa-chart-scatter,[dir=rtl] .fa-check-circle,[dir=rtl] .fa-check-square,[dir=rtl] .fa-chevron-circle-left,[dir=rtl] .fa-chevron-circle-right,[dir=rtl] .fa-chevron-double-left,[dir=rtl] .fa-chevron-double-right,[dir=rtl] .fa-chevron-left,[dir=rtl] .fa-chevron-right,[dir=rtl] .fa-chevron-square-left,[dir=rtl] .fa-chevron-square-right,[dir=rtl] .fa-clock,[dir=rtl] .fa-file,[dir=rtl] .fa-file-alt,[dir=rtl] .fa-file-archive,[dir=rtl] .fa-file-audio,[dir=rtl] .fa-file-chart-line,[dir=rtl] .fa-file-chart-pie,[dir=rtl] .fa-file-code,[dir=rtl] .fa-file-excel,[dir=rtl] .fa-file-image,[dir=rtl] .fa-file-pdf,[dir=rtl] .fa-file-powerpoint,[dir=rtl] .fa-file-video,[dir=rtl] .fa-file-word,[dir=rtl] .fa-flag,[dir=rtl] .fa-folder,[dir=rtl] .fa-folder-open,[dir=rtl] .fa-hand-lizard,[dir=rtl] .fa-hand-point-down,[dir=rtl] .fa-hand-point-left,[dir=rtl] .fa-hand-point-right,[dir=rtl] .fa-hand-point-up,[dir=rtl] .fa-hand-scissors,[dir=rtl] .fa-image,[dir=rtl] .fa-long-arrow-alt-left,[dir=rtl] .fa-long-arrow-alt-right,[dir=rtl] .fa-long-arrow-left,[dir=rtl] .fa-long-arrow-right,[dir=rtl] .fa-luggage-cart,[dir=rtl] .fa-moon,[dir=rtl] .fa-pencil,[dir=rtl] .fa-pencil-alt,[dir=rtl] .fa-play-circle,[dir=rtl] .fa-project-diagram,[dir=rtl] .fa-quote-left,[dir=rtl] .fa-quote-right,[dir=rtl] .fa-shopping-cart,[dir=rtl] .fa-thumbs-down,[dir=rtl] .fa-thumbs-up,[dir=rtl] .fa-user-chart{filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);transform:scale(-1,1)}[dir=rtl] .fa-spin{animation-direction:reverse}';
+
+            return $inline_css;
+        }
+
+        /**
+         * Show any warnings as an admin notice.
+         *
+         * @return void
+         */
+        public function admin_notices() {
+            $settings = $this->settings;
+
+            if ( defined( 'FONTAWESOME_PLUGIN_FILE' ) ) {
+                if ( ! empty( $_REQUEST['page'] ) && $_REQUEST['page'] == 'wp-font-awesome-settings' ) {
+                    ?>
                     <div class="notice  notice-error is-dismissible">
                         <p><?php _e( 'The Official Font Awesome Plugin is active, please adjust your settings there.', 'ayecode-connect' ); ?></p>
                     </div>
 					<?php
-				}
-			} else {
-				if ( ! empty( $settings ) ) {
-					if ( $settings['type'] != 'KIT' && $settings['pro'] && ( $settings['version'] == '' || version_compare( $settings['version'], '6', '>=' ) ) ) {
-						$link = admin_url('options-general.php?page=wp-font-awesome-settings');
-						?>
+                }
+            } else {
+                if ( ! empty( $settings ) ) {
+                    if ( $settings['type'] != 'KIT' && $settings['pro'] && ( $settings['version'] == '' || version_compare( $settings['version'], '6', '>=' ) ) ) {
+                        $link = admin_url('options-general.php?page=wp-font-awesome-settings');
+                        ?>
                         <div class="notice  notice-error is-dismissible">
                             <p><?php echo wp_sprintf( __( 'Font Awesome Pro v6 requires the use of a kit, please setup your kit in %ssettings.%s', 'ayecode-connect' ),"<a href='". esc_url_raw( $link )."'>","</a>" ); ?></p>
                         </div>
 						<?php
-					}
-				}
-			}
-		}
-
-		/**
-		 * Handle fontawesome add settings to download fontawesome to store locally.
-		 *
-		 * @since 1.1.1
-		 *
-		 * @param string $option The option name.
-		 * @param mixed  $value  The option value.
-		 */
-		public function add_option_wp_font_awesome_settings( $option, $value ) {
-			// Do nothing if WordPress is being installed.
-			if ( wp_installing() ) {
-				return;
-			}
-
-			if ( ! empty( $value['local'] ) && empty( $value['pro'] ) && ! ( ! empty( $value['type'] ) && $value['type'] == 'KIT' ) ) {
-				$version = isset( $value['version'] ) && $value['version'] ? $value['version'] : $this->get_latest_version();
-
-				if ( ! empty( $version ) ) {
-					$response = $this->download_package( $version, $value );
-
-					if ( is_wp_error( $response ) ) {
-						add_settings_error( 'general', 'fontawesome_download', __( 'ERROR:', 'ayecode-connect' ) . ' ' . $response->get_error_message(), 'error' );
-					}
-				}
-			}
-		}
-
-		/**
-		 * Handle fontawesome update settings to download fontawesome to store locally.
-		 *
-		 * @since 1.1.0
-		 *
-		 * @param mixed $old_value The old option value.
-		 * @param mixed $value     The new option value.
-		 */
-		public function update_option_wp_font_awesome_settings( $old_value, $new_value ) {
-			// Do nothing if WordPress is being installed.
-			if ( wp_installing() ) {
-				return;
-			}
-
-			if ( ! empty( $new_value['local'] ) && empty( $new_value['pro'] ) && ! ( ! empty( $new_value['type'] ) && $new_value['type'] == 'KIT' ) ) {
-				// Old values
-				$old_version = isset( $old_value['version'] ) && $old_value['version'] ? $old_value['version'] : ( isset( $old_value['local_version'] ) ? $old_value['local_version'] : '' );
-				$old_local = isset( $old_value['local'] ) ? (int) $old_value['local'] : 0;
-
-				// New values
-				$new_version = isset( $new_value['version'] ) && $new_value['version'] ? $new_value['version'] : $this->get_latest_version();
-
-				if ( empty( $old_local ) || $old_version !== $new_version || ! file_exists( $this->get_fonts_dir() . 'css' . DIRECTORY_SEPARATOR . 'all.css' ) ) {
-					$response = $this->download_package( $new_version, $new_value );
-
-					if ( is_wp_error( $response ) ) {
-						add_settings_error( 'general', 'fontawesome_download', __( 'ERROR:', 'ayecode-connect' ) . ' ' . $response->get_error_message(), 'error' );
-					}
-				}
-			}
-		}
-
-		/**
-		 * Get the fonts directory local path.
-		 *
-		 * @since 1.1.0
-		 *
-		 * @param string Fonts directory local path.
-		 */
-		public function get_fonts_dir() {
-			$upload_dir = wp_upload_dir( null, false );
-
-			return $upload_dir['basedir'] . DIRECTORY_SEPARATOR .  'ayefonts' . DIRECTORY_SEPARATOR . 'fa' . DIRECTORY_SEPARATOR;
-		}
-
-		/**
-		 * Get the fonts directory local url.
-		 *
-		 * @since 1.1.0
-		 *
-		 * @param string Fonts directory local url.
-		 */
-		public function get_fonts_url() {
-			$upload_dir = wp_upload_dir( null, false );
-
-			return $upload_dir['baseurl'] .  '/ayefonts/fa/';
-		}
-
-		/**
-		 * Check whether load locally active.
-		 *
-		 * @since 1.1.0
-		 *
-		 * @return bool True if active else false.
-		 */
-		public function has_local() {
-			if ( ! empty( $this->settings['local'] ) && empty( $this->settings['pro'] ) && file_exists( $this->get_fonts_dir() . 'css' . DIRECTORY_SEPARATOR . 'all.css' ) ) {
-				return true;
-			}
-
-			return false;
-		}
-
-		/**
-		 * Get the WP Filesystem access.
-		 *
-		 * @since 1.1.0
-		 *
-		 * @return object The WP Filesystem.
-		 */
-		public function get_wp_filesystem() {
-			if ( ! function_exists( 'get_filesystem_method' ) ) {
-				require_once( ABSPATH . "/wp-admin/includes/file.php" );
-			}
-
-			$access_type = get_filesystem_method();
-
-			if ( $access_type === 'direct' ) {
-				/* You can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */
-				$creds = request_filesystem_credentials( trailingslashit( site_url() ) . 'wp-admin/', '', false, false, array() );
-
-				/* Initialize the API */
-				if ( ! WP_Filesystem( $creds ) ) {
-					/* Any problems and we exit */
-					return false;
-				}
-
-				global $wp_filesystem;
-
-				return $wp_filesystem;
-				/* Do our file manipulations below */
-			} else if ( defined( 'FTP_USER' ) ) {
-				$creds = request_filesystem_credentials( trailingslashit( site_url() ) . 'wp-admin/', '', false, false, array() );
-
-				/* Initialize the API */
-				if ( ! WP_Filesystem( $creds ) ) {
-					/* Any problems and we exit */
-					return false;
-				}
-
-				global $wp_filesystem;
-
-				return $wp_filesystem;
-			} else {
-				/* Don't have direct write access. Prompt user with our notice */
-				return false;
-			}
-		}
-
-		/**
-		 * Download the fontawesome package file.
-		 *
-		 * @since 1.1.0
-		 *
-		 * @param mixed $version The font awesome.
-		 * @param array $option Fontawesome settings.
-		 * @return WP_ERROR|bool Error on fail and true on success.
-		 */
-		public function download_package( $version, $option = array() ) {
-			$filename = 'fontawesome-free-' . $version . '-web';
-			$url = 'https://use.fontawesome.com/releases/v' . $version . '/' . $filename . '.zip';
-
-			if ( ! function_exists( 'wp_handle_upload' ) ) {
-				require_once ABSPATH . 'wp-admin/includes/file.php';
-			}
-
-			$download_file = download_url( esc_url_raw( $url ) );
-
-			if ( is_wp_error( $download_file ) ) {
-				return new WP_Error( 'fontawesome_download_failed', __( $download_file->get_error_message(), 'ayecode-connect' ) );
-			} else if ( empty( $download_file ) ) {
-				return new WP_Error( 'fontawesome_download_failed', __( 'Something went wrong in downloading the font awesome to store locally.', 'ayecode-connect' ) );
-			}
-
-			$response = $this->extract_package( $download_file, $filename, true );
-
-			// Update local version.
-			if ( is_wp_error( $response ) ) {
-				return $response;
-			} else if ( $response ) {
-				if ( empty( $option ) ) {
-					$option = get_option( 'wp-font-awesome-settings' );
-				}
-
-				$option['local_version'] = $version;
-
-				// Remove action to prevent looping.
-				remove_action( 'update_option_wp-font-awesome-settings', array( $this, 'update_option_wp_font_awesome_settings' ), 10, 2 );
-
-				update_option( 'wp-font-awesome-settings', $option );
-
-				return true;
-			}
-
-			return false;
-		}
-
-		/**
-		 * Extract the fontawesome package file.
-		 *
-		 * @since 1.1.0
-		 *
-		 * @param string $package The package file path.
-		 * @param string $dirname Package file name.
-		 * @param bool   $delete_package Delete temp file or not.
-		 * @return WP_Error|bool True on success WP_Error on fail.
-		 */
-		public function extract_package( $package, $dirname = '', $delete_package = false ) {
-			global $wp_filesystem;
-
-			$wp_filesystem = $this->get_wp_filesystem();
-
-			if ( empty( $wp_filesystem ) && isset( $wp_filesystem->errors ) && is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->get_error_code() ) {
-				return new WP_Error( 'fontawesome_filesystem_error', __( $wp_filesystem->errors->get_error_message(), 'ayecode-connect' ) );
-			} else if ( empty( $wp_filesystem ) ) {
-				return new WP_Error( 'fontawesome_filesystem_error', __( 'Failed to initialise WP_Filesystem while trying to download the Font Awesome package.', 'ayecode-connect' ) );
-			}
-
-			$fonts_dir = $this->get_fonts_dir();
-			$fonts_tmp_dir = dirname( $fonts_dir ) . DIRECTORY_SEPARATOR . 'fa-tmp' . DIRECTORY_SEPARATOR;
-
-			if ( $wp_filesystem->is_dir( $fonts_tmp_dir ) ) {
-				$wp_filesystem->delete( $fonts_tmp_dir, true );
-			}
-
-			// Unzip package to working directory.
-			$result = unzip_file( $package, $fonts_tmp_dir );
-
-			if ( is_wp_error( $result ) ) {
-				$wp_filesystem->delete( $fonts_tmp_dir, true );
-
-				if ( 'incompatible_archive' === $result->get_error_code() ) {
-					return new WP_Error( 'fontawesome_incompatible_archive', __( $result->get_error_message(), 'ayecode-connect' ) );
-				}
-
-				return $result;
-			}
-
-			if ( $wp_filesystem->is_dir( $fonts_dir ) ) {
-				$wp_filesystem->delete( $fonts_dir, true );
-			}
-
-			$extract_dir = $fonts_tmp_dir;
-
-			if ( $dirname && $wp_filesystem->is_dir( $extract_dir . $dirname . DIRECTORY_SEPARATOR ) ) {
-				$extract_dir .= $dirname . DIRECTORY_SEPARATOR;
-			}
-
-			try {
-				$return = $wp_filesystem->move( $extract_dir, $fonts_dir, true );
-			} catch ( Exception $e ) {
-				$return = new WP_Error( 'fontawesome_move_package', __( 'Fail to move font awesome package!', 'ayecode-connect' ) );
-			}
-
-			if ( $wp_filesystem->is_dir( $fonts_tmp_dir ) ) {
-				$wp_filesystem->delete( $fonts_tmp_dir, true );
-			}
-
-			// Once extracted, delete the package if required.
-			if ( $delete_package ) {
-				unlink( $package );
-			}
-
-			return $return;
-		}
-
-		/**
-		 * Output the version in the header.
-		 */
-		public function add_generator() {
-			$file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
-			$plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
-
-			// Find source plugin/theme.
-			$source = array();
-			if ( strpos( $file, $plugins_dir ) !== false ) {
-				$source = explode( "/", plugin_basename( $file ) );
-			} else if ( function_exists( 'get_theme_root' ) ) {
-				$themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
-
-				if ( strpos( $file, $themes_dir ) !== false ) {
-					$source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
-				}
-			}
-
-			echo '<meta name="generator" content="WP Font Awesome Settings v' . esc_attr( $this->version ) . '"' . ( ! empty( $source[0] ) ? ' data-ac-source="' . esc_attr( $source[0] ) . '"' : '' ) . ' />';
-		}
-	}
-
-	/**
-	 * Run the class if found.
-	 */
-	WP_Font_Awesome_Settings::instance();
+                    }
+                }
+            }
+        }
+
+        /**
+         * Handle fontawesome add settings to download fontawesome to store locally.
+         *
+         * @since 1.1.1
+         *
+         * @param string $option The option name.
+         * @param mixed  $value  The option value.
+         */
+        public function add_option_wp_font_awesome_settings( $option, $value ) {
+            // Do nothing if WordPress is being installed.
+            if ( wp_installing() ) {
+                return;
+            }
+
+            if ( ! empty( $value['local'] ) && empty( $value['pro'] ) && ! ( ! empty( $value['type'] ) && $value['type'] == 'KIT' ) ) {
+                $version = isset( $value['version'] ) && $value['version'] ? $value['version'] : $this->get_latest_version();
+
+                if ( ! empty( $version ) ) {
+                    $response = $this->download_package( $version, $value );
+
+                    if ( is_wp_error( $response ) ) {
+                        add_settings_error( 'general', 'fontawesome_download', __( 'ERROR:', 'ayecode-connect' ) . ' ' . $response->get_error_message(), 'error' );
+                    }
+                }
+            }
+        }
+
+        /**
+         * Handle fontawesome update settings to download fontawesome to store locally.
+         *
+         * @since 1.1.0
+         *
+         * @param mixed $old_value The old option value.
+         * @param mixed $value     The new option value.
+         */
+        public function update_option_wp_font_awesome_settings( $old_value, $new_value ) {
+            // Do nothing if WordPress is being installed.
+            if ( wp_installing() ) {
+                return;
+            }
+
+            if ( ! empty( $new_value['local'] ) && empty( $new_value['pro'] ) && ! ( ! empty( $new_value['type'] ) && $new_value['type'] == 'KIT' ) ) {
+                // Old values
+                $old_version = isset( $old_value['version'] ) && $old_value['version'] ? $old_value['version'] : ( isset( $old_value['local_version'] ) ? $old_value['local_version'] : '' );
+                $old_local = isset( $old_value['local'] ) ? (int) $old_value['local'] : 0;
+
+                // New values
+                $new_version = isset( $new_value['version'] ) && $new_value['version'] ? $new_value['version'] : $this->get_latest_version();
+
+                if ( empty( $old_local ) || $old_version !== $new_version || ! file_exists( $this->get_fonts_dir() . 'css' . DIRECTORY_SEPARATOR . 'all.css' ) ) {
+                    $response = $this->download_package( $new_version, $new_value );
+
+                    if ( is_wp_error( $response ) ) {
+                        add_settings_error( 'general', 'fontawesome_download', __( 'ERROR:', 'ayecode-connect' ) . ' ' . $response->get_error_message(), 'error' );
+                    }
+                }
+            }
+        }
+
+        /**
+         * Get the fonts directory local path.
+         *
+         * @since 1.1.0
+         *
+         * @param string Fonts directory local path.
+         */
+        public function get_fonts_dir() {
+            $upload_dir = wp_upload_dir( null, false );
+
+            return $upload_dir['basedir'] . DIRECTORY_SEPARATOR .  'ayefonts' . DIRECTORY_SEPARATOR . 'fa' . DIRECTORY_SEPARATOR;
+        }
+
+        /**
+         * Get the fonts directory local url.
+         *
+         * @since 1.1.0
+         *
+         * @param string Fonts directory local url.
+         */
+        public function get_fonts_url() {
+            $upload_dir = wp_upload_dir( null, false );
+
+            return $upload_dir['baseurl'] .  '/ayefonts/fa/';
+        }
+
+        /**
+         * Check whether load locally active.
+         *
+         * @since 1.1.0
+         *
+         * @return bool True if active else false.
+         */
+        public function has_local() {
+            if ( ! empty( $this->settings['local'] ) && empty( $this->settings['pro'] ) && file_exists( $this->get_fonts_dir() . 'css' . DIRECTORY_SEPARATOR . 'all.css' ) ) {
+                return true;
+            }
+
+            return false;
+        }
+
+        /**
+         * Get the WP Filesystem access.
+         *
+         * @since 1.1.0
+         *
+         * @return object The WP Filesystem.
+         */
+        public function get_wp_filesystem() {
+            if ( ! function_exists( 'get_filesystem_method' ) ) {
+                require_once( ABSPATH . "/wp-admin/includes/file.php" );
+            }
+
+            $access_type = get_filesystem_method();
+
+            if ( $access_type === 'direct' ) {
+                /* You can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */
+                $creds = request_filesystem_credentials( trailingslashit( site_url() ) . 'wp-admin/', '', false, false, array() );
+
+                /* Initialize the API */
+                if ( ! WP_Filesystem( $creds ) ) {
+                    /* Any problems and we exit */
+                    return false;
+                }
+
+                global $wp_filesystem;
+
+                return $wp_filesystem;
+                /* Do our file manipulations below */
+            } else if ( defined( 'FTP_USER' ) ) {
+                $creds = request_filesystem_credentials( trailingslashit( site_url() ) . 'wp-admin/', '', false, false, array() );
+
+                /* Initialize the API */
+                if ( ! WP_Filesystem( $creds ) ) {
+                    /* Any problems and we exit */
+                    return false;
+                }
+
+                global $wp_filesystem;
+
+                return $wp_filesystem;
+            } else {
+                /* Don't have direct write access. Prompt user with our notice */
+                return false;
+            }
+        }
+
+        /**
+         * Download the fontawesome package file.
+         *
+         * @since 1.1.0
+         *
+         * @param mixed $version The font awesome.
+         * @param array $option Fontawesome settings.
+         * @return WP_ERROR|bool Error on fail and true on success.
+         */
+        public function download_package( $version, $option = array() ) {
+            $filename = 'fontawesome-free-' . $version . '-web';
+            $url = 'https://use.fontawesome.com/releases/v' . $version . '/' . $filename . '.zip';
+
+            if ( ! function_exists( 'wp_handle_upload' ) ) {
+                require_once ABSPATH . 'wp-admin/includes/file.php';
+            }
+
+            $download_file = download_url( esc_url_raw( $url ) );
+
+            if ( is_wp_error( $download_file ) ) {
+                return new WP_Error( 'fontawesome_download_failed', __( $download_file->get_error_message(), 'ayecode-connect' ) );
+            } else if ( empty( $download_file ) ) {
+                return new WP_Error( 'fontawesome_download_failed', __( 'Something went wrong in downloading the font awesome to store locally.', 'ayecode-connect' ) );
+            }
+
+            $response = $this->extract_package( $download_file, $filename, true );
+
+            // Update local version.
+            if ( is_wp_error( $response ) ) {
+                return $response;
+            } else if ( $response ) {
+                if ( empty( $option ) ) {
+                    $option = get_option( 'wp-font-awesome-settings' );
+                }
+
+                $option['local_version'] = $version;
+
+                // Remove action to prevent looping.
+                remove_action( 'update_option_wp-font-awesome-settings', array( $this, 'update_option_wp_font_awesome_settings' ), 10, 2 );
+
+                update_option( 'wp-font-awesome-settings', $option );
+
+                return true;
+            }
+
+            return false;
+        }
+
+        /**
+         * Extract the fontawesome package file.
+         *
+         * @since 1.1.0
+         *
+         * @param string $package The package file path.
+         * @param string $dirname Package file name.
+         * @param bool   $delete_package Delete temp file or not.
+         * @return WP_Error|bool True on success WP_Error on fail.
+         */
+        public function extract_package( $package, $dirname = '', $delete_package = false ) {
+            global $wp_filesystem;
+
+            $wp_filesystem = $this->get_wp_filesystem();
+
+            if ( empty( $wp_filesystem ) && isset( $wp_filesystem->errors ) && is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->get_error_code() ) {
+                return new WP_Error( 'fontawesome_filesystem_error', __( $wp_filesystem->errors->get_error_message(), 'ayecode-connect' ) );
+            } else if ( empty( $wp_filesystem ) ) {
+                return new WP_Error( 'fontawesome_filesystem_error', __( 'Failed to initialise WP_Filesystem while trying to download the Font Awesome package.', 'ayecode-connect' ) );
+            }
+
+            $fonts_dir = $this->get_fonts_dir();
+            $fonts_tmp_dir = dirname( $fonts_dir ) . DIRECTORY_SEPARATOR . 'fa-tmp' . DIRECTORY_SEPARATOR;
+
+            if ( $wp_filesystem->is_dir( $fonts_tmp_dir ) ) {
+                $wp_filesystem->delete( $fonts_tmp_dir, true );
+            }
+
+            // Unzip package to working directory.
+            $result = unzip_file( $package, $fonts_tmp_dir );
+
+            if ( is_wp_error( $result ) ) {
+                $wp_filesystem->delete( $fonts_tmp_dir, true );
+
+                if ( 'incompatible_archive' === $result->get_error_code() ) {
+                    return new WP_Error( 'fontawesome_incompatible_archive', __( $result->get_error_message(), 'ayecode-connect' ) );
+                }
+
+                return $result;
+            }
+
+            if ( $wp_filesystem->is_dir( $fonts_dir ) ) {
+                $wp_filesystem->delete( $fonts_dir, true );
+            }
+
+            $extract_dir = $fonts_tmp_dir;
+
+            if ( $dirname && $wp_filesystem->is_dir( $extract_dir . $dirname . DIRECTORY_SEPARATOR ) ) {
+                $extract_dir .= $dirname . DIRECTORY_SEPARATOR;
+            }
+
+            try {
+                $return = $wp_filesystem->move( $extract_dir, $fonts_dir, true );
+            } catch ( Exception $e ) {
+                $return = new WP_Error( 'fontawesome_move_package', __( 'Fail to move font awesome package!', 'ayecode-connect' ) );
+            }
+
+            if ( $wp_filesystem->is_dir( $fonts_tmp_dir ) ) {
+                $wp_filesystem->delete( $fonts_tmp_dir, true );
+            }
+
+            // Once extracted, delete the package if required.
+            if ( $delete_package ) {
+                unlink( $package );
+            }
+
+            return $return;
+        }
+
+        /**
+         * Output the version in the header.
+         */
+        public function add_generator() {
+            $file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
+            $plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
+
+            // Find source plugin/theme.
+            $source = array();
+            if ( strpos( $file, $plugins_dir ) !== false ) {
+                $source = explode( "/", plugin_basename( $file ) );
+            } else if ( function_exists( 'get_theme_root' ) ) {
+                $themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
+
+                if ( strpos( $file, $themes_dir ) !== false ) {
+                    $source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
+                }
+            }
+
+            echo '<meta name="generator" content="WP Font Awesome Settings v' . esc_attr( $this->version ) . '"' . ( ! empty( $source[0] ) ? ' data-ac-source="' . esc_attr( $source[0] ) . '"' : '' ) . ' />';
+        }
+    }
+
+    /**
+     * Run the class if found.
+     */
+    WP_Font_Awesome_Settings::instance();
 }

Spacing +242 added lines, -242 removed lines

@@ -12,14 +12,14 @@ 
 /**
  * Bail if we are not in WP.
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
 /**
  * Only add if the class does not already exist.
  */
-if ( ! class_exists( 'WP_Font_Awesome_Settings' ) ) {
+if (!class_exists('WP_Font_Awesome_Settings')) {
 
 	/**
 	 * A Class to be able to change settings for Font Awesome.
@@ -82,19 +82,19 @@ 
 		 * @return WP_Font_Awesome_Settings - Main instance.
 		 */
 		public static function instance() {
-			if ( ! isset( self::$instance ) && ! ( self::$instance instanceof WP_Font_Awesome_Settings ) ) {
+			if (!isset(self::$instance) && !(self::$instance instanceof WP_Font_Awesome_Settings)) {
 				self::$instance = new WP_Font_Awesome_Settings;
 
-				add_action( 'init', array( self::$instance, 'init' ) ); // set settings
+				add_action('init', array(self::$instance, 'init')); // set settings
 
-				if ( is_admin() ) {
-					add_action( 'admin_menu', array( self::$instance, 'menu_item' ) );
-					add_action( 'admin_init', array( self::$instance, 'register_settings' ) );
-					add_action( 'admin_init', array( self::$instance, 'constants' ) );
-					add_action( 'admin_notices', array( self::$instance, 'admin_notices' ) );
+				if (is_admin()) {
+					add_action('admin_menu', array(self::$instance, 'menu_item'));
+					add_action('admin_init', array(self::$instance, 'register_settings'));
+					add_action('admin_init', array(self::$instance, 'constants'));
+					add_action('admin_notices', array(self::$instance, 'admin_notices'));
 				}
 
-				do_action( 'wp_font_awesome_settings_loaded' );
+				do_action('wp_font_awesome_settings_loaded');
 			}
 
 			return self::$instance;
@@ -105,26 +105,26 @@ 
          *
 		 * @return void
 		 */
-		public function constants(){
+		public function constants() {
 
 			// register iconpicker constant
-			if ( ! defined( 'FAS_ICONPICKER_JS_URL' ) ) {
+			if (!defined('FAS_ICONPICKER_JS_URL')) {
 				$url = $this->get_path_url();
 				$version = $this->settings['version'];
 
-				if( !$version || version_compare($version,'5.999','>')){
+				if (!$version || version_compare($version, '5.999', '>')) {
 					$url .= 'assets/js/fa-iconpicker-v6.min.js';
-				}else{
+				} else {
 					$url .= 'assets/js/fa-iconpicker-v5.min.js';
 				}
 
-				define( 'FAS_ICONPICKER_JS_URL', $url );
+				define('FAS_ICONPICKER_JS_URL', $url);
 
 			}
 
             // Set a constant if pro enbaled
-			if ( ! defined( 'FAS_PRO' ) && $this->settings['pro'] ) {
-				define( 'FAS_PRO', true );
+			if (!defined('FAS_PRO') && $this->settings['pro']) {
+				define('FAS_PRO', true);
 			}
 		}
 
@@ -134,19 +134,19 @@ 
 		 * @return string
 		 */
 		public function get_path_url() {
-			$content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
-			$content_url = untrailingslashit( WP_CONTENT_URL );
+			$content_dir = wp_normalize_path(untrailingslashit(WP_CONTENT_DIR));
+			$content_url = untrailingslashit(WP_CONTENT_URL);
 
 			// Replace http:// to https://.
-			if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
-				$content_url = str_replace( 'http://', 'https://', $content_url );
+			if (strpos($content_url, 'http://') === 0 && strpos(plugins_url(), 'https://') === 0) {
+				$content_url = str_replace('http://', 'https://', $content_url);
 			}
 
 			// Check if we are inside a plugin
-			$file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
-			$url = str_replace( $content_dir, $content_url, $file_dir );
+			$file_dir = str_replace("/includes", "", wp_normalize_path(dirname(__FILE__)));
+			$url = str_replace($content_dir, $content_url, $file_dir);
 
-			return trailingslashit( $url );
+			return trailingslashit($url);
 		}
 
 		/**
@@ -156,45 +156,45 @@ 
 		 */
 		public function init() {
 			// Download fontawesome locally.
-			add_action( 'add_option_wp-font-awesome-settings', array( $this, 'add_option_wp_font_awesome_settings' ), 10, 2 );
-			add_action( 'update_option_wp-font-awesome-settings', array( $this, 'update_option_wp_font_awesome_settings' ), 10, 2 );
+			add_action('add_option_wp-font-awesome-settings', array($this, 'add_option_wp_font_awesome_settings'), 10, 2);
+			add_action('update_option_wp-font-awesome-settings', array($this, 'update_option_wp_font_awesome_settings'), 10, 2);
 
 			$this->settings = $this->get_settings();
 
 			// Check if the official plugin is active and use that instead if so.
-			if ( ! defined( 'FONTAWESOME_PLUGIN_FILE' ) ) {
-				if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
-					add_action( 'admin_head', array( $this, 'add_generator' ), 99 );
+			if (!defined('FONTAWESOME_PLUGIN_FILE')) {
+				if ($this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend') {
+					add_action('admin_head', array($this, 'add_generator'), 99);
 				}
 
-				if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
-					add_action( 'wp_head', array( $this, 'add_generator' ), 99 );
+				if ($this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend') {
+					add_action('wp_head', array($this, 'add_generator'), 99);
 				}
 
-				if ( $this->settings['type'] == 'CSS' ) {
-					if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
-						add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );
+				if ($this->settings['type'] == 'CSS') {
+					if ($this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend') {
+						add_action('wp_enqueue_scripts', array($this, 'enqueue_style'), 5000);
 						//add_action( 'wp_footer', array( $this, 'enqueue_style' ), 5000 ); // not sure why this was added, seems to break frontend
 					}
 
-					if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
-						add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );
-						add_filter( 'block_editor_settings_all', array( $this, 'enqueue_editor_styles' ), 10, 2 );
+					if ($this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend') {
+						add_action('admin_enqueue_scripts', array($this, 'enqueue_style'), 5000);
+						add_filter('block_editor_settings_all', array($this, 'enqueue_editor_styles'), 10, 2);
 					}
 				} else {
-					if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
-						add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );
+					if ($this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend') {
+						add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts'), 5000);
 					}
 
-					if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
-						add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );
-						add_filter( 'block_editor_settings_all', array( $this, 'enqueue_editor_scripts' ), 10, 2 );
+					if ($this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend') {
+						add_action('admin_enqueue_scripts', array($this, 'enqueue_scripts'), 5000);
+						add_filter('block_editor_settings_all', array($this, 'enqueue_editor_scripts'), 10, 2);
 					}
 				}
 
 				// remove font awesome if set to do so
-				if ( $this->settings['dequeue'] == '1' ) {
-					add_action( 'clean_url', array( $this, 'remove_font_awesome' ), 5000, 3 );
+				if ($this->settings['dequeue'] == '1') {
+					add_action('clean_url', array($this, 'remove_font_awesome'), 5000, 3);
 				}
 			}
 
@@ -208,9 +208,9 @@ 
 		 *
 		 * @return array
 		 */
-		public function enqueue_editor_styles( $editor_settings, $block_editor_context ){
+		public function enqueue_editor_styles($editor_settings, $block_editor_context) {
 
-			if ( ! empty( $editor_settings['__unstableResolvedAssets']['styles'] ) ) {
+			if (!empty($editor_settings['__unstableResolvedAssets']['styles'])) {
 				$url = $this->get_url();
 				$editor_settings['__unstableResolvedAssets']['styles'] .= "<link rel='stylesheet' id='font-awesome-css'  href='$url' media='all' />";
 			}
@@ -226,7 +226,7 @@ 
 		 *
 		 * @return array
 		 */
-		public function enqueue_editor_scripts( $editor_settings, $block_editor_context ){
+		public function enqueue_editor_scripts($editor_settings, $block_editor_context) {
 
 			$url = $this->get_url();
 			$editor_settings['__unstableResolvedAssets']['scripts'] .= "<script src='$url' id='font-awesome-js'></script>";
@@ -240,22 +240,22 @@ 
 		public function enqueue_style() {
 			// build url
 			$url = $this->get_url();
-			$version = ! empty( $this->settings['local'] ) && empty( $this->settings['pro'] ) ? strip_tags( $this->settings['local_version'] ) : null;
+			$version = !empty($this->settings['local']) && empty($this->settings['pro']) ? strip_tags($this->settings['local_version']) : null;
 
-			wp_deregister_style( 'font-awesome' ); // deregister in case its already there
-			wp_register_style( 'font-awesome', $url, array(), $version );
-			wp_enqueue_style( 'font-awesome' );
+			wp_deregister_style('font-awesome'); // deregister in case its already there
+			wp_register_style('font-awesome', $url, array(), $version);
+			wp_enqueue_style('font-awesome');
 
 			// RTL language support CSS.
-			if ( is_rtl() ) {
-				wp_add_inline_style( 'font-awesome', $this->rtl_inline_css() );
+			if (is_rtl()) {
+				wp_add_inline_style('font-awesome', $this->rtl_inline_css());
 			}
 
-			if ( $this->settings['shims'] ) {
-				$url = $this->get_url( true );
-				wp_deregister_style( 'font-awesome-shims' ); // deregister in case its already there
-				wp_register_style( 'font-awesome-shims', $url, array(), $version );
-				wp_enqueue_style( 'font-awesome-shims' );
+			if ($this->settings['shims']) {
+				$url = $this->get_url(true);
+				wp_deregister_style('font-awesome-shims'); // deregister in case its already there
+				wp_register_style('font-awesome-shims', $url, array(), $version);
+				wp_enqueue_style('font-awesome-shims');
 			}
 		}
 
@@ -267,15 +267,15 @@ 
 			$url = $this->get_url();
 
 			$deregister_function = 'wp' . '_' . 'deregister' . '_' . 'script';
-			call_user_func( $deregister_function, 'font-awesome' ); // deregister in case its already there
-			wp_register_script( 'font-awesome', $url, array(), null );
-			wp_enqueue_script( 'font-awesome' );
+			call_user_func($deregister_function, 'font-awesome'); // deregister in case its already there
+			wp_register_script('font-awesome', $url, array(), null);
+			wp_enqueue_script('font-awesome');
 
-			if ( $this->settings['shims'] ) {
-				$url = $this->get_url( true );
-				call_user_func( $deregister_function, 'font-awesome-shims' ); // deregister in case its already there
-				wp_register_script( 'font-awesome-shims', $url, array(), null );
-				wp_enqueue_script( 'font-awesome-shims' );
+			if ($this->settings['shims']) {
+				$url = $this->get_url(true);
+				call_user_func($deregister_function, 'font-awesome-shims'); // deregister in case its already there
+				wp_register_script('font-awesome-shims', $url, array(), null);
+				wp_enqueue_script('font-awesome-shims');
 			}
 		}
 
@@ -287,16 +287,16 @@ 
 		 *
 		 * @return string The url to the file.
 		 */
-		public function get_url( $shims = false, $local = true ) {
+		public function get_url($shims = false, $local = true) {
 			$script  = $shims ? 'v4-shims' : 'all';
 			$sub     = $this->settings['pro'] ? 'pro' : 'use';
 			$type    = $this->settings['type'];
 			$version = $this->settings['version'];
-			$kit_url = $this->settings['kit-url'] ? esc_url( $this->settings['kit-url'] ) : '';
+			$kit_url = $this->settings['kit-url'] ? esc_url($this->settings['kit-url']) : '';
 			$url     = '';
 
-			if ( $type == 'KIT' && $kit_url ) {
-				if ( $shims ) {
+			if ($type == 'KIT' && $kit_url) {
+				if ($shims) {
 					// if its a kit then we don't add shims here
 					return '';
 				}
@@ -305,13 +305,13 @@ 
 			} else {
 				$v = '';
 				// Check and load locally.
-				if ( $local && $this->has_local() ) {
+				if ($local && $this->has_local()) {
 					$script .= ".min";
-					$v .= '&ver=' . strip_tags( $this->settings['local_version'] );
+					$v .= '&ver=' . strip_tags($this->settings['local_version']);
 					$url .= $this->get_fonts_url(); // Local fonts url.
 				} else {
 					$url .= "https://$sub.fontawesome.com/releases/"; // CDN
-					$url .= ! empty( $version ) ? "v" . $version . '/' : "v" . $this->get_latest_version() . '/'; // version
+					$url .= !empty($version) ? "v" . $version . '/' : "v" . $this->get_latest_version() . '/'; // version
 				}
 				$url .= $type == 'CSS' ? 'css/' : 'js/'; // type
 				$url .= $type == 'CSS' ? $script . '.css' : $script . '.js'; // type
@@ -332,16 +332,16 @@ 
 		 *
 		 * @return string The filtered url.
 		 */
-		public function remove_font_awesome( $url, $original_url, $_context ) {
+		public function remove_font_awesome($url, $original_url, $_context) {
 
-			if ( $_context == 'display'
-			     && ( strstr( $url, "fontawesome" ) !== false || strstr( $url, "font-awesome" ) !== false )
-			     && ( strstr( $url, ".js" ) !== false || strstr( $url, ".css" ) !== false )
+			if ($_context == 'display'
+			     && (strstr($url, "fontawesome") !== false || strstr($url, "font-awesome") !== false)
+			     && (strstr($url, ".js") !== false || strstr($url, ".css") !== false)
 			) {// it's a font-awesome-url (probably)
 
-				if ( strstr( $url, "wpfas=true" ) !== false ) {
-					if ( $this->settings['type'] == 'JS' ) {
-						if ( $this->settings['js-pseudo'] ) {
+				if (strstr($url, "wpfas=true") !== false) {
+					if ($this->settings['type'] == 'JS') {
+						if ($this->settings['js-pseudo']) {
 							$url .= "' data-search-pseudo-elements defer='defer";
 						} else {
 							$url .= "' defer='defer";
@@ -360,7 +360,7 @@ 
 		 * Register the database settings with WordPress.
 		 */
 		public function register_settings() {
-			register_setting( 'wp-font-awesome-settings', 'wp-font-awesome-settings' );
+			register_setting('wp-font-awesome-settings', 'wp-font-awesome-settings');
 		}
 
 		/**
@@ -369,10 +369,10 @@ 
 		 */
 		public function menu_item() {
 			$menu_function = 'add' . '_' . 'options' . '_' . 'page'; // won't pass theme check if function name present in theme
-			call_user_func( $menu_function, $this->name, $this->name, 'manage_options', 'wp-font-awesome-settings', array(
+			call_user_func($menu_function, $this->name, $this->name, 'manage_options', 'wp-font-awesome-settings', array(
 				$this,
 				'settings_page'
-			) );
+			));
 		}
 
 		/**
@@ -381,7 +381,7 @@ 
 		 * @return array The array of settings.
 		 */
 		public function get_settings() {
-			$db_settings = get_option( 'wp-font-awesome-settings' );
+			$db_settings = get_option('wp-font-awesome-settings');
 
 			$defaults = array(
 				'type'      => 'CSS', // type to use, CSS or JS or KIT
@@ -396,30 +396,30 @@ 
 				'kit-url'   => '', // the kit url
 			);
 
-			$settings = wp_parse_args( $db_settings, $defaults );
+			$settings = wp_parse_args($db_settings, $defaults);
 
 			/**
 			 * Filter the Font Awesome settings.
 			 *
 			 * @todo if we add this filer people might use it and then it defeates the purpose of this class :/
 			 */
-			return $this->settings = apply_filters( 'wp-font-awesome-settings', $settings, $db_settings, $defaults );
+			return $this->settings = apply_filters('wp-font-awesome-settings', $settings, $db_settings, $defaults);
 		}
 
 		/**
 		 * The settings page html output.
 		 */
 		public function settings_page() {
-			if ( ! current_user_can( 'manage_options' ) ) {
-				wp_die( __( 'You do not have sufficient permissions to access this page.', 'ayecode-connect' ) );
+			if (!current_user_can('manage_options')) {
+				wp_die(__('You do not have sufficient permissions to access this page.', 'ayecode-connect'));
 			}
 
 			// a hidden way to force the update of the version number via api instead of waiting the 48 hours
-			if ( isset( $_REQUEST['force-version-check'] ) ) {
-				$this->get_latest_version( $force_api = true );
+			if (isset($_REQUEST['force-version-check'])) {
+				$this->get_latest_version($force_api = true);
 			}
 
-			if ( ! defined( 'FONTAWESOME_PLUGIN_FILE' ) ) {
+			if (!defined('FONTAWESOME_PLUGIN_FILE')) {
 				?>
                 <style>
                     .wpfas-kit-show {
@@ -446,42 +446,42 @@ 
                     <h1><?php echo $this->name; ?></h1>
                     <form method="post" action="options.php" class="fas-settings-form">
 						<?php
-						settings_fields( 'wp-font-awesome-settings' );
-						do_settings_sections( 'wp-font-awesome-settings' );
+						settings_fields('wp-font-awesome-settings');
+						do_settings_sections('wp-font-awesome-settings');
 						$table_class = '';
-						if ( $this->settings['type'] ) {
-							$table_class .= 'wpfas-' . sanitize_html_class( strtolower( $this->settings['type'] ) ) . '-set';
+						if ($this->settings['type']) {
+							$table_class .= 'wpfas-' . sanitize_html_class(strtolower($this->settings['type'])) . '-set';
 						}
-						if ( ! empty( $this->settings['pro'] ) ) {
+						if (!empty($this->settings['pro'])) {
 							$table_class .= ' wpfas-has-pro';
 						}
 						?>
-						<?php if ( $this->settings['type'] != 'KIT' && ! empty( $this->settings['local'] ) && empty( $this->settings['pro'] ) ) { ?>
-							<?php if ( $this->has_local() ) { ?>
-                                <div class="notice notice-info"><p><strong><?php _e( 'Font Awesome fonts are loading locally.', 'ayecode-connect' ); ?></strong></p></div>
+						<?php if ($this->settings['type'] != 'KIT' && !empty($this->settings['local']) && empty($this->settings['pro'])) { ?>
+							<?php if ($this->has_local()) { ?>
+                                <div class="notice notice-info"><p><strong><?php _e('Font Awesome fonts are loading locally.', 'ayecode-connect'); ?></strong></p></div>
 							<?php } else { ?>
-                                <div class="notice notice-error"><p><strong><?php _e( 'Font Awesome fonts are not loading locally!', 'ayecode-connect' ); ?></strong></p></div>
+                                <div class="notice notice-error"><p><strong><?php _e('Font Awesome fonts are not loading locally!', 'ayecode-connect'); ?></strong></p></div>
 							<?php } ?>
 						<?php } ?>
-                        <table class="form-table wpfas-table-settings <?php echo esc_attr( $table_class ); ?>">
+                        <table class="form-table wpfas-table-settings <?php echo esc_attr($table_class); ?>">
                             <tr valign="top">
-                                <th scope="row"><label for="wpfas-type"><?php _e( 'Type', 'ayecode-connect' ); ?></label></th>
+                                <th scope="row"><label for="wpfas-type"><?php _e('Type', 'ayecode-connect'); ?></label></th>
                                 <td>
                                     <select name="wp-font-awesome-settings[type]" id="wpfas-type" onchange="if(this.value=='KIT'){jQuery('.wpfas-table-settings').addClass('wpfas-kit-set');}else{jQuery('.wpfas-table-settings').removeClass('wpfas-kit-set');}">
-                                        <option value="CSS" <?php selected( $this->settings['type'], 'CSS' ); ?>><?php _e( 'CSS (default)', 'ayecode-connect' ); ?></option>
-                                        <option value="JS" <?php selected( $this->settings['type'], 'JS' ); ?>>JS</option>
-                                        <option value="KIT" <?php selected( $this->settings['type'], 'KIT' ); ?>><?php _e( 'Kits (settings managed on fontawesome.com)', 'ayecode-connect' ); ?></option>
+                                        <option value="CSS" <?php selected($this->settings['type'], 'CSS'); ?>><?php _e('CSS (default)', 'ayecode-connect'); ?></option>
+                                        <option value="JS" <?php selected($this->settings['type'], 'JS'); ?>>JS</option>
+                                        <option value="KIT" <?php selected($this->settings['type'], 'KIT'); ?>><?php _e('Kits (settings managed on fontawesome.com)', 'ayecode-connect'); ?></option>
                                     </select>
                                 </td>
                             </tr>
 
                             <tr valign="top" class="wpfas-kit-show">
-                                <th scope="row"><label for="wpfas-kit-url"><?php _e( 'Kit URL', 'ayecode-connect' ); ?></label></th>
+                                <th scope="row"><label for="wpfas-kit-url"><?php _e('Kit URL', 'ayecode-connect'); ?></label></th>
                                 <td>
-                                    <input class="regular-text" id="wpfas-kit-url" type="url" name="wp-font-awesome-settings[kit-url]" value="<?php echo esc_attr( $this->settings['kit-url'] ); ?>" placeholder="<?php echo 'https://kit.font';echo 'awesome.com/123abc.js'; // this won't pass theme check :(?>"/>
+                                    <input class="regular-text" id="wpfas-kit-url" type="url" name="wp-font-awesome-settings[kit-url]" value="<?php echo esc_attr($this->settings['kit-url']); ?>" placeholder="<?php echo 'https://kit.font'; echo 'awesome.com/123abc.js'; // this won't pass theme check :(?>"/>
                                     <span><?php
 										echo wp_sprintf(
-											__( 'Requires a free account with Font Awesome. %sGet kit url%s', 'ayecode-connect' ),
+											__('Requires a free account with Font Awesome. %sGet kit url%s', 'ayecode-connect'),
 											'<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/kits"><i class="fas fa-external-link-alt"></i>',
 											'</a>'
 										);
@@ -490,44 +490,44 @@ 
                             </tr>
 
                             <tr valign="top" class="wpfas-kit-hide">
-                                <th scope="row"><label for="wpfas-version"><?php _e( 'Version', 'ayecode-connect' ); ?></label></th>
+                                <th scope="row"><label for="wpfas-version"><?php _e('Version', 'ayecode-connect'); ?></label></th>
                                 <td>
                                     <select name="wp-font-awesome-settings[version]" id="wpfas-version">
-                                        <option value="" <?php selected( $this->settings['version'], '' ); ?>><?php echo wp_sprintf( __( 'Latest - %s (default)', 'ayecode-connect' ), $this->get_latest_version() ); ?></option>
-                                        <option value="6.1.0" <?php selected( $this->settings['version'], '6.1.0' ); ?>>6.1.0</option>
-                                        <option value="6.0.0" <?php selected( $this->settings['version'], '6.0.0' ); ?>>6.0.0</option>
-                                        <option value="5.15.4" <?php selected( $this->settings['version'], '5.15.4' ); ?>>5.15.4</option>
-                                        <option value="5.6.0" <?php selected( $this->settings['version'], '5.6.0' ); ?>>5.6.0</option>
-                                        <option value="5.5.0" <?php selected( $this->settings['version'], '5.5.0' ); ?>>5.5.0</option>
-                                        <option value="5.4.0" <?php selected( $this->settings['version'], '5.4.0' ); ?>>5.4.0</option>
-                                        <option value="5.3.0" <?php selected( $this->settings['version'], '5.3.0' ); ?>>5.3.0</option>
-                                        <option value="5.2.0" <?php selected( $this->settings['version'], '5.2.0' ); ?>>5.2.0</option>
-                                        <option value="5.1.0" <?php selected( $this->settings['version'], '5.1.0' ); ?>>5.1.0</option>
-                                        <option value="4.7.0" <?php selected( $this->settings['version'], '4.7.0' ); ?>>4.7.1 (CSS only)</option>
+                                        <option value="" <?php selected($this->settings['version'], ''); ?>><?php echo wp_sprintf(__('Latest - %s (default)', 'ayecode-connect'), $this->get_latest_version()); ?></option>
+                                        <option value="6.1.0" <?php selected($this->settings['version'], '6.1.0'); ?>>6.1.0</option>
+                                        <option value="6.0.0" <?php selected($this->settings['version'], '6.0.0'); ?>>6.0.0</option>
+                                        <option value="5.15.4" <?php selected($this->settings['version'], '5.15.4'); ?>>5.15.4</option>
+                                        <option value="5.6.0" <?php selected($this->settings['version'], '5.6.0'); ?>>5.6.0</option>
+                                        <option value="5.5.0" <?php selected($this->settings['version'], '5.5.0'); ?>>5.5.0</option>
+                                        <option value="5.4.0" <?php selected($this->settings['version'], '5.4.0'); ?>>5.4.0</option>
+                                        <option value="5.3.0" <?php selected($this->settings['version'], '5.3.0'); ?>>5.3.0</option>
+                                        <option value="5.2.0" <?php selected($this->settings['version'], '5.2.0'); ?>>5.2.0</option>
+                                        <option value="5.1.0" <?php selected($this->settings['version'], '5.1.0'); ?>>5.1.0</option>
+                                        <option value="4.7.0" <?php selected($this->settings['version'], '4.7.0'); ?>>4.7.1 (CSS only)</option>
                                     </select>
                                 </td>
                             </tr>
 
                             <tr valign="top">
-                                <th scope="row"><label for="wpfas-enqueue"><?php _e( 'Enqueue', 'ayecode-connect' ); ?></label></th>
+                                <th scope="row"><label for="wpfas-enqueue"><?php _e('Enqueue', 'ayecode-connect'); ?></label></th>
                                 <td>
                                     <select name="wp-font-awesome-settings[enqueue]" id="wpfas-enqueue">
-                                        <option value="" <?php selected( $this->settings['enqueue'], '' ); ?>><?php _e( 'Frontend + Backend (default)', 'ayecode-connect' ); ?></option>
-                                        <option value="frontend" <?php selected( $this->settings['enqueue'], 'frontend' ); ?>><?php _e( 'Frontend', 'ayecode-connect' ); ?></option>
-                                        <option value="backend" <?php selected( $this->settings['enqueue'], 'backend' ); ?>><?php _e( 'Backend', 'ayecode-connect' ); ?></option>
+                                        <option value="" <?php selected($this->settings['enqueue'], ''); ?>><?php _e('Frontend + Backend (default)', 'ayecode-connect'); ?></option>
+                                        <option value="frontend" <?php selected($this->settings['enqueue'], 'frontend'); ?>><?php _e('Frontend', 'ayecode-connect'); ?></option>
+                                        <option value="backend" <?php selected($this->settings['enqueue'], 'backend'); ?>><?php _e('Backend', 'ayecode-connect'); ?></option>
                                     </select>
                                 </td>
                             </tr>
 
                             <tr valign="top" class="wpfas-kit-hide">
                                 <th scope="row"><label
-                                            for="wpfas-pro"><?php _e( 'Enable pro', 'ayecode-connect' ); ?></label></th>
+                                            for="wpfas-pro"><?php _e('Enable pro', 'ayecode-connect'); ?></label></th>
                                 <td>
                                     <input type="hidden" name="wp-font-awesome-settings[pro]" value="0"/>
-                                    <input type="checkbox" name="wp-font-awesome-settings[pro]" value="1" <?php checked( $this->settings['pro'], '1' ); ?> id="wpfas-pro" onchange="if(jQuery(this).is(':checked')){jQuery('.wpfas-table-settings').addClass('wpfas-has-pro')}else{jQuery('.wpfas-table-settings').removeClass('wpfas-has-pro')}"/>
+                                    <input type="checkbox" name="wp-font-awesome-settings[pro]" value="1" <?php checked($this->settings['pro'], '1'); ?> id="wpfas-pro" onchange="if(jQuery(this).is(':checked')){jQuery('.wpfas-table-settings').addClass('wpfas-has-pro')}else{jQuery('.wpfas-table-settings').removeClass('wpfas-has-pro')}"/>
                                     <span><?php
 										echo wp_sprintf(
-											__( 'Requires a subscription. %sLearn more%s  %sManage my allowed domains%s', 'ayecode-connect' ),
+											__('Requires a subscription. %sLearn more%s  %sManage my allowed domains%s', 'ayecode-connect'),
 											'<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/referral?a=c9b89e1418">',
 											' <i class="fas fa-external-link-alt"></i></a>',
 											'<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/account/cdn">',
@@ -538,49 +538,49 @@ 
                             </tr>
 
                             <tr valign="top" class="wpfas-kit-hide wpfas-hide-pro">
-                                <th scope="row"><label for="wpfas-local"><?php _e( 'Load Fonts Locally', 'ayecode-connect' ); ?></label></th>
+                                <th scope="row"><label for="wpfas-local"><?php _e('Load Fonts Locally', 'ayecode-connect'); ?></label></th>
                                 <td>
                                     <input type="hidden" name="wp-font-awesome-settings[local]" value="0"/>
-                                    <input type="hidden" name="wp-font-awesome-settings[local_version]" value="<?php echo esc_attr( $this->settings['local_version'] ); ?>"/>
-                                    <input type="checkbox" name="wp-font-awesome-settings[local]" value="1" <?php checked( $this->settings['local'], '1' ); ?> id="wpfas-local"/>
-                                    <span><?php _e( '(For free version only) Load FontAwesome fonts from locally. This downloads FontAwesome fonts from fontawesome.com & stores at the local site.', 'ayecode-connect' ); ?></span>
+                                    <input type="hidden" name="wp-font-awesome-settings[local_version]" value="<?php echo esc_attr($this->settings['local_version']); ?>"/>
+                                    <input type="checkbox" name="wp-font-awesome-settings[local]" value="1" <?php checked($this->settings['local'], '1'); ?> id="wpfas-local"/>
+                                    <span><?php _e('(For free version only) Load FontAwesome fonts from locally. This downloads FontAwesome fonts from fontawesome.com & stores at the local site.', 'ayecode-connect'); ?></span>
                                 </td>
                             </tr>
 
                             <tr valign="top" class="wpfas-kit-hide">
                                 <th scope="row"><label
-                                            for="wpfas-shims"><?php _e( 'Enable v4 shims compatibility', 'ayecode-connect' ); ?></label>
+                                            for="wpfas-shims"><?php _e('Enable v4 shims compatibility', 'ayecode-connect'); ?></label>
                                 </th>
                                 <td>
                                     <input type="hidden" name="wp-font-awesome-settings[shims]" value="0"/>
                                     <input type="checkbox" name="wp-font-awesome-settings[shims]"
-                                           value="1" <?php checked( $this->settings['shims'], '1' ); ?> id="wpfas-shims"/>
-                                    <span><?php _e( 'This enables v4 classes to work with v5, sort of like a band-aid until everyone has updated everything to v5.', 'ayecode-connect' ); ?></span>
+                                           value="1" <?php checked($this->settings['shims'], '1'); ?> id="wpfas-shims"/>
+                                    <span><?php _e('This enables v4 classes to work with v5, sort of like a band-aid until everyone has updated everything to v5.', 'ayecode-connect'); ?></span>
                                 </td>
                             </tr>
 
                             <tr valign="top" class="wpfas-kit-hide">
                                 <th scope="row"><label
-                                            for="wpfas-js-pseudo"><?php _e( 'Enable JS pseudo elements (not recommended)', 'ayecode-connect' ); ?></label>
+                                            for="wpfas-js-pseudo"><?php _e('Enable JS pseudo elements (not recommended)', 'ayecode-connect'); ?></label>
                                 </th>
                                 <td>
                                     <input type="hidden" name="wp-font-awesome-settings[js-pseudo]" value="0"/>
                                     <input type="checkbox" name="wp-font-awesome-settings[js-pseudo]"
-                                           value="1" <?php checked( $this->settings['js-pseudo'], '1' ); ?>
+                                           value="1" <?php checked($this->settings['js-pseudo'], '1'); ?>
                                            id="wpfas-js-pseudo"/>
-                                    <span><?php _e( 'Used only with the JS version, this will make pseudo-elements work but can be CPU intensive on some sites.', 'ayecode-connect' ); ?></span>
+                                    <span><?php _e('Used only with the JS version, this will make pseudo-elements work but can be CPU intensive on some sites.', 'ayecode-connect'); ?></span>
                                 </td>
                             </tr>
 
                             <tr valign="top">
                                 <th scope="row"><label
-                                            for="wpfas-dequeue"><?php _e( 'Dequeue', 'ayecode-connect' ); ?></label></th>
+                                            for="wpfas-dequeue"><?php _e('Dequeue', 'ayecode-connect'); ?></label></th>
                                 <td>
                                     <input type="hidden" name="wp-font-awesome-settings[dequeue]" value="0"/>
                                     <input type="checkbox" name="wp-font-awesome-settings[dequeue]"
-                                           value="1" <?php checked( $this->settings['dequeue'], '1' ); ?>
+                                           value="1" <?php checked($this->settings['dequeue'], '1'); ?>
                                            id="wpfas-dequeue"/>
-                                    <span><?php _e( 'This will try to dequeue any other Font Awesome versions loaded by other sources if they are added with `font-awesome` or `fontawesome` in the name.', 'ayecode-connect' ); ?></span>
+                                    <span><?php _e('This will try to dequeue any other Font Awesome versions loaded by other sources if they are added with `font-awesome` or `fontawesome` in the name.', 'ayecode-connect'); ?></span>
                                 </td>
                             </tr>
 
@@ -589,12 +589,12 @@ 
 							<?php
 							submit_button();
 							?>
-                            <p class="submit"><a href="https://fontawesome.com/referral?a=c9b89e1418" class="button button-secondary"><?php _e('Get 24,000+ more icons with Font Awesome Pro','ayecode-connect'); ?> <i class="fas fa-external-link-alt"></i></a></p>
+                            <p class="submit"><a href="https://fontawesome.com/referral?a=c9b89e1418" class="button button-secondary"><?php _e('Get 24,000+ more icons with Font Awesome Pro', 'ayecode-connect'); ?> <i class="fas fa-external-link-alt"></i></a></p>
 
                         </div>
                     </form>
 
-                    <div id="wpfas-version"><?php echo wp_sprintf(__( 'Version: %s (affiliate links provided)', 'ayecode-connect' ), $this->version ); ?></div>
+                    <div id="wpfas-version"><?php echo wp_sprintf(__('Version: %s (affiliate links provided)', 'ayecode-connect'), $this->version); ?></div>
                 </div>
 				<?php
 			}
@@ -609,12 +609,12 @@ 
 		 *
 		 * @return string Either a valid version number or an empty string.
 		 */
-		public function validate_version_number( $version ) {
+		public function validate_version_number($version) {
 
-			if ( version_compare( $version, '0.0.1', '>=' ) >= 0 ) {
+			if (version_compare($version, '0.0.1', '>=') >= 0) {
 				// valid
 			} else {
-				$version = '';// not validated
+				$version = ''; // not validated
 			}
 
 			return $version;
@@ -629,27 +629,27 @@ 
 		 * @since 1.0.7
 		 * @return mixed|string The latest version number found.
 		 */
-		public function get_latest_version( $force_api = false ) {
+		public function get_latest_version($force_api = false) {
 			$latest_version = $this->latest;
 
-			$cache = get_transient( 'wp-font-awesome-settings-version' );
+			$cache = get_transient('wp-font-awesome-settings-version');
 
-			if ( $cache === false || $force_api ) { // its not set
+			if ($cache === false || $force_api) { // its not set
 				$api_ver = $this->get_latest_version_from_api();
-				if ( version_compare( $api_ver, $this->latest, '>=' ) >= 0 ) {
+				if (version_compare($api_ver, $this->latest, '>=') >= 0) {
 					$latest_version = $api_ver;
-					set_transient( 'wp-font-awesome-settings-version', $api_ver, 48 * HOUR_IN_SECONDS );
+					set_transient('wp-font-awesome-settings-version', $api_ver, 48 * HOUR_IN_SECONDS);
 				}
-			} elseif ( $this->validate_version_number( $cache ) ) {
-				if ( version_compare( $cache, $this->latest, '>=' ) >= 0 ) {
+			} elseif ($this->validate_version_number($cache)) {
+				if (version_compare($cache, $this->latest, '>=') >= 0) {
 					$latest_version = $cache;
 				}
 			}
 
 			// Check and auto download fonts locally.
-			if ( empty( $this->settings['pro'] ) && empty( $this->settings['version'] ) && $this->settings['type'] != 'KIT' && ! empty( $this->settings['local'] ) && ! empty( $this->settings['local_version'] ) && ! empty( $latest_version ) ) {
-				if ( version_compare( $latest_version, $this->settings['local_version'], '>' ) && is_admin() && ! wp_doing_ajax() ) {
-					$this->download_package( $latest_version );
+			if (empty($this->settings['pro']) && empty($this->settings['version']) && $this->settings['type'] != 'KIT' && !empty($this->settings['local']) && !empty($this->settings['local_version']) && !empty($latest_version)) {
+				if (version_compare($latest_version, $this->settings['local_version'], '>') && is_admin() && !wp_doing_ajax()) {
+					$this->download_package($latest_version);
 				}
 			}
 
@@ -664,10 +664,10 @@ 
 		 */
 		public function get_latest_version_from_api() {
 			$version  = "0";
-			$response = wp_remote_get( "https://api.github.com/repos/FortAwesome/Font-Awesome/releases/latest" );
-			if ( ! is_wp_error( $response ) && is_array( $response ) ) {
-				$api_response = json_decode( wp_remote_retrieve_body( $response ), true );
-				if ( isset( $api_response['tag_name'] ) && version_compare( $api_response['tag_name'], $this->latest, '>=' ) >= 0 && empty( $api_response['prerelease'] ) ) {
+			$response = wp_remote_get("https://api.github.com/repos/FortAwesome/Font-Awesome/releases/latest");
+			if (!is_wp_error($response) && is_array($response)) {
+				$api_response = json_decode(wp_remote_retrieve_body($response), true);
+				if (isset($api_response['tag_name']) && version_compare($api_response['tag_name'], $this->latest, '>=') >= 0 && empty($api_response['prerelease'])) {
 					$version = $api_response['tag_name'];
 				}
 			}
@@ -695,21 +695,21 @@ 
 		public function admin_notices() {
 			$settings = $this->settings;
 
-			if ( defined( 'FONTAWESOME_PLUGIN_FILE' ) ) {
-				if ( ! empty( $_REQUEST['page'] ) && $_REQUEST['page'] == 'wp-font-awesome-settings' ) {
+			if (defined('FONTAWESOME_PLUGIN_FILE')) {
+				if (!empty($_REQUEST['page']) && $_REQUEST['page'] == 'wp-font-awesome-settings') {
 					?>
                     <div class="notice  notice-error is-dismissible">
-                        <p><?php _e( 'The Official Font Awesome Plugin is active, please adjust your settings there.', 'ayecode-connect' ); ?></p>
+                        <p><?php _e('The Official Font Awesome Plugin is active, please adjust your settings there.', 'ayecode-connect'); ?></p>
                     </div>
 					<?php
 				}
 			} else {
-				if ( ! empty( $settings ) ) {
-					if ( $settings['type'] != 'KIT' && $settings['pro'] && ( $settings['version'] == '' || version_compare( $settings['version'], '6', '>=' ) ) ) {
+				if (!empty($settings)) {
+					if ($settings['type'] != 'KIT' && $settings['pro'] && ($settings['version'] == '' || version_compare($settings['version'], '6', '>='))) {
 						$link = admin_url('options-general.php?page=wp-font-awesome-settings');
 						?>
                         <div class="notice  notice-error is-dismissible">
-                            <p><?php echo wp_sprintf( __( 'Font Awesome Pro v6 requires the use of a kit, please setup your kit in %ssettings.%s', 'ayecode-connect' ),"<a href='". esc_url_raw( $link )."'>","</a>" ); ?></p>
+                            <p><?php echo wp_sprintf(__('Font Awesome Pro v6 requires the use of a kit, please setup your kit in %ssettings.%s', 'ayecode-connect'), "<a href='" . esc_url_raw($link) . "'>", "</a>"); ?></p>
                         </div>
 						<?php
 					}
@@ -725,20 +725,20 @@ 
 		 * @param string $option The option name.
 		 * @param mixed  $value  The option value.
 		 */
-		public function add_option_wp_font_awesome_settings( $option, $value ) {
+		public function add_option_wp_font_awesome_settings($option, $value) {
 			// Do nothing if WordPress is being installed.
-			if ( wp_installing() ) {
+			if (wp_installing()) {
 				return;
 			}
 
-			if ( ! empty( $value['local'] ) && empty( $value['pro'] ) && ! ( ! empty( $value['type'] ) && $value['type'] == 'KIT' ) ) {
-				$version = isset( $value['version'] ) && $value['version'] ? $value['version'] : $this->get_latest_version();
+			if (!empty($value['local']) && empty($value['pro']) && !(!empty($value['type']) && $value['type'] == 'KIT')) {
+				$version = isset($value['version']) && $value['version'] ? $value['version'] : $this->get_latest_version();
 
-				if ( ! empty( $version ) ) {
-					$response = $this->download_package( $version, $value );
+				if (!empty($version)) {
+					$response = $this->download_package($version, $value);
 
-					if ( is_wp_error( $response ) ) {
-						add_settings_error( 'general', 'fontawesome_download', __( 'ERROR:', 'ayecode-connect' ) . ' ' . $response->get_error_message(), 'error' );
+					if (is_wp_error($response)) {
+						add_settings_error('general', 'fontawesome_download', __('ERROR:', 'ayecode-connect') . ' ' . $response->get_error_message(), 'error');
 					}
 				}
 			}
@@ -752,25 +752,25 @@ 
 		 * @param mixed $old_value The old option value.
 		 * @param mixed $value     The new option value.
 		 */
-		public function update_option_wp_font_awesome_settings( $old_value, $new_value ) {
+		public function update_option_wp_font_awesome_settings($old_value, $new_value) {
 			// Do nothing if WordPress is being installed.
-			if ( wp_installing() ) {
+			if (wp_installing()) {
 				return;
 			}
 
-			if ( ! empty( $new_value['local'] ) && empty( $new_value['pro'] ) && ! ( ! empty( $new_value['type'] ) && $new_value['type'] == 'KIT' ) ) {
+			if (!empty($new_value['local']) && empty($new_value['pro']) && !(!empty($new_value['type']) && $new_value['type'] == 'KIT')) {
 				// Old values
-				$old_version = isset( $old_value['version'] ) && $old_value['version'] ? $old_value['version'] : ( isset( $old_value['local_version'] ) ? $old_value['local_version'] : '' );
-				$old_local = isset( $old_value['local'] ) ? (int) $old_value['local'] : 0;
+				$old_version = isset($old_value['version']) && $old_value['version'] ? $old_value['version'] : (isset($old_value['local_version']) ? $old_value['local_version'] : '');
+				$old_local = isset($old_value['local']) ? (int) $old_value['local'] : 0;
 
 				// New values
-				$new_version = isset( $new_value['version'] ) && $new_value['version'] ? $new_value['version'] : $this->get_latest_version();
+				$new_version = isset($new_value['version']) && $new_value['version'] ? $new_value['version'] : $this->get_latest_version();
 
-				if ( empty( $old_local ) || $old_version !== $new_version || ! file_exists( $this->get_fonts_dir() . 'css' . DIRECTORY_SEPARATOR . 'all.css' ) ) {
-					$response = $this->download_package( $new_version, $new_value );
+				if (empty($old_local) || $old_version !== $new_version || !file_exists($this->get_fonts_dir() . 'css' . DIRECTORY_SEPARATOR . 'all.css')) {
+					$response = $this->download_package($new_version, $new_value);
 
-					if ( is_wp_error( $response ) ) {
-						add_settings_error( 'general', 'fontawesome_download', __( 'ERROR:', 'ayecode-connect' ) . ' ' . $response->get_error_message(), 'error' );
+					if (is_wp_error($response)) {
+						add_settings_error('general', 'fontawesome_download', __('ERROR:', 'ayecode-connect') . ' ' . $response->get_error_message(), 'error');
 					}
 				}
 			}
@@ -784,9 +784,9 @@ 
 		 * @param string Fonts directory local path.
 		 */
 		public function get_fonts_dir() {
-			$upload_dir = wp_upload_dir( null, false );
+			$upload_dir = wp_upload_dir(null, false);
 
-			return $upload_dir['basedir'] . DIRECTORY_SEPARATOR .  'ayefonts' . DIRECTORY_SEPARATOR . 'fa' . DIRECTORY_SEPARATOR;
+			return $upload_dir['basedir'] . DIRECTORY_SEPARATOR . 'ayefonts' . DIRECTORY_SEPARATOR . 'fa' . DIRECTORY_SEPARATOR;
 		}
 
 		/**
@@ -797,9 +797,9 @@ 
 		 * @param string Fonts directory local url.
 		 */
 		public function get_fonts_url() {
-			$upload_dir = wp_upload_dir( null, false );
+			$upload_dir = wp_upload_dir(null, false);
 
-			return $upload_dir['baseurl'] .  '/ayefonts/fa/';
+			return $upload_dir['baseurl'] . '/ayefonts/fa/';
 		}
 
 		/**
@@ -810,7 +810,7 @@ 
 		 * @return bool True if active else false.
 		 */
 		public function has_local() {
-			if ( ! empty( $this->settings['local'] ) && empty( $this->settings['pro'] ) && file_exists( $this->get_fonts_dir() . 'css' . DIRECTORY_SEPARATOR . 'all.css' ) ) {
+			if (!empty($this->settings['local']) && empty($this->settings['pro']) && file_exists($this->get_fonts_dir() . 'css' . DIRECTORY_SEPARATOR . 'all.css')) {
 				return true;
 			}
 
@@ -825,18 +825,18 @@ 
 		 * @return object The WP Filesystem.
 		 */
 		public function get_wp_filesystem() {
-			if ( ! function_exists( 'get_filesystem_method' ) ) {
-				require_once( ABSPATH . "/wp-admin/includes/file.php" );
+			if (!function_exists('get_filesystem_method')) {
+				require_once(ABSPATH . "/wp-admin/includes/file.php");
 			}
 
 			$access_type = get_filesystem_method();
 
-			if ( $access_type === 'direct' ) {
+			if ($access_type === 'direct') {
 				/* You can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */
-				$creds = request_filesystem_credentials( trailingslashit( site_url() ) . 'wp-admin/', '', false, false, array() );
+				$creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());
 
 				/* Initialize the API */
-				if ( ! WP_Filesystem( $creds ) ) {
+				if (!WP_Filesystem($creds)) {
 					/* Any problems and we exit */
 					return false;
 				}
@@ -845,11 +845,11 @@ 
 
 				return $wp_filesystem;
 				/* Do our file manipulations below */
-			} else if ( defined( 'FTP_USER' ) ) {
-				$creds = request_filesystem_credentials( trailingslashit( site_url() ) . 'wp-admin/', '', false, false, array() );
+			} else if (defined('FTP_USER')) {
+				$creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());
 
 				/* Initialize the API */
-				if ( ! WP_Filesystem( $creds ) ) {
+				if (!WP_Filesystem($creds)) {
 					/* Any problems and we exit */
 					return false;
 				}
@@ -872,38 +872,38 @@ 
 		 * @param array $option Fontawesome settings.
 		 * @return WP_ERROR|bool Error on fail and true on success.
 		 */
-		public function download_package( $version, $option = array() ) {
+		public function download_package($version, $option = array()) {
 			$filename = 'fontawesome-free-' . $version . '-web';
 			$url = 'https://use.fontawesome.com/releases/v' . $version . '/' . $filename . '.zip';
 
-			if ( ! function_exists( 'wp_handle_upload' ) ) {
+			if (!function_exists('wp_handle_upload')) {
 				require_once ABSPATH . 'wp-admin/includes/file.php';
 			}
 
-			$download_file = download_url( esc_url_raw( $url ) );
+			$download_file = download_url(esc_url_raw($url));
 
-			if ( is_wp_error( $download_file ) ) {
-				return new WP_Error( 'fontawesome_download_failed', __( $download_file->get_error_message(), 'ayecode-connect' ) );
-			} else if ( empty( $download_file ) ) {
-				return new WP_Error( 'fontawesome_download_failed', __( 'Something went wrong in downloading the font awesome to store locally.', 'ayecode-connect' ) );
+			if (is_wp_error($download_file)) {
+				return new WP_Error('fontawesome_download_failed', __($download_file->get_error_message(), 'ayecode-connect'));
+			} else if (empty($download_file)) {
+				return new WP_Error('fontawesome_download_failed', __('Something went wrong in downloading the font awesome to store locally.', 'ayecode-connect'));
 			}
 
-			$response = $this->extract_package( $download_file, $filename, true );
+			$response = $this->extract_package($download_file, $filename, true);
 
 			// Update local version.
-			if ( is_wp_error( $response ) ) {
+			if (is_wp_error($response)) {
 				return $response;
-			} else if ( $response ) {
-				if ( empty( $option ) ) {
-					$option = get_option( 'wp-font-awesome-settings' );
+			} else if ($response) {
+				if (empty($option)) {
+					$option = get_option('wp-font-awesome-settings');
 				}
 
 				$option['local_version'] = $version;
 
 				// Remove action to prevent looping.
-				remove_action( 'update_option_wp-font-awesome-settings', array( $this, 'update_option_wp_font_awesome_settings' ), 10, 2 );
+				remove_action('update_option_wp-font-awesome-settings', array($this, 'update_option_wp_font_awesome_settings'), 10, 2);
 
-				update_option( 'wp-font-awesome-settings', $option );
+				update_option('wp-font-awesome-settings', $option);
 
 				return true;
 			}
@@ -921,60 +921,60 @@ 
 		 * @param bool   $delete_package Delete temp file or not.
 		 * @return WP_Error|bool True on success WP_Error on fail.
 		 */
-		public function extract_package( $package, $dirname = '', $delete_package = false ) {
+		public function extract_package($package, $dirname = '', $delete_package = false) {
 			global $wp_filesystem;
 
 			$wp_filesystem = $this->get_wp_filesystem();
 
-			if ( empty( $wp_filesystem ) && isset( $wp_filesystem->errors ) && is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->get_error_code() ) {
-				return new WP_Error( 'fontawesome_filesystem_error', __( $wp_filesystem->errors->get_error_message(), 'ayecode-connect' ) );
-			} else if ( empty( $wp_filesystem ) ) {
-				return new WP_Error( 'fontawesome_filesystem_error', __( 'Failed to initialise WP_Filesystem while trying to download the Font Awesome package.', 'ayecode-connect' ) );
+			if (empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {
+				return new WP_Error('fontawesome_filesystem_error', __($wp_filesystem->errors->get_error_message(), 'ayecode-connect'));
+			} else if (empty($wp_filesystem)) {
+				return new WP_Error('fontawesome_filesystem_error', __('Failed to initialise WP_Filesystem while trying to download the Font Awesome package.', 'ayecode-connect'));
 			}
 
 			$fonts_dir = $this->get_fonts_dir();
-			$fonts_tmp_dir = dirname( $fonts_dir ) . DIRECTORY_SEPARATOR . 'fa-tmp' . DIRECTORY_SEPARATOR;
+			$fonts_tmp_dir = dirname($fonts_dir) . DIRECTORY_SEPARATOR . 'fa-tmp' . DIRECTORY_SEPARATOR;
 
-			if ( $wp_filesystem->is_dir( $fonts_tmp_dir ) ) {
-				$wp_filesystem->delete( $fonts_tmp_dir, true );
+			if ($wp_filesystem->is_dir($fonts_tmp_dir)) {
+				$wp_filesystem->delete($fonts_tmp_dir, true);
 			}
 
 			// Unzip package to working directory.
-			$result = unzip_file( $package, $fonts_tmp_dir );
+			$result = unzip_file($package, $fonts_tmp_dir);
 
-			if ( is_wp_error( $result ) ) {
-				$wp_filesystem->delete( $fonts_tmp_dir, true );
+			if (is_wp_error($result)) {
+				$wp_filesystem->delete($fonts_tmp_dir, true);
 
-				if ( 'incompatible_archive' === $result->get_error_code() ) {
-					return new WP_Error( 'fontawesome_incompatible_archive', __( $result->get_error_message(), 'ayecode-connect' ) );
+				if ('incompatible_archive' === $result->get_error_code()) {
+					return new WP_Error('fontawesome_incompatible_archive', __($result->get_error_message(), 'ayecode-connect'));
 				}
 
 				return $result;
 			}
 
-			if ( $wp_filesystem->is_dir( $fonts_dir ) ) {
-				$wp_filesystem->delete( $fonts_dir, true );
+			if ($wp_filesystem->is_dir($fonts_dir)) {
+				$wp_filesystem->delete($fonts_dir, true);
 			}
 
 			$extract_dir = $fonts_tmp_dir;
 
-			if ( $dirname && $wp_filesystem->is_dir( $extract_dir . $dirname . DIRECTORY_SEPARATOR ) ) {
+			if ($dirname && $wp_filesystem->is_dir($extract_dir . $dirname . DIRECTORY_SEPARATOR)) {
 				$extract_dir .= $dirname . DIRECTORY_SEPARATOR;
 			}
 
 			try {
-				$return = $wp_filesystem->move( $extract_dir, $fonts_dir, true );
-			} catch ( Exception $e ) {
-				$return = new WP_Error( 'fontawesome_move_package', __( 'Fail to move font awesome package!', 'ayecode-connect' ) );
+				$return = $wp_filesystem->move($extract_dir, $fonts_dir, true);
+			} catch (Exception $e) {
+				$return = new WP_Error('fontawesome_move_package', __('Fail to move font awesome package!', 'ayecode-connect'));
 			}
 
-			if ( $wp_filesystem->is_dir( $fonts_tmp_dir ) ) {
-				$wp_filesystem->delete( $fonts_tmp_dir, true );
+			if ($wp_filesystem->is_dir($fonts_tmp_dir)) {
+				$wp_filesystem->delete($fonts_tmp_dir, true);
 			}
 
 			// Once extracted, delete the package if required.
-			if ( $delete_package ) {
-				unlink( $package );
+			if ($delete_package) {
+				unlink($package);
 			}
 
 			return $return;
@@ -984,22 +984,22 @@ 
 		 * Output the version in the header.
 		 */
 		public function add_generator() {
-			$file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
-			$plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
+			$file = str_replace(array("/", "\\"), "/", realpath(__FILE__));
+			$plugins_dir = str_replace(array("/", "\\"), "/", realpath(WP_PLUGIN_DIR));
 
 			// Find source plugin/theme.
 			$source = array();
-			if ( strpos( $file, $plugins_dir ) !== false ) {
-				$source = explode( "/", plugin_basename( $file ) );
-			} else if ( function_exists( 'get_theme_root' ) ) {
-				$themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
+			if (strpos($file, $plugins_dir) !== false) {
+				$source = explode("/", plugin_basename($file));
+			} else if (function_exists('get_theme_root')) {
+				$themes_dir = str_replace(array("/", "\\"), "/", realpath(get_theme_root()));
 
-				if ( strpos( $file, $themes_dir ) !== false ) {
-					$source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
+				if (strpos($file, $themes_dir) !== false) {
+					$source = explode("/", ltrim(str_replace($themes_dir, "", $file), "/"));
 				}
 			}
 
-			echo '<meta name="generator" content="WP Font Awesome Settings v' . esc_attr( $this->version ) . '"' . ( ! empty( $source[0] ) ? ' data-ac-source="' . esc_attr( $source[0] ) . '"' : '' ) . ' />';
+			echo '<meta name="generator" content="WP Font Awesome Settings v' . esc_attr($this->version) . '"' . (!empty($source[0]) ? ' data-ac-source="' . esc_attr($source[0]) . '"' : '') . ' />';
 		}
 	}