AyeCode / invoicing

includes/class-wpinv-discount.php

Indentation +1300 added lines, -1300 removed lines

@@ -15,30 +15,30 @@ 
  */
 class WPInv_Discount extends GetPaid_Data  {
 
-	/**
-	 * Which data store to load.
-	 *
-	 * @var string
-	 */
+    /**
+     * Which data store to load.
+     *
+     * @var string
+     */
     protected $data_store_name = 'discount';
 
     /**
-	 * This is the name of this object type.
-	 *
-	 * @var string
-	 */
-	protected $object_type = 'discount';
-
-	/**
-	 * Discount Data array. This is the core item data exposed in APIs.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	protected $data = array(
-		'status'               => 'draft',
-		'version'              => '',
-		'date_created'         => null,
+     * This is the name of this object type.
+     *
+     * @var string
+     */
+    protected $object_type = 'discount';
+
+    /**
+     * Discount Data array. This is the core item data exposed in APIs.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    protected $data = array(
+        'status'               => 'draft',
+        'version'              => '',
+        'date_created'         => null,
         'date_modified'        => null,
         'name'                 => 'no-name',
         'description'          => '',
@@ -58,144 +58,144 @@ 
         'amount'               => null,
     );
 
-	/**
-	 * Stores meta in cache for future reads.
-	 *
-	 * A group must be set to to enable caching.
-	 *
-	 * @var string
-	 */
-	protected $cache_group = 'getpaid_discounts';
+    /**
+     * Stores meta in cache for future reads.
+     *
+     * A group must be set to to enable caching.
+     *
+     * @var string
+     */
+    protected $cache_group = 'getpaid_discounts';
 
     /**
      * Stores a reference to the original WP_Post object
      *
      * @var WP_Post
      */
-	protected $post = null;
-
-	/**
-	 * Get the discount if ID is passed, otherwise the discount is new and empty.
-	 *
-	 * @param int|array|string|WPInv_Discount|WP_Post $discount discount data, object, ID or code.
-	 */
-	public function __construct( $discount = 0 ) {
-		parent::__construct( $discount );
-
-		if ( is_numeric( $discount ) && 'wpi_discount' === get_post_type( $discount ) ) {
-			$this->set_id( $discount );
-		} elseif ( $discount instanceof self ) {
-			$this->set_id( $discount->get_id() );
-		} elseif ( ! empty( $discount->ID ) ) {
-			$this->set_id( $discount->ID );
-		} elseif ( is_array( $discount ) ) {
-			$this->set_props( $discount );
-
-			if ( isset( $discount['ID'] ) ) {
-				$this->set_id( $discount['ID'] );
-			}
-
-		} elseif ( is_scalar( $discount ) && $discount = self::get_discount_id_by_code( $discount ) ) {
-			$this->set_id( $discount );
-		} else {
-			$this->set_object_read( true );
-		}
+    protected $post = null;
+
+    /**
+     * Get the discount if ID is passed, otherwise the discount is new and empty.
+     *
+     * @param int|array|string|WPInv_Discount|WP_Post $discount discount data, object, ID or code.
+     */
+    public function __construct( $discount = 0 ) {
+        parent::__construct( $discount );
+
+        if ( is_numeric( $discount ) && 'wpi_discount' === get_post_type( $discount ) ) {
+            $this->set_id( $discount );
+        } elseif ( $discount instanceof self ) {
+            $this->set_id( $discount->get_id() );
+        } elseif ( ! empty( $discount->ID ) ) {
+            $this->set_id( $discount->ID );
+        } elseif ( is_array( $discount ) ) {
+            $this->set_props( $discount );
+
+            if ( isset( $discount['ID'] ) ) {
+                $this->set_id( $discount['ID'] );
+            }
+
+        } elseif ( is_scalar( $discount ) && $discount = self::get_discount_id_by_code( $discount ) ) {
+            $this->set_id( $discount );
+        } 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->ID   = $this->get_id();
-			$this->data_store->read( $this );
+            $this->data_store->read( $this );
+        }
+
+    }
+
+    /**
+     * Fetch a discount from the db/cache
+     *
+     *
+     * @static
+     * @param string $field The field to query against: 'ID', 'discount_code'
+     * @param string|int $value The field value
+     * @deprecated
+     * @since 1.0.15
+     * @return array|bool array of discount details on success. False otherwise.
+     */
+    public static function get_data_by( $field, $value ) {
+
+        if ( 'id' == strtolower( $field ) ) {
+            // Make sure the value is numeric to avoid casting objects, for example,
+            // to int 1.
+            if ( ! is_numeric( $value ) )
+                return false;
+            $value = intval( $value );
+            if ( $value < 1 )
+                return false;
+        }
+
+        if ( ! $value || ! is_string( $field ) ) {
+            return false;
+        }
+
+        $field = trim( $field );
+
+        // prepare query args
+        switch ( strtolower( $field ) ) {
+            case 'id':
+                $discount_id = $value;
+                $args		 = array( 'include' => array( $value ) );
+                break;
+            case 'discount_code':
+            case 'code':
+                $value       = trim( $value );
+                $discount_id = wp_cache_get( $value, 'WPInv_Discount_Codes' );
+                $args		 = array( 'meta_key' => '_wpi_discount_code', 'meta_value' => $value );
+                break;
+            case 'name':
+                $discount_id = 0;
+                $args		 = array( 'name' => trim( $value ) );
+                break;
+            default:
+                $args		 = apply_filters( "wpinv_discount_get_data_by_{$field}_args", null, $value );
+                if ( ! is_array( $args ) ) {
+                    return apply_filters( "wpinv_discount_get_data_by_$field", false, $value );
+                }
+
+        }
+
+        // Check if there is a cached value.
+        if ( ! empty( $discount_id ) && $discount = wp_cache_get( (int) $discount_id, 'WPInv_Discounts' ) ) {
+            return $discount;
+        }
+
+        $args = array_merge(
+            $args,
+            array(
+                'post_type'      => 'wpi_discount',
+                'posts_per_page' => 1,
+                'post_status'    => array( 'publish', 'pending', 'draft', 'expired' )
+            )
+        );
+
+        $discount = get_posts( $args );
+
+        if( empty( $discount ) ) {
+            return false;
         }
 
-	}
-
-	/**
-	 * Fetch a discount from the db/cache
-	 *
-	 *
-	 * @static
-	 * @param string $field The field to query against: 'ID', 'discount_code'
-	 * @param string|int $value The field value
-	 * @deprecated
-	 * @since 1.0.15
-	 * @return array|bool array of discount details on success. False otherwise.
-	 */
-	public static function get_data_by( $field, $value ) {
-
-		if ( 'id' == strtolower( $field ) ) {
-			// Make sure the value is numeric to avoid casting objects, for example,
-			// to int 1.
-			if ( ! is_numeric( $value ) )
-				return false;
-			$value = intval( $value );
-			if ( $value < 1 )
-				return false;
-		}
-
-		if ( ! $value || ! is_string( $field ) ) {
-			return false;
-		}
-
-		$field = trim( $field );
-
-		// prepare query args
-		switch ( strtolower( $field ) ) {
-			case 'id':
-				$discount_id = $value;
-				$args		 = array( 'include' => array( $value ) );
-				break;
-			case 'discount_code':
-			case 'code':
-				$value       = trim( $value );
-				$discount_id = wp_cache_get( $value, 'WPInv_Discount_Codes' );
-				$args		 = array( 'meta_key' => '_wpi_discount_code', 'meta_value' => $value );
-				break;
-			case 'name':
-				$discount_id = 0;
-				$args		 = array( 'name' => trim( $value ) );
-				break;
-			default:
-				$args		 = apply_filters( "wpinv_discount_get_data_by_{$field}_args", null, $value );
-				if ( ! is_array( $args ) ) {
-					return apply_filters( "wpinv_discount_get_data_by_$field", false, $value );
-				}
-
-		}
-
-		// Check if there is a cached value.
-		if ( ! empty( $discount_id ) && $discount = wp_cache_get( (int) $discount_id, 'WPInv_Discounts' ) ) {
-			return $discount;
-		}
-
-		$args = array_merge(
-			$args,
-			array(
-				'post_type'      => 'wpi_discount',
-				'posts_per_page' => 1,
-				'post_status'    => array( 'publish', 'pending', 'draft', 'expired' )
-			)
-		);
-
-		$discount = get_posts( $args );
-
-		if( empty( $discount ) ) {
-			return false;
-		}
-
-		$discount = $discount[0];
-
-		// Prepare the return data.
-		$return = array(
+        $discount = $discount[0];
+
+        // Prepare the return data.
+        $return = array(
             'ID'                          => $discount->ID,
             'code'                        => get_post_meta( $discount->ID, '_wpi_discount_code', true ),
             'amount'                      => get_post_meta( $discount->ID, '_wpi_discount_amount', true ),
             'date_created'                => $discount->post_date,
-			'date_modified'               => $discount->post_modified,
-			'status'               		  => $discount->post_status,
-			'start'                  	  => get_post_meta( $discount->ID, '_wpi_discount_start', true ),
+            'date_modified'               => $discount->post_modified,
+            'status'               		  => $discount->post_status,
+            'start'                  	  => get_post_meta( $discount->ID, '_wpi_discount_start', true ),
             'expiration'                  => get_post_meta( $discount->ID, '_wpi_discount_expiration', true ),
             'type'               		  => get_post_meta( $discount->ID, '_wpi_discount_type', true ),
             'description'                 => $discount->post_excerpt,
@@ -209,77 +209,77 @@ 
             'max_total'                   => get_post_meta( $discount->ID, '_wpi_discount_max_total', true ),
         );
 
-		$return = apply_filters( 'wpinv_discount_properties', $return );
-
-		// Update the cache with our data
-		wp_cache_add( $discount->ID, $return, 'WPInv_Discounts' );
-		wp_cache_add( $return['code'], $discount->ID, 'WPInv_Discount_Codes' );
-
-		return $return;
-	}
-
-	/**
-	 * Given a discount code, it returns a discount id.
-	 *
-	 *
-	 * @static
-	 * @param string $discount_code
-	 * @since 1.0.15
-	 * @return int
-	 */
-	public static function get_discount_id_by_code( $discount_code ) {
-
-		// Trim the code.
-		$discount_code = trim( $discount_code );
-
-		// Ensure a value has been passed.
-		if ( empty( $discount_code ) ) {
-			return 0;
-		}
-
-		// Maybe retrieve from the cache.
-		$discount_id   = wp_cache_get( $discount_code, 'getpaid_discount_codes' );
-		if ( ! empty( $discount_id ) ) {
-			return $discount_id;
-		}
-
-		// Fetch the first discount codes.
-		$discounts = get_posts(
-			array(
-				'meta_key'       => '_wpi_discount_code',
-				'meta_value'     => $discount_code,
-				'post_type'      => 'wpi_discount',
-				'posts_per_page' => 1,
-				'post_status'    => array( 'publish', 'pending', 'draft', 'expired' ),
-				'fields'         => 'ids',
-			)
-		);
-
-		if ( empty( $discounts ) ) {
-			return 0;
-		}
-
-		$discount_id = $discounts[0];
-
-		// Update the cache with our data
-		wp_cache_add( get_post_meta( $discount_id, '_wpi_discount_code', true ), $discount_id, 'getpaid_discount_codes' );
-
-		return $discount_id;
-	}
-
-	/**
-	 * Magic method for checking the existence of a certain custom field.
-	 *
-	 * @since 1.0.15
-	 * @access public
-	 *
-	 * @return bool Whether the given discount field is set.
-	 */
-	public function __isset( $key ){
-		return isset( $this->data[$key] ) || method_exists( $this, "get_$key");
-	}
-
-	/*
+        $return = apply_filters( 'wpinv_discount_properties', $return );
+
+        // Update the cache with our data
+        wp_cache_add( $discount->ID, $return, 'WPInv_Discounts' );
+        wp_cache_add( $return['code'], $discount->ID, 'WPInv_Discount_Codes' );
+
+        return $return;
+    }
+
+    /**
+     * Given a discount code, it returns a discount id.
+     *
+     *
+     * @static
+     * @param string $discount_code
+     * @since 1.0.15
+     * @return int
+     */
+    public static function get_discount_id_by_code( $discount_code ) {
+
+        // Trim the code.
+        $discount_code = trim( $discount_code );
+
+        // Ensure a value has been passed.
+        if ( empty( $discount_code ) ) {
+            return 0;
+        }
+
+        // Maybe retrieve from the cache.
+        $discount_id   = wp_cache_get( $discount_code, 'getpaid_discount_codes' );
+        if ( ! empty( $discount_id ) ) {
+            return $discount_id;
+        }
+
+        // Fetch the first discount codes.
+        $discounts = get_posts(
+            array(
+                'meta_key'       => '_wpi_discount_code',
+                'meta_value'     => $discount_code,
+                'post_type'      => 'wpi_discount',
+                'posts_per_page' => 1,
+                'post_status'    => array( 'publish', 'pending', 'draft', 'expired' ),
+                'fields'         => 'ids',
+            )
+        );
+
+        if ( empty( $discounts ) ) {
+            return 0;
+        }
+
+        $discount_id = $discounts[0];
+
+        // Update the cache with our data
+        wp_cache_add( get_post_meta( $discount_id, '_wpi_discount_code', true ), $discount_id, 'getpaid_discount_codes' );
+
+        return $discount_id;
+    }
+
+    /**
+     * Magic method for checking the existence of a certain custom field.
+     *
+     * @since 1.0.15
+     * @access public
+     *
+     * @return bool Whether the given discount field is set.
+     */
+    public function __isset( $key ){
+        return isset( $this->data[$key] ) || method_exists( $this, "get_$key");
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| CRUD methods
 	|--------------------------------------------------------------------------
@@ -294,430 +294,430 @@ 
 	|--------------------------------------------------------------------------
 	*/
 
-	/**
-	 * Get discount status.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_status( $context = 'view' ) {
-		return $this->get_prop( 'status', $context );
+    /**
+     * Get discount status.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_status( $context = 'view' ) {
+        return $this->get_prop( 'status', $context );
     }
 
     /**
-	 * Get plugin version when the discount 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 discount 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 discount 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 discount 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 discount 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 discount 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 discount 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 discount 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 discount 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 discount 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;
-    }
-
-    /**
-	 * Get the discount 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 );
-    }
-
-    /**
-	 * Get the discount description.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_description( $context = 'view' ) {
-		return $this->get_prop( 'description', $context );
-    }
-
-    /**
-	 * Alias of self::get_description().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_excerpt( $context = 'view' ) {
-		return $this->get_description( $context );
-    }
-
-    /**
-	 * Alias of self::get_description().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_summary( $context = 'view' ) {
-		return $this->get_description( $context );
-    }
-
-    /**
-	 * Get the owner of the discount.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_author( $context = 'view' ) {
-		return (int) $this->get_prop( 'author', $context );
-	}
-
-	/**
-	 * Get the discount code.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_code( $context = 'view' ) {
-		return $this->get_prop( 'code', $context );
-	}
-
-	/**
-	 * Alias for self::get_code().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_coupon_code( $context = 'view' ) {
-		return $this->get_code( $context );
-	}
-
-	/**
-	 * Alias for self::get_code().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_discount_code( $context = 'view' ) {
-		return $this->get_code( $context );
-	}
-
-	/**
-	 * Get the discount's amount.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_amount( $context = 'view' ) {
-		return $context == 'view' ? floatval( $this->get_prop( 'amount', $context ) ) : $this->get_prop( 'amount', $context );
-	}
-
-	/**
-	 * Get the discount's formated amount/rate.
-	 *
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_formatted_amount() {
-
-		if ( $this->is_type( 'flat' ) ) {
-			$rate = wpinv_price( $this->get_amount() );
-		} else {
-			$rate = $this->get_amount() . '%';
-		}
-
-		return apply_filters( 'wpinv_format_discount_rate', $rate, $this->get_type(), $this->get_amount() );
-	}
-
-	/**
-	 * Get the discount's start date.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_start( $context = 'view' ) {
-		return $this->get_prop( 'start', $context );
-	}
-
-	/**
-	 * Alias for self::get_start().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_start_date( $context = 'view' ) {
-		return $this->get_start( $context );
-	}
-
-	/**
-	 * Get the discount's expiration date.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_expiration( $context = 'view' ) {
-		return $this->get_prop( 'expiration', $context );
-	}
-
-	/**
-	 * Alias for self::get_expiration().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_expiration_date( $context = 'view' ) {
-		return $this->get_expiration( $context );
-	}
-
-	/**
-	 * Alias for self::get_expiration().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_end_date( $context = 'view' ) {
-		return $this->get_expiration( $context );
-	}
-
-	/**
-	 * Get the discount's type.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return string
-	 */
-	public function get_type( $context = 'view' ) {
-		return $this->get_prop( 'type', $context );
-	}
-
-	/**
-	 * Get the number of times a discount has been used.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
-	public function get_uses( $context = 'view' ) {
-		return (int) $this->get_prop( 'uses', $context );
-	}
-
-	/**
-	 * Get the discount's usage, i.e uses / max uses.
-	 *
-	 * @since 1.0.19
-	 * @return string
-	 */
-	public function get_usage() {
-
-		if ( ! $this->has_limit() ) {
-			return $this->get_uses() . ' / ' . ' &infin;';
-		}
-
-		return $this->get_uses() . ' / ' . (int) $this->get_max_uses();
-
-	}
-
-	/**
-	 * Get the maximum number of time a discount can be used.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int
-	 */
-	public function get_max_uses( $context = 'view' ) {
-		$max_uses = $this->get_prop( 'max_uses', $context );
-		return empty( $max_uses ) ? null : $max_uses;
-	}
-
-	/**
-	 * Checks if this is a single use discount or not.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return bool
-	 */
-	public function get_is_single_use( $context = 'view' ) {
-		return $this->get_prop( 'is_single_use', $context );
-	}
-
-	/**
-	 * Get the items that can be used with this discount.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return array
-	 */
-	public function get_items( $context = 'view' ) {
-		return array_filter( wp_parse_id_list( $this->get_prop( 'items', $context ) ) );
-	}
-
-	/**
-	 * Alias for self::get_items().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return array
-	 */
-	public function get_allowed_items( $context = 'view' ) {
-		return $this->get_items( $context );
-	}
-
-	/**
-	 * Get the items that are not allowed to use this discount.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return array
-	 */
-	public function get_excluded_items( $context = 'view' ) {
-		return array_filter( wp_parse_id_list( $this->get_prop( 'excluded_items', $context ) ) );
-	}
-
-	/**
-	 * Checks if this is a recurring discount or not.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return int|string|bool
-	 */
-	public function get_is_recurring( $context = 'view' ) {
-		return $this->get_prop( 'is_recurring', $context );
-	}
-
-	/**
-	 * Get's the minimum total amount allowed for this discount.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_min_total( $context = 'view' ) {
-		$minimum = $this->get_prop( 'min_total', $context );
-		return empty( $minimum ) ? null : $minimum;
-	}
-
-	/**
-	 * Alias for self::get_min_total().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_minimum_total( $context = 'view' ) {
-		return $this->get_min_total( $context );
-	}
-
-	/**
-	 * Get's the maximum total amount allowed for this discount.
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_max_total( $context = 'view' ) {
-		$maximum = $this->get_prop( 'max_total', $context );
-		return empty( $maximum ) ? null : $maximum;
-	}
-
-	/**
-	 * Alias for self::get_max_total().
-	 *
-	 * @since 1.0.19
-	 * @param  string $context View or edit context.
-	 * @return float
-	 */
-	public function get_maximum_total( $context = 'view' ) {
-		return $this->get_max_total( $context );
-	}
-
-	/**
-	 * Magic method for accessing discount properties.
-	 *
-	 * @since 1.0.15
-	 * @access public
-	 *
-	 * @param string $key Discount data to retrieve
-	 * @param  string $context View or edit context.
-	 * @return mixed Value of the given discount property (if set).
-	 */
-	public function get( $key, $context = 'view' ) {
+        return $date;
+    }
+
+    /**
+     * Get the discount 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 );
+    }
+
+    /**
+     * Get the discount description.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_description( $context = 'view' ) {
+        return $this->get_prop( 'description', $context );
+    }
+
+    /**
+     * Alias of self::get_description().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_excerpt( $context = 'view' ) {
+        return $this->get_description( $context );
+    }
+
+    /**
+     * Alias of self::get_description().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_summary( $context = 'view' ) {
+        return $this->get_description( $context );
+    }
+
+    /**
+     * Get the owner of the discount.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_author( $context = 'view' ) {
+        return (int) $this->get_prop( 'author', $context );
+    }
+
+    /**
+     * Get the discount code.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_code( $context = 'view' ) {
+        return $this->get_prop( 'code', $context );
+    }
+
+    /**
+     * Alias for self::get_code().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_coupon_code( $context = 'view' ) {
+        return $this->get_code( $context );
+    }
+
+    /**
+     * Alias for self::get_code().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_discount_code( $context = 'view' ) {
+        return $this->get_code( $context );
+    }
+
+    /**
+     * Get the discount's amount.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_amount( $context = 'view' ) {
+        return $context == 'view' ? floatval( $this->get_prop( 'amount', $context ) ) : $this->get_prop( 'amount', $context );
+    }
+
+    /**
+     * Get the discount's formated amount/rate.
+     *
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_formatted_amount() {
+
+        if ( $this->is_type( 'flat' ) ) {
+            $rate = wpinv_price( $this->get_amount() );
+        } else {
+            $rate = $this->get_amount() . '%';
+        }
+
+        return apply_filters( 'wpinv_format_discount_rate', $rate, $this->get_type(), $this->get_amount() );
+    }
+
+    /**
+     * Get the discount's start date.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_start( $context = 'view' ) {
+        return $this->get_prop( 'start', $context );
+    }
+
+    /**
+     * Alias for self::get_start().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_start_date( $context = 'view' ) {
+        return $this->get_start( $context );
+    }
+
+    /**
+     * Get the discount's expiration date.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_expiration( $context = 'view' ) {
+        return $this->get_prop( 'expiration', $context );
+    }
+
+    /**
+     * Alias for self::get_expiration().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_expiration_date( $context = 'view' ) {
+        return $this->get_expiration( $context );
+    }
+
+    /**
+     * Alias for self::get_expiration().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_end_date( $context = 'view' ) {
+        return $this->get_expiration( $context );
+    }
+
+    /**
+     * Get the discount's type.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return string
+     */
+    public function get_type( $context = 'view' ) {
+        return $this->get_prop( 'type', $context );
+    }
+
+    /**
+     * Get the number of times a discount has been used.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
+    public function get_uses( $context = 'view' ) {
+        return (int) $this->get_prop( 'uses', $context );
+    }
+
+    /**
+     * Get the discount's usage, i.e uses / max uses.
+     *
+     * @since 1.0.19
+     * @return string
+     */
+    public function get_usage() {
+
+        if ( ! $this->has_limit() ) {
+            return $this->get_uses() . ' / ' . ' &infin;';
+        }
+
+        return $this->get_uses() . ' / ' . (int) $this->get_max_uses();
+
+    }
+
+    /**
+     * Get the maximum number of time a discount can be used.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int
+     */
+    public function get_max_uses( $context = 'view' ) {
+        $max_uses = $this->get_prop( 'max_uses', $context );
+        return empty( $max_uses ) ? null : $max_uses;
+    }
+
+    /**
+     * Checks if this is a single use discount or not.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return bool
+     */
+    public function get_is_single_use( $context = 'view' ) {
+        return $this->get_prop( 'is_single_use', $context );
+    }
+
+    /**
+     * Get the items that can be used with this discount.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return array
+     */
+    public function get_items( $context = 'view' ) {
+        return array_filter( wp_parse_id_list( $this->get_prop( 'items', $context ) ) );
+    }
+
+    /**
+     * Alias for self::get_items().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return array
+     */
+    public function get_allowed_items( $context = 'view' ) {
+        return $this->get_items( $context );
+    }
+
+    /**
+     * Get the items that are not allowed to use this discount.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return array
+     */
+    public function get_excluded_items( $context = 'view' ) {
+        return array_filter( wp_parse_id_list( $this->get_prop( 'excluded_items', $context ) ) );
+    }
+
+    /**
+     * Checks if this is a recurring discount or not.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return int|string|bool
+     */
+    public function get_is_recurring( $context = 'view' ) {
+        return $this->get_prop( 'is_recurring', $context );
+    }
+
+    /**
+     * Get's the minimum total amount allowed for this discount.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_min_total( $context = 'view' ) {
+        $minimum = $this->get_prop( 'min_total', $context );
+        return empty( $minimum ) ? null : $minimum;
+    }
+
+    /**
+     * Alias for self::get_min_total().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_minimum_total( $context = 'view' ) {
+        return $this->get_min_total( $context );
+    }
+
+    /**
+     * Get's the maximum total amount allowed for this discount.
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_max_total( $context = 'view' ) {
+        $maximum = $this->get_prop( 'max_total', $context );
+        return empty( $maximum ) ? null : $maximum;
+    }
+
+    /**
+     * Alias for self::get_max_total().
+     *
+     * @since 1.0.19
+     * @param  string $context View or edit context.
+     * @return float
+     */
+    public function get_maximum_total( $context = 'view' ) {
+        return $this->get_max_total( $context );
+    }
+
+    /**
+     * Magic method for accessing discount properties.
+     *
+     * @since 1.0.15
+     * @access public
+     *
+     * @param string $key Discount data to retrieve
+     * @param  string $context View or edit context.
+     * @return mixed Value of the given discount property (if set).
+     */
+    public function get( $key, $context = 'view' ) {
         return $this->get_prop( $key, $context );
-	}
+    }
 
-	/*
+    /*
 	|--------------------------------------------------------------------------
 	| Setters
 	|--------------------------------------------------------------------------
@@ -727,41 +727,41 @@ 
 	| object.
 	*/
 
-	/**
-	 * Sets discount status.
-	 *
-	 * @since 1.0.19
-	 * @param  string $status New status.
-	 * @return array details of change.
-	 */
-	public function set_status( $status ) {
+    /**
+     * Sets discount status.
+     *
+     * @since 1.0.19
+     * @param  string $status New status.
+     * @return array details of change.
+     */
+    public function set_status( $status ) {
         $old_status = $this->get_status();
 
         $this->set_prop( 'status', $status );
 
-		return array(
-			'from' => $old_status,
-			'to'   => $status,
-		);
+        return array(
+            'from' => $old_status,
+            'to'   => $status,
+        );
     }
 
     /**
-	 * Set plugin version when the discount was created.
-	 *
-	 * @since 1.0.19
-	 */
-	public function set_version( $value ) {
-		$this->set_prop( 'version', $value );
+     * Set plugin version when the discount was created.
+     *
+     * @since 1.0.19
+     */
+    public function set_version( $value ) {
+        $this->set_prop( 'version', $value );
     }
 
     /**
-	 * Set date when the discount was created.
-	 *
-	 * @since 1.0.19
-	 * @param string $value Value to set.
+     * Set date when the discount 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 ) {
@@ -774,13 +774,13 @@ 
     }
 
     /**
-	 * Set date when the discount was last modified.
-	 *
-	 * @since 1.0.19
-	 * @param string $value Value to set.
+     * Set date when the discount 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 ) {
@@ -793,324 +793,324 @@ 
     }
 
     /**
-	 * Set the discount name.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value New name.
-	 */
-	public function set_name( $value ) {
+     * Set the discount name.
+     *
+     * @since 1.0.19
+     * @param  string $value New name.
+     */
+    public function set_name( $value ) {
         $name = sanitize_text_field( $value );
-		$this->set_prop( 'name', $name );
+        $this->set_prop( 'name', $name );
     }
 
     /**
-	 * Alias of self::set_name().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value New name.
-	 */
-	public function set_title( $value ) {
-		$this->set_name( $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 discount description.
-	 *
-	 * @since 1.0.19
-	 * @param  string $value New description.
-	 */
-	public function set_description( $value ) {
-        $description = wp_kses_post( $value );
-		return $this->set_prop( 'description', $description );
-    }
-
-    /**
-	 * Alias of self::set_description().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value New description.
-	 */
-	public function set_excerpt( $value ) {
-		$this->set_description( $value );
-    }
-
-    /**
-	 * Alias of self::set_description().
-	 *
-	 * @since 1.0.19
-	 * @param  string $value New description.
-	 */
-	public function set_summary( $value ) {
-		$this->set_description( $value );
-    }
-
-    /**
-	 * Set the owner of the discount.
-	 *
-	 * @since 1.0.19
-	 * @param  int $value New author.
-	 */
-	public function set_author( $value ) {
-		$this->set_prop( 'author', (int) $value );
-	}
-
-	/**
-	 * Sets the discount code.
-	 *
-	 * @since 1.0.19
-	 * @param string $value New discount code.
-	 */
-	public function set_code( $value ) {
-		$code = sanitize_text_field( $value );
-		$this->set_prop( 'code', $code );
-	}
-
-	/**
-	 * Alias of self::set_code().
-	 *
-	 * @since 1.0.19
-	 * @param string $value New discount code.
-	 */
-	public function set_coupon_code( $value ) {
-		$this->set_code( $value );
-	}
-
-	/**
-	 * Alias of self::set_code().
-	 *
-	 * @since 1.0.19
-	 * @param string $value New discount code.
-	 */
-	public function set_discount_code( $value ) {
-		$this->set_code( $value );
-	}
-
-	/**
-	 * Sets the discount amount.
-	 *
-	 * @since 1.0.19
-	 * @param float $value New discount code.
-	 */
-	public function set_amount( $value ) {
-		$amount = floatval( wpinv_sanitize_amount( $value ) );
-		$this->set_prop( 'amount', $amount );
-	}
-
-	/**
-	 * Sets the discount's start date.
-	 *
-	 * @since 1.0.19
-	 * @param float $value New start date.
-	 */
-	public function set_start( $value ) {
-		$date = strtotime( $value );
+     * Set the discount description.
+     *
+     * @since 1.0.19
+     * @param  string $value New description.
+     */
+    public function set_description( $value ) {
+        $description = wp_kses_post( $value );
+        return $this->set_prop( 'description', $description );
+    }
+
+    /**
+     * Alias of self::set_description().
+     *
+     * @since 1.0.19
+     * @param  string $value New description.
+     */
+    public function set_excerpt( $value ) {
+        $this->set_description( $value );
+    }
+
+    /**
+     * Alias of self::set_description().
+     *
+     * @since 1.0.19
+     * @param  string $value New description.
+     */
+    public function set_summary( $value ) {
+        $this->set_description( $value );
+    }
+
+    /**
+     * Set the owner of the discount.
+     *
+     * @since 1.0.19
+     * @param  int $value New author.
+     */
+    public function set_author( $value ) {
+        $this->set_prop( 'author', (int) $value );
+    }
+
+    /**
+     * Sets the discount code.
+     *
+     * @since 1.0.19
+     * @param string $value New discount code.
+     */
+    public function set_code( $value ) {
+        $code = sanitize_text_field( $value );
+        $this->set_prop( 'code', $code );
+    }
+
+    /**
+     * Alias of self::set_code().
+     *
+     * @since 1.0.19
+     * @param string $value New discount code.
+     */
+    public function set_coupon_code( $value ) {
+        $this->set_code( $value );
+    }
+
+    /**
+     * Alias of self::set_code().
+     *
+     * @since 1.0.19
+     * @param string $value New discount code.
+     */
+    public function set_discount_code( $value ) {
+        $this->set_code( $value );
+    }
+
+    /**
+     * Sets the discount amount.
+     *
+     * @since 1.0.19
+     * @param float $value New discount code.
+     */
+    public function set_amount( $value ) {
+        $amount = floatval( wpinv_sanitize_amount( $value ) );
+        $this->set_prop( 'amount', $amount );
+    }
+
+    /**
+     * Sets the discount's start date.
+     *
+     * @since 1.0.19
+     * @param float $value New start date.
+     */
+    public function set_start( $value ) {
+        $date = strtotime( $value );
 
         if ( $date ) {
             $this->set_prop( 'start', date( 'Y-m-d H:i', $date ) );
             return true;
-		}
+        }
 
-		$this->set_prop( 'start', '' );
+        $this->set_prop( 'start', '' );
 
         return false;
-	}
-
-	/**
-	 * Alias of self::set_start().
-	 *
-	 * @since 1.0.19
-	 * @param string $value New start date.
-	 */
-	public function set_start_date( $value ) {
-		$this->set_start( $value );
-	}
-
-	/**
-	 * Sets the discount's expiration date.
-	 *
-	 * @since 1.0.19
-	 * @param float $value New expiration date.
-	 */
-	public function set_expiration( $value ) {
-		$date = strtotime( $value );
+    }
+
+    /**
+     * Alias of self::set_start().
+     *
+     * @since 1.0.19
+     * @param string $value New start date.
+     */
+    public function set_start_date( $value ) {
+        $this->set_start( $value );
+    }
+
+    /**
+     * Sets the discount's expiration date.
+     *
+     * @since 1.0.19
+     * @param float $value New expiration date.
+     */
+    public function set_expiration( $value ) {
+        $date = strtotime( $value );
 
         if ( $date ) {
             $this->set_prop( 'expiration', date( 'Y-m-d H:i', $date ) );
             return true;
         }
 
-		$this->set_prop( 'expiration', '' );
+        $this->set_prop( 'expiration', '' );
         return false;
-	}
-
-	/**
-	 * Alias of self::set_expiration().
-	 *
-	 * @since 1.0.19
-	 * @param string $value New expiration date.
-	 */
-	public function set_expiration_date( $value ) {
-		$this->set_expiration( $value );
-	}
-
-	/**
-	 * Alias of self::set_expiration().
-	 *
-	 * @since 1.0.19
-	 * @param string $value New expiration date.
-	 */
-	public function set_end_date( $value ) {
-		$this->set_expiration( $value );
-	}
-
-	/**
-	 * Sets the discount type.
-	 *
-	 * @since 1.0.19
-	 * @param string $value New discount type.
-	 */
-	public function set_type( $value ) {
-		if ( $value && array_key_exists( sanitize_text_field( $value ), wpinv_get_discount_types() ) ) {
-			$this->set_prop( 'type', sanitize_text_field( $value ) );
-		}
-	}
-
-	/**
-	 * Sets the number of times a discount has been used.
-	 *
-	 * @since 1.0.19
-	 * @param int $value usage count.
-	 */
-	public function set_uses( $value ) {
-
-		$value = (int) $value;
-
-		if ( $value < 0 ) {
-			$value = 0;
-		}
-
-		$this->set_prop( 'uses', (int) $value );
-	}
-
-	/**
-	 * Sets the maximum number of times a discount can be used.
-	 *
-	 * @since 1.0.19
-	 * @param int $value maximum usage count.
-	 */
-	public function set_max_uses( $value ) {
-		$this->set_prop( 'max_uses', absint( $value ) );
-	}
-
-	/**
-	 * Sets if this is a single use discount or not.
-	 *
-	 * @since 1.0.19
-	 * @param int|bool $value is single use.
-	 */
-	public function set_is_single_use( $value ) {
-		$this->set_prop( 'is_single_use', (bool) $value );
-	}
-
-	/**
-	 * Sets the items that can be used with this discount.
-	 *
-	 * @since 1.0.19
-	 * @param array $value items.
-	 */
-	public function set_items( $value ) {
-		$this->set_prop( 'items', array_filter( wp_parse_id_list( $value ) ) );
-	}
-
-	/**
-	 * Alias for self::set_items().
-	 *
-	 * @since 1.0.19
-	 * @param array $value items.
-	 */
-	public function set_allowed_items( $value ) {
-		$this->set_items( $value );
-	}
-
-	/**
-	 * Sets the items that can not be used with this discount.
-	 *
-	 * @since 1.0.19
-	 * @param array $value items.
-	 */
-	public function set_excluded_items( $value ) {
-		$this->set_prop( 'excluded_items', array_filter( wp_parse_id_list( $value ) ) );
-	}
-
-	/**
-	 * Sets if this is a recurring discounts or not.
-	 *
-	 * @since 1.0.19
-	 * @param int|bool $value is recurring.
-	 */
-	public function set_is_recurring( $value ) {
-		$this->set_prop( 'is_recurring', (bool) $value );
-	}
-
-	/**
-	 * Sets the minimum total that can not be used with this discount.
-	 *
-	 * @since 1.0.19
-	 * @param float $value minimum total.
-	 */
-	public function set_min_total( $value ) {
-		$this->set_prop( 'min_total', (float) wpinv_sanitize_amount( $value ) );
-	}
-
-	/**
-	 * Alias for self::set_min_total().
-	 *
-	 * @since 1.0.19
-	 * @param float $value minimum total.
-	 */
-	public function set_minimum_total( $value ) {
-		$this->set_min_total( $value );
-	}
-
-	/**
-	 * Sets the maximum total that can not be used with this discount.
-	 *
-	 * @since 1.0.19
-	 * @param float $value maximum total.
-	 */
-	public function set_max_total( $value ) {
-		$this->set_prop( 'max_total', (float) wpinv_sanitize_amount( $value ) );
-	}
-
-	/**
-	 * Alias for self::set_max_total().
-	 *
-	 * @since 1.0.19
-	 * @param float $value maximum total.
-	 */
-	public function set_maximum_total( $value ) {
-		$this->set_max_total( $value );
-	}
-
-	/**
-	 * @deprecated
-	 */
-	public function refresh(){}
-
-	/**
-	 * @deprecated
-	 *
-	 */
-	public function update_status( $status = 'publish' ){
-
-		if ( $this->exists() && $this->get_status() != $status ) {
-			$this->set_status( $status );
-			$this->save();
-		}
-
-	}
-
-	/*
+    }
+
+    /**
+     * Alias of self::set_expiration().
+     *
+     * @since 1.0.19
+     * @param string $value New expiration date.
+     */
+    public function set_expiration_date( $value ) {
+        $this->set_expiration( $value );
+    }
+
+    /**
+     * Alias of self::set_expiration().
+     *
+     * @since 1.0.19
+     * @param string $value New expiration date.
+     */
+    public function set_end_date( $value ) {
+        $this->set_expiration( $value );
+    }
+
+    /**
+     * Sets the discount type.
+     *
+     * @since 1.0.19
+     * @param string $value New discount type.
+     */
+    public function set_type( $value ) {
+        if ( $value && array_key_exists( sanitize_text_field( $value ), wpinv_get_discount_types() ) ) {
+            $this->set_prop( 'type', sanitize_text_field( $value ) );
+        }
+    }
+
+    /**
+     * Sets the number of times a discount has been used.
+     *
+     * @since 1.0.19
+     * @param int $value usage count.
+     */
+    public function set_uses( $value ) {
+
+        $value = (int) $value;
+
+        if ( $value < 0 ) {
+            $value = 0;
+        }
+
+        $this->set_prop( 'uses', (int) $value );
+    }
+
+    /**
+     * Sets the maximum number of times a discount can be used.
+     *
+     * @since 1.0.19
+     * @param int $value maximum usage count.
+     */
+    public function set_max_uses( $value ) {
+        $this->set_prop( 'max_uses', absint( $value ) );
+    }
+
+    /**
+     * Sets if this is a single use discount or not.
+     *
+     * @since 1.0.19
+     * @param int|bool $value is single use.
+     */
+    public function set_is_single_use( $value ) {
+        $this->set_prop( 'is_single_use', (bool) $value );
+    }
+
+    /**
+     * Sets the items that can be used with this discount.
+     *
+     * @since 1.0.19
+     * @param array $value items.
+     */
+    public function set_items( $value ) {
+        $this->set_prop( 'items', array_filter( wp_parse_id_list( $value ) ) );
+    }
+
+    /**
+     * Alias for self::set_items().
+     *
+     * @since 1.0.19
+     * @param array $value items.
+     */
+    public function set_allowed_items( $value ) {
+        $this->set_items( $value );
+    }
+
+    /**
+     * Sets the items that can not be used with this discount.
+     *
+     * @since 1.0.19
+     * @param array $value items.
+     */
+    public function set_excluded_items( $value ) {
+        $this->set_prop( 'excluded_items', array_filter( wp_parse_id_list( $value ) ) );
+    }
+
+    /**
+     * Sets if this is a recurring discounts or not.
+     *
+     * @since 1.0.19
+     * @param int|bool $value is recurring.
+     */
+    public function set_is_recurring( $value ) {
+        $this->set_prop( 'is_recurring', (bool) $value );
+    }
+
+    /**
+     * Sets the minimum total that can not be used with this discount.
+     *
+     * @since 1.0.19
+     * @param float $value minimum total.
+     */
+    public function set_min_total( $value ) {
+        $this->set_prop( 'min_total', (float) wpinv_sanitize_amount( $value ) );
+    }
+
+    /**
+     * Alias for self::set_min_total().
+     *
+     * @since 1.0.19
+     * @param float $value minimum total.
+     */
+    public function set_minimum_total( $value ) {
+        $this->set_min_total( $value );
+    }
+
+    /**
+     * Sets the maximum total that can not be used with this discount.
+     *
+     * @since 1.0.19
+     * @param float $value maximum total.
+     */
+    public function set_max_total( $value ) {
+        $this->set_prop( 'max_total', (float) wpinv_sanitize_amount( $value ) );
+    }
+
+    /**
+     * Alias for self::set_max_total().
+     *
+     * @since 1.0.19
+     * @param float $value maximum total.
+     */
+    public function set_maximum_total( $value ) {
+        $this->set_max_total( $value );
+    }
+
+    /**
+     * @deprecated
+     */
+    public function refresh(){}
+
+    /**
+     * @deprecated
+     *
+     */
+    public function update_status( $status = 'publish' ){
+
+        if ( $this->exists() && $this->get_status() != $status ) {
+            $this->set_status( $status );
+            $this->save();
+        }
+
+    }
+
+    /*
 	|--------------------------------------------------------------------------
 	| Conditionals
 	|--------------------------------------------------------------------------
@@ -1119,263 +1119,263 @@ 
 	|
 	*/
 
-	/**
-	 * Checks whether a discount exists in the database or not
-	 *
-	 * @since 1.0.15
-	 */
-	public function exists(){
-		$id = $this->get_id();
-		return ! empty( $id );
-	}
-
-	/**
-	 * Checks the discount type.
-	 *
-	 *
-	 * @param  string $type the discount type to check against
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function is_type( $type ) {
-		return $this->get_type() == $type;
-	}
-
-	/**
-	 * Checks whether the discount is published or not
-	 *
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function is_active() {
-		return $this->get_status() == 'publish';
-	}
-
-	/**
-	 * Checks whether the discount has max uses
-	 *
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function has_limit() {
-		$limit = $this->get_max_uses();
-		return ! empty( $limit );
-	}
-
-	/**
-	 * Checks whether the discount has ever been used.
-	 *
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function has_uses() {
-		return $this->get_uses() > 0;
-	}
-
-	/**
-	 * Checks whether the discount is has exided the usage limit or not
-	 *
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function has_exceeded_limit() {
-
-		if ( ! $this->has_limit() || ! $this->has_uses() ) {
-			$exceeded = false ;
-		} else {
-			$exceeded = (int) $this->get_max_uses() <= $this->get_uses();
-		}
-
-		return apply_filters( 'wpinv_is_discount_maxed_out', $exceeded, $this->get_id(), $this, $this->get_code() );
-	}
-
-	/**
-	 * Checks whether the discount has an expiration date.
-	 *
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function has_expiration_date() {
-		$date = $this->get_expiration_date();
-		return ! empty( $date );
-	}
-
-	/**
-	 * Checks if the discount is expired
-	 *
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function is_expired() {
-		$expired = $this->has_expiration_date() ? current_time( 'timestamp' ) > strtotime( $this->get_expiration_date() ) : false;
-		return apply_filters( 'wpinv_is_discount_expired', $expired, $this->get_id(), $this, $this->get_code() );
-	}
-
-	/**
-	 * Checks whether the discount has a start date.
-	 *
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function has_start_date() {
-		$date = $this->get_start_date();
-		return ! empty( $date );
-	}
-
-	/**
-	 * Checks the discount start date.
-	 *
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function has_started() {
-		$started = $this->has_start_date() ? true : current_time( 'timestamp' ) > strtotime( $this->get_start_date() );
-		return apply_filters( 'wpinv_is_discount_started', $started, $this->get_id(), $this, $this->get_code() );
-	}
-
-	/**
-	 * Checks the discount has allowed items or not.
-	 *
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function has_allowed_items() {
-		$allowed_items = $this->get_allowed_items();
-		return ! empty( $allowed_items );
-	}
-
-	/**
-	 * Checks the discount has excluded items or not.
-	 *
-	 * @since 1.0.15
-	 * @return bool
-	 */
-	public function has_excluded_items() {
-		$excluded_items = $this->get_excluded_items();
-		return ! empty( $excluded_items );
-	}
-
-	/**
-	 * Check if a discount is valid for a given item id.
-	 *
-	 * @param  int|int[]  $item_ids
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function is_valid_for_items( $item_ids ) {
-
-		$item_ids = array_filter( wp_parse_id_list( $item_ids ) );
-		$included = array_intersect( $item_ids, $this->get_allowed_items() );
-		$excluded = array_intersect( $item_ids, $this->get_excluded_items() );
-
-		if ( $this->has_excluded_items() && ! empty( $excluded ) ) {
-			return false;
-		}
-
-		if ( $this->has_allowed_items() && empty( $included ) ) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Check if a discount is valid for the given amount
-	 *
-	 * @param  float  $amount The amount to check against
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function is_valid_for_amount( $amount ) {
-		return $this->is_minimum_amount_met( $amount ) && $this->is_maximum_amount_met( $amount );
-	}
-
-	/**
-	 * Checks if the minimum amount is set
-	 *
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function has_minimum_amount() {
-		$minimum = $this->get_minimum_total();
-		return ! empty( $minimum );
-	}
-
-	/**
-	 * Checks if the minimum amount is met
-	 *
-	 * @param  float  $amount The amount to check against
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function is_minimum_amount_met( $amount ) {
-		$amount = floatval( wpinv_sanitize_amount( $amount ) );
-		$min_met= ! ( $this->has_minimum_amount() && $amount < floatval( wpinv_sanitize_amount( $this->get_minimum_total() ) ) );
-		return apply_filters( 'wpinv_is_discount_min_met', $min_met, $this->get_id(), $this, $this->get_code(), $amount );
-	}
-
-	/**
-	 * Checks if the maximum amount is set
-	 *
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function has_maximum_amount() {
-		$maximum = $this->get_maximum_total();
-		return ! empty( $maximum );
-	}
-
-	/**
-	 * Checks if the maximum amount is met
-	 *
-	 * @param  float  $amount The amount to check against
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function is_maximum_amount_met( $amount ) {
-		$amount = floatval( wpinv_sanitize_amount( $amount ) );
-		$max_met= ! ( $this->has_maximum_amount() && $amount > floatval( wpinv_sanitize_amount( $this->get_maximum_total() ) ) );
-		return apply_filters( 'wpinv_is_discount_max_met', $max_met, $this->get_id(), $this, $this->get_code(), $amount );
-	}
-
-	/**
-	 * Checks if the discount is recurring.
-	 *
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function is_recurring() {
-		$recurring = $this->get_is_recurring();
-		return ! empty( $recurring );
-	}
-
-	/**
-	 * Checks if the discount is single use.
-	 *
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function is_single_use() {
-		$usage = $this->get_is_single_use();
-		return ! empty( $usage );
-	}
-
-	/**
-	 * Check if a discount is valid for the given user
-	 *
-	 * @param  int|string  $user
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function is_valid_for_user( $user ) {
-
-		// Ensure that the discount is single use.
-		if ( empty( $user ) || ! $this->is_single_use() ) {
-			return true;
-		}
-
-		// Prepare the user id.
-		$user_id = 0;
+    /**
+     * Checks whether a discount exists in the database or not
+     *
+     * @since 1.0.15
+     */
+    public function exists(){
+        $id = $this->get_id();
+        return ! empty( $id );
+    }
+
+    /**
+     * Checks the discount type.
+     *
+     *
+     * @param  string $type the discount type to check against
+     * @since 1.0.15
+     * @return bool
+     */
+    public function is_type( $type ) {
+        return $this->get_type() == $type;
+    }
+
+    /**
+     * Checks whether the discount is published or not
+     *
+     * @since 1.0.15
+     * @return bool
+     */
+    public function is_active() {
+        return $this->get_status() == 'publish';
+    }
+
+    /**
+     * Checks whether the discount has max uses
+     *
+     * @since 1.0.15
+     * @return bool
+     */
+    public function has_limit() {
+        $limit = $this->get_max_uses();
+        return ! empty( $limit );
+    }
+
+    /**
+     * Checks whether the discount has ever been used.
+     *
+     * @since 1.0.15
+     * @return bool
+     */
+    public function has_uses() {
+        return $this->get_uses() > 0;
+    }
+
+    /**
+     * Checks whether the discount is has exided the usage limit or not
+     *
+     * @since 1.0.15
+     * @return bool
+     */
+    public function has_exceeded_limit() {
+
+        if ( ! $this->has_limit() || ! $this->has_uses() ) {
+            $exceeded = false ;
+        } else {
+            $exceeded = (int) $this->get_max_uses() <= $this->get_uses();
+        }
+
+        return apply_filters( 'wpinv_is_discount_maxed_out', $exceeded, $this->get_id(), $this, $this->get_code() );
+    }
+
+    /**
+     * Checks whether the discount has an expiration date.
+     *
+     * @since 1.0.15
+     * @return bool
+     */
+    public function has_expiration_date() {
+        $date = $this->get_expiration_date();
+        return ! empty( $date );
+    }
+
+    /**
+     * Checks if the discount is expired
+     *
+     * @since 1.0.15
+     * @return bool
+     */
+    public function is_expired() {
+        $expired = $this->has_expiration_date() ? current_time( 'timestamp' ) > strtotime( $this->get_expiration_date() ) : false;
+        return apply_filters( 'wpinv_is_discount_expired', $expired, $this->get_id(), $this, $this->get_code() );
+    }
+
+    /**
+     * Checks whether the discount has a start date.
+     *
+     * @since 1.0.15
+     * @return bool
+     */
+    public function has_start_date() {
+        $date = $this->get_start_date();
+        return ! empty( $date );
+    }
+
+    /**
+     * Checks the discount start date.
+     *
+     * @since 1.0.15
+     * @return bool
+     */
+    public function has_started() {
+        $started = $this->has_start_date() ? true : current_time( 'timestamp' ) > strtotime( $this->get_start_date() );
+        return apply_filters( 'wpinv_is_discount_started', $started, $this->get_id(), $this, $this->get_code() );
+    }
+
+    /**
+     * Checks the discount has allowed items or not.
+     *
+     * @since 1.0.15
+     * @return bool
+     */
+    public function has_allowed_items() {
+        $allowed_items = $this->get_allowed_items();
+        return ! empty( $allowed_items );
+    }
+
+    /**
+     * Checks the discount has excluded items or not.
+     *
+     * @since 1.0.15
+     * @return bool
+     */
+    public function has_excluded_items() {
+        $excluded_items = $this->get_excluded_items();
+        return ! empty( $excluded_items );
+    }
+
+    /**
+     * Check if a discount is valid for a given item id.
+     *
+     * @param  int|int[]  $item_ids
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function is_valid_for_items( $item_ids ) {
+
+        $item_ids = array_filter( wp_parse_id_list( $item_ids ) );
+        $included = array_intersect( $item_ids, $this->get_allowed_items() );
+        $excluded = array_intersect( $item_ids, $this->get_excluded_items() );
+
+        if ( $this->has_excluded_items() && ! empty( $excluded ) ) {
+            return false;
+        }
+
+        if ( $this->has_allowed_items() && empty( $included ) ) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Check if a discount is valid for the given amount
+     *
+     * @param  float  $amount The amount to check against
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function is_valid_for_amount( $amount ) {
+        return $this->is_minimum_amount_met( $amount ) && $this->is_maximum_amount_met( $amount );
+    }
+
+    /**
+     * Checks if the minimum amount is set
+     *
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function has_minimum_amount() {
+        $minimum = $this->get_minimum_total();
+        return ! empty( $minimum );
+    }
+
+    /**
+     * Checks if the minimum amount is met
+     *
+     * @param  float  $amount The amount to check against
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function is_minimum_amount_met( $amount ) {
+        $amount = floatval( wpinv_sanitize_amount( $amount ) );
+        $min_met= ! ( $this->has_minimum_amount() && $amount < floatval( wpinv_sanitize_amount( $this->get_minimum_total() ) ) );
+        return apply_filters( 'wpinv_is_discount_min_met', $min_met, $this->get_id(), $this, $this->get_code(), $amount );
+    }
+
+    /**
+     * Checks if the maximum amount is set
+     *
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function has_maximum_amount() {
+        $maximum = $this->get_maximum_total();
+        return ! empty( $maximum );
+    }
+
+    /**
+     * Checks if the maximum amount is met
+     *
+     * @param  float  $amount The amount to check against
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function is_maximum_amount_met( $amount ) {
+        $amount = floatval( wpinv_sanitize_amount( $amount ) );
+        $max_met= ! ( $this->has_maximum_amount() && $amount > floatval( wpinv_sanitize_amount( $this->get_maximum_total() ) ) );
+        return apply_filters( 'wpinv_is_discount_max_met', $max_met, $this->get_id(), $this, $this->get_code(), $amount );
+    }
+
+    /**
+     * Checks if the discount is recurring.
+     *
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function is_recurring() {
+        $recurring = $this->get_is_recurring();
+        return ! empty( $recurring );
+    }
+
+    /**
+     * Checks if the discount is single use.
+     *
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function is_single_use() {
+        $usage = $this->get_is_single_use();
+        return ! empty( $usage );
+    }
+
+    /**
+     * Check if a discount is valid for the given user
+     *
+     * @param  int|string  $user
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function is_valid_for_user( $user ) {
+
+        // Ensure that the discount is single use.
+        if ( empty( $user ) || ! $this->is_single_use() ) {
+            return true;
+        }
+
+        // Prepare the user id.
+        $user_id = 0;
         if ( is_numeric( $user ) ) {
             $user_id = absint( $user );
         } else if ( is_email( $user ) && $user_data = get_user_by( 'email', $user ) ) {
@@ -1384,117 +1384,117 @@ 
             $user_id = $user_data->ID;
         }
 
-		// Ensure that we have a user.
-		if ( empty( $user_id ) ) {
-			return true;
-		}
+        // Ensure that we have a user.
+        if ( empty( $user_id ) ) {
+            return true;
+        }
 
-		// Get all payments with matching user id.
+        // Get all payments with matching user id.
         $payments = wpinv_get_invoices( array( 'user' => $user_id, 'limit' => false, 'paginate' => false ) );
-		$code     = strtolower( $this->get_code() );
-
-		// For each payment...
-		foreach ( $payments as $payment ) {
-
-			// Only check for paid invoices.
-			if ( $payment->is_paid() && strtolower( $payment->get_discount_code() ) == $code ) {
-				return false;
-			}
-
-		}
-
-		return true;
-	}
-
-	/**
-	 * Deletes the discount from the database
-	 *
-	 * @since 1.0.15
-	 * @return boolean
-	 */
-	public function remove() {
-		return $this->delete();
-	}
-
-	/**
-	 * Increases a discount's usage.
-	 *
-	 * @since 1.0.15
-	 * @param int $by The number of usages to increas by.
-	 * @return int
-	 */
-	public function increase_usage( $by = 1 ) {
-
-		// Abort if zero.
-		if ( empty( $by ) ) {
-			return;
-		}
-
-		// Increase the usage.
-		$this->set_uses( $this->get_uses() + (int) $by );
-
-		// Save the discount.
-		$this->save();
-
-		// Fire relevant hooks.
-		if( (int) $by > 0 ) {
-			do_action( 'wpinv_discount_increase_use_count', $this->get_uses(), $this->get_id(), $this->get_code(),  absint( $by ) );
-		} else {
-			do_action( 'wpinv_discount_decrease_use_count', $this->get_uses(), $this->get_id(), $this->get_code(), absint( $by ) );
-		}
-
-		// Return the number of times the discount has been used.
-		return $this->get_uses();
-	}
-
-	/**
-	 * Alias of self::__toString()
-	 *
-	 * @since 1.0.15
-	 * @return string|false
-	 */
-	public function get_data_as_json() {
-		return $this->__toString();
-	}
-
-	/**
-	 * Returns a discount's discounted amount.
-	 *
-	 * @since 1.0.15
-	 * @param float $amount
-	 * @return float
-	 */
-	public function get_discounted_amount( $amount ) {
-
-		// Convert amount to float.
-		$amount = (float) $amount;
-
-		// Get discount amount.
-		$discount_amount = $this->get_amount();
-
-		if ( empty( $discount_amount ) ) {
-			return 0;
-		}
-
-		// Format the amount.
-		$discount_amount = floatval( wpinv_sanitize_amount( $discount_amount ) );
-
-		// If this is a percentage discount.
-		if ( $this->is_type( 'percent' ) ) {
+        $code     = strtolower( $this->get_code() );
+
+        // For each payment...
+        foreach ( $payments as $payment ) {
+
+            // Only check for paid invoices.
+            if ( $payment->is_paid() && strtolower( $payment->get_discount_code() ) == $code ) {
+                return false;
+            }
+
+        }
+
+        return true;
+    }
+
+    /**
+     * Deletes the discount from the database
+     *
+     * @since 1.0.15
+     * @return boolean
+     */
+    public function remove() {
+        return $this->delete();
+    }
+
+    /**
+     * Increases a discount's usage.
+     *
+     * @since 1.0.15
+     * @param int $by The number of usages to increas by.
+     * @return int
+     */
+    public function increase_usage( $by = 1 ) {
+
+        // Abort if zero.
+        if ( empty( $by ) ) {
+            return;
+        }
+
+        // Increase the usage.
+        $this->set_uses( $this->get_uses() + (int) $by );
+
+        // Save the discount.
+        $this->save();
+
+        // Fire relevant hooks.
+        if( (int) $by > 0 ) {
+            do_action( 'wpinv_discount_increase_use_count', $this->get_uses(), $this->get_id(), $this->get_code(),  absint( $by ) );
+        } else {
+            do_action( 'wpinv_discount_decrease_use_count', $this->get_uses(), $this->get_id(), $this->get_code(), absint( $by ) );
+        }
+
+        // Return the number of times the discount has been used.
+        return $this->get_uses();
+    }
+
+    /**
+     * Alias of self::__toString()
+     *
+     * @since 1.0.15
+     * @return string|false
+     */
+    public function get_data_as_json() {
+        return $this->__toString();
+    }
+
+    /**
+     * Returns a discount's discounted amount.
+     *
+     * @since 1.0.15
+     * @param float $amount
+     * @return float
+     */
+    public function get_discounted_amount( $amount ) {
+
+        // Convert amount to float.
+        $amount = (float) $amount;
+
+        // Get discount amount.
+        $discount_amount = $this->get_amount();
+
+        if ( empty( $discount_amount ) ) {
+            return 0;
+        }
+
+        // Format the amount.
+        $discount_amount = floatval( wpinv_sanitize_amount( $discount_amount ) );
+
+        // If this is a percentage discount.
+        if ( $this->is_type( 'percent' ) ) {
             $discount_amount = $amount * ( $discount_amount / 100 );
-		}
+        }
 
-		// Discount can not be less than zero...
-		if ( $discount_amount < 0 ) {
-			$discount_amount = 0;
-		}
+        // Discount can not be less than zero...
+        if ( $discount_amount < 0 ) {
+            $discount_amount = 0;
+        }
 
-		// ... or more than the amount.
-		if ( $discount_amount > $amount ) {
-			$discount_amount = $amount;
-		}
+        // ... or more than the amount.
+        if ( $discount_amount > $amount ) {
+            $discount_amount = $amount;
+        }
 
-		return apply_filters( 'wpinv_discount_total_discount_amount', $discount_amount, $amount, $this );
-	}
+        return apply_filters( 'wpinv_discount_total_discount_amount', $discount_amount, $amount, $this );
+    }
 
 }

vendor/ayecode/wp-super-duper/wp-super-duper.php

Indentation +2029 added lines, -2029 removed lines

@@ -1,262 +1,262 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 if ( ! class_exists( 'WP_Super_Duper' ) ) {
 
 
-	/**
-	 * A Class to be able to create a Widget, Shortcode or Block to be able to output content for WordPress.
-	 *
-	 * Should not be called direct but extended instead.
-	 *
-	 * Class WP_Super_Duper
-	 * @since 1.0.16 change log moved to file change-log.txt - CHANGED
-	 * @ver 1.0.19
-	 */
-	class WP_Super_Duper extends WP_Widget {
-
-		public $version = "1.0.27";
-		public $font_awesome_icon_version = "5.11.2";
-		public $block_code;
-		public $options;
-		public $base_id;
-		public $settings_hash;
-		public $arguments = array();
-		public $instance = array();
-		private $class_name;
-
-		/**
-		 * The relative url to the current folder.
-		 *
-		 * @var string
-		 */
-		public $url = '';
-
-		/**
-		 * Take the array options and use them to build.
-		 */
-		public function __construct( $options ) {
-			global $sd_widgets;
-
-			$sd_widgets[ $options['base_id'] ] = array(
-				'name'       => $options['name'],
-				'class_name' => $options['class_name']
-			);
-			$this->base_id                     = $options['base_id'];
-			// lets filter the options before we do anything
-			$options       = apply_filters( "wp_super_duper_options", $options );
-			$options       = apply_filters( "wp_super_duper_options_{$this->base_id}", $options );
-			$options       = $this->add_name_from_key( $options );
-			$this->options = $options;
-
-			$this->base_id   = $options['base_id'];
-			$this->arguments = isset( $options['arguments'] ) ? $options['arguments'] : array();
-
-			// init parent
-			parent::__construct( $options['base_id'], $options['name'], $options['widget_ops'] );
-
-			if ( isset( $options['class_name'] ) ) {
-				// register widget
-				$this->class_name = $options['class_name'];
-
-				// register shortcode
-				$this->register_shortcode();
-
-				// Fusion Builder (avada) support
-				if ( function_exists( 'fusion_builder_map' ) ) {
-					add_action( 'init', array( $this, 'register_fusion_element' ) );
-				}
-
-				// register block
-				add_action( 'admin_enqueue_scripts', array( $this, 'register_block' ) );
-			}
-
-			// add the CSS and JS we need ONCE
-			global $sd_widget_scripts;
-
-			if ( ! $sd_widget_scripts ) {
-				wp_add_inline_script( 'admin-widgets', $this->widget_js() );
-				wp_add_inline_script( 'customize-controls', $this->widget_js() );
-				wp_add_inline_style( 'widgets', $this->widget_css() );
-
-				// maybe add elementor editor styles
-				add_action( 'elementor/editor/after_enqueue_styles', array( $this, 'elementor_editor_styles' ) );
-
-				$sd_widget_scripts = true;
-
-				// add shortcode insert button once
-				add_action( 'media_buttons', array( $this, 'shortcode_insert_button' ) );
-				// generatepress theme sections compatibility
-				if ( function_exists( 'generate_sections_sections_metabox' ) ) {
-					add_action( 'generate_sections_metabox', array( $this, 'shortcode_insert_button_script' ) );
-				}
-				if ( $this->is_preview() ) {
-					add_action( 'wp_footer', array( $this, 'shortcode_insert_button_script' ) );
-					// this makes the insert button work for elementor
-					add_action( 'elementor/editor/after_enqueue_scripts', array(
-						$this,
-						'shortcode_insert_button_script'
-					) ); // for elementor
-				}
-				// this makes the insert button work for cornerstone
-				add_action( 'wp_print_footer_scripts', array( __CLASS__, 'maybe_cornerstone_builder' ) );
-
-				add_action( 'wp_ajax_super_duper_get_widget_settings', array( __CLASS__, 'get_widget_settings' ) );
-				add_action( 'wp_ajax_super_duper_get_picker', array( __CLASS__, 'get_picker' ) );
-
-				// add generator text to admin head
-				add_action( 'admin_head', array( $this, 'generator' ) );
-			}
-
-			do_action( 'wp_super_duper_widget_init', $options, $this );
-		}
-
-		/**
-		 * Add our widget CSS to elementor editor.
-		 */
-		public function elementor_editor_styles() {
-			wp_add_inline_style( 'elementor-editor', $this->widget_css( false ) );
-		}
-
-		public function register_fusion_element() {
-
-			$options = $this->options;
-
-			if ( $this->base_id ) {
-
-				$params = $this->get_fusion_params();
-
-				$args = array(
-					'name'            => $options['name'],
-					'shortcode'       => $this->base_id,
-					'icon'            => $options['block-icon'] ? $options['block-icon'] : 'far fa-square',
-					'allow_generator' => true,
-				);
-
-				if ( ! empty( $params ) ) {
-					$args['params'] = $params;
-				}
-
-				fusion_builder_map( $args );
-			}
-
-		}
-
-		public function get_fusion_params() {
-			$params    = array();
-			$arguments = $this->get_arguments();
-
-			if ( ! empty( $arguments ) ) {
-				foreach ( $arguments as $key => $val ) {
-					$param = array();
-					// type
-					$param['type'] = str_replace(
-						array(
-							"text",
-							"number",
-							"email",
-							"color",
-							"checkbox"
-						),
-						array(
-							"textfield",
-							"textfield",
-							"textfield",
-							"colorpicker",
-							"select",
-
-						),
-						$val['type'] );
-
-					// multiselect
-					if ( $val['type'] == 'multiselect' || ( ( $param['type'] == 'select' || $val['type'] == 'select' ) && ! empty( $val['multiple'] ) ) ) {
-						$param['type']     = 'multiple_select';
-						$param['multiple'] = true;
-					}
-
-					// heading
-					$param['heading'] = $val['title'];
-
-					// description
-					$param['description'] = isset( $val['desc'] ) ? $val['desc'] : '';
-
-					// param_name
-					$param['param_name'] = $key;
-
-					// Default
-					$param['default'] = isset( $val['default'] ) ? $val['default'] : '';
-
-					// Group
-					if ( isset( $val['group'] ) ) {
-						$param['group'] = $val['group'];
-					}
-
-					// value
-					if ( $val['type'] == 'checkbox' ) {
-						if ( isset( $val['default'] ) && $val['default'] == '0' ) {
-							unset( $param['default'] );
-						}
-						$param['value'] = array( '' => __( "No" ), '1' => __( "Yes" ) );
-					} elseif ( $param['type'] == 'select' || $param['type'] == 'multiple_select' ) {
-						$param['value'] = isset( $val['options'] ) ? $val['options'] : array();
-					} else {
-						$param['value'] = isset( $val['default'] ) ? $val['default'] : '';
-					}
-
-					// setup the param
-					$params[] = $param;
-
-				}
-			}
-
-
-			return $params;
-		}
-
-		/**
-		 * Maybe insert the shortcode inserter button in the footer if we are in the cornerstone builder
-		 */
-		public static function maybe_cornerstone_builder() {
-			if ( did_action( 'cornerstone_before_boot_app' ) ) {
-				self::shortcode_insert_button_script();
-			}
-		}
-
-		/**
-		 * A function to ge the shortcode builder picker html.
-		 *
-		 * @param string $editor_id
-		 *
-		 * @return string
-		 */
-		public static function get_picker( $editor_id = '' ) {
-
-			ob_start();
-			if ( isset( $_POST['editor_id'] ) ) {
-				$editor_id = esc_attr( $_POST['editor_id'] );
-			} elseif ( isset( $_REQUEST['et_fb'] ) ) {
-				$editor_id = 'main_content_content_vb_tiny_mce';
-			}
-
-			global $sd_widgets;
-			?>
+    /**
+     * A Class to be able to create a Widget, Shortcode or Block to be able to output content for WordPress.
+     *
+     * Should not be called direct but extended instead.
+     *
+     * Class WP_Super_Duper
+     * @since 1.0.16 change log moved to file change-log.txt - CHANGED
+     * @ver 1.0.19
+     */
+    class WP_Super_Duper extends WP_Widget {
+
+        public $version = "1.0.27";
+        public $font_awesome_icon_version = "5.11.2";
+        public $block_code;
+        public $options;
+        public $base_id;
+        public $settings_hash;
+        public $arguments = array();
+        public $instance = array();
+        private $class_name;
+
+        /**
+         * The relative url to the current folder.
+         *
+         * @var string
+         */
+        public $url = '';
+
+        /**
+         * Take the array options and use them to build.
+         */
+        public function __construct( $options ) {
+            global $sd_widgets;
+
+            $sd_widgets[ $options['base_id'] ] = array(
+                'name'       => $options['name'],
+                'class_name' => $options['class_name']
+            );
+            $this->base_id                     = $options['base_id'];
+            // lets filter the options before we do anything
+            $options       = apply_filters( "wp_super_duper_options", $options );
+            $options       = apply_filters( "wp_super_duper_options_{$this->base_id}", $options );
+            $options       = $this->add_name_from_key( $options );
+            $this->options = $options;
+
+            $this->base_id   = $options['base_id'];
+            $this->arguments = isset( $options['arguments'] ) ? $options['arguments'] : array();
+
+            // init parent
+            parent::__construct( $options['base_id'], $options['name'], $options['widget_ops'] );
+
+            if ( isset( $options['class_name'] ) ) {
+                // register widget
+                $this->class_name = $options['class_name'];
+
+                // register shortcode
+                $this->register_shortcode();
+
+                // Fusion Builder (avada) support
+                if ( function_exists( 'fusion_builder_map' ) ) {
+                    add_action( 'init', array( $this, 'register_fusion_element' ) );
+                }
+
+                // register block
+                add_action( 'admin_enqueue_scripts', array( $this, 'register_block' ) );
+            }
+
+            // add the CSS and JS we need ONCE
+            global $sd_widget_scripts;
+
+            if ( ! $sd_widget_scripts ) {
+                wp_add_inline_script( 'admin-widgets', $this->widget_js() );
+                wp_add_inline_script( 'customize-controls', $this->widget_js() );
+                wp_add_inline_style( 'widgets', $this->widget_css() );
+
+                // maybe add elementor editor styles
+                add_action( 'elementor/editor/after_enqueue_styles', array( $this, 'elementor_editor_styles' ) );
+
+                $sd_widget_scripts = true;
+
+                // add shortcode insert button once
+                add_action( 'media_buttons', array( $this, 'shortcode_insert_button' ) );
+                // generatepress theme sections compatibility
+                if ( function_exists( 'generate_sections_sections_metabox' ) ) {
+                    add_action( 'generate_sections_metabox', array( $this, 'shortcode_insert_button_script' ) );
+                }
+                if ( $this->is_preview() ) {
+                    add_action( 'wp_footer', array( $this, 'shortcode_insert_button_script' ) );
+                    // this makes the insert button work for elementor
+                    add_action( 'elementor/editor/after_enqueue_scripts', array(
+                        $this,
+                        'shortcode_insert_button_script'
+                    ) ); // for elementor
+                }
+                // this makes the insert button work for cornerstone
+                add_action( 'wp_print_footer_scripts', array( __CLASS__, 'maybe_cornerstone_builder' ) );
+
+                add_action( 'wp_ajax_super_duper_get_widget_settings', array( __CLASS__, 'get_widget_settings' ) );
+                add_action( 'wp_ajax_super_duper_get_picker', array( __CLASS__, 'get_picker' ) );
+
+                // add generator text to admin head
+                add_action( 'admin_head', array( $this, 'generator' ) );
+            }
+
+            do_action( 'wp_super_duper_widget_init', $options, $this );
+        }
+
+        /**
+         * Add our widget CSS to elementor editor.
+         */
+        public function elementor_editor_styles() {
+            wp_add_inline_style( 'elementor-editor', $this->widget_css( false ) );
+        }
+
+        public function register_fusion_element() {
+
+            $options = $this->options;
+
+            if ( $this->base_id ) {
+
+                $params = $this->get_fusion_params();
+
+                $args = array(
+                    'name'            => $options['name'],
+                    'shortcode'       => $this->base_id,
+                    'icon'            => $options['block-icon'] ? $options['block-icon'] : 'far fa-square',
+                    'allow_generator' => true,
+                );
+
+                if ( ! empty( $params ) ) {
+                    $args['params'] = $params;
+                }
+
+                fusion_builder_map( $args );
+            }
+
+        }
+
+        public function get_fusion_params() {
+            $params    = array();
+            $arguments = $this->get_arguments();
+
+            if ( ! empty( $arguments ) ) {
+                foreach ( $arguments as $key => $val ) {
+                    $param = array();
+                    // type
+                    $param['type'] = str_replace(
+                        array(
+                            "text",
+                            "number",
+                            "email",
+                            "color",
+                            "checkbox"
+                        ),
+                        array(
+                            "textfield",
+                            "textfield",
+                            "textfield",
+                            "colorpicker",
+                            "select",
+
+                        ),
+                        $val['type'] );
+
+                    // multiselect
+                    if ( $val['type'] == 'multiselect' || ( ( $param['type'] == 'select' || $val['type'] == 'select' ) && ! empty( $val['multiple'] ) ) ) {
+                        $param['type']     = 'multiple_select';
+                        $param['multiple'] = true;
+                    }
+
+                    // heading
+                    $param['heading'] = $val['title'];
+
+                    // description
+                    $param['description'] = isset( $val['desc'] ) ? $val['desc'] : '';
+
+                    // param_name
+                    $param['param_name'] = $key;
+
+                    // Default
+                    $param['default'] = isset( $val['default'] ) ? $val['default'] : '';
+
+                    // Group
+                    if ( isset( $val['group'] ) ) {
+                        $param['group'] = $val['group'];
+                    }
+
+                    // value
+                    if ( $val['type'] == 'checkbox' ) {
+                        if ( isset( $val['default'] ) && $val['default'] == '0' ) {
+                            unset( $param['default'] );
+                        }
+                        $param['value'] = array( '' => __( "No" ), '1' => __( "Yes" ) );
+                    } elseif ( $param['type'] == 'select' || $param['type'] == 'multiple_select' ) {
+                        $param['value'] = isset( $val['options'] ) ? $val['options'] : array();
+                    } else {
+                        $param['value'] = isset( $val['default'] ) ? $val['default'] : '';
+                    }
+
+                    // setup the param
+                    $params[] = $param;
+
+                }
+            }
+
+
+            return $params;
+        }
+
+        /**
+         * Maybe insert the shortcode inserter button in the footer if we are in the cornerstone builder
+         */
+        public static function maybe_cornerstone_builder() {
+            if ( did_action( 'cornerstone_before_boot_app' ) ) {
+                self::shortcode_insert_button_script();
+            }
+        }
+
+        /**
+         * A function to ge the shortcode builder picker html.
+         *
+         * @param string $editor_id
+         *
+         * @return string
+         */
+        public static function get_picker( $editor_id = '' ) {
+
+            ob_start();
+            if ( isset( $_POST['editor_id'] ) ) {
+                $editor_id = esc_attr( $_POST['editor_id'] );
+            } elseif ( isset( $_REQUEST['et_fb'] ) ) {
+                $editor_id = 'main_content_content_vb_tiny_mce';
+            }
+
+            global $sd_widgets;
+            ?>
 
 			<div class="sd-shortcode-left-wrap">
 				<?php
-				ksort( $sd_widgets );
-				//				print_r($sd_widgets);exit;
-				if ( ! empty( $sd_widgets ) ) {
-					echo '<select class="widefat" onchange="sd_get_shortcode_options(this);">';
-					echo "<option>" . __( 'Select shortcode' ) . "</option>";
-					foreach ( $sd_widgets as $shortcode => $class ) {
-						echo "<option value='" . esc_attr( $shortcode ) . "'>" . esc_attr( $shortcode ) . " (" . esc_attr( $class['name'] ) . ")</option>";
-					}
-					echo "</select>";
-
-				}
-				?>
+                ksort( $sd_widgets );
+                //				print_r($sd_widgets);exit;
+                if ( ! empty( $sd_widgets ) ) {
+                    echo '<select class="widefat" onchange="sd_get_shortcode_options(this);">';
+                    echo "<option>" . __( 'Select shortcode' ) . "</option>";
+                    foreach ( $sd_widgets as $shortcode => $class ) {
+                        echo "<option value='" . esc_attr( $shortcode ) . "'>" . esc_attr( $shortcode ) . " (" . esc_attr( $class['name'] ) . ")</option>";
+                    }
+                    echo "</select>";
+
+                }
+                ?>
 				<div class="sd-shortcode-settings"></div>
 
 			</div>
@@ -267,8 +267,8 @@ 
 					<?php if ( $editor_id != '' ) { ?>
 						<button class="button sd-insert-shortcode-button"
 						        onclick="sd_insert_shortcode(<?php if ( ! empty( $editor_id ) ) {
-							        echo "'" . $editor_id . "'";
-						        } ?>)"><?php _e( 'Insert shortcode' ); ?></button>
+                                    echo "'" . $editor_id . "'";
+                                } ?>)"><?php _e( 'Insert shortcode' ); ?></button>
 					<?php } ?>
 					<button class="button"
 					        onclick="sd_copy_to_clipboard()"><?php _e( 'Copy shortcode' ); ?></button>
@@ -276,134 +276,134 @@ 
 			</div>
 			<?php
 
-			$html = ob_get_clean();
-
-			if ( wp_doing_ajax() ) {
-				echo $html;
-				$should_die = true;
-
-				// some builder get the editor via ajax so we should not die on those occasions
-				$dont_die = array(
-					'parent_tag',// WP Bakery
-					'avia_request' // enfold
-				);
-
-				foreach ( $dont_die as $request ) {
-					if ( isset( $_REQUEST[ $request ] ) ) {
-						$should_die = false;
-					}
-				}
-
-				if ( $should_die ) {
-					wp_die();
-				}
-
-			} else {
-				return $html;
-			}
-
-			return '';
-
-		}
-
-		/**
-		 * Output the version in the admin header.
-		 */
-		public function generator() {
-			echo '<meta name="generator" content="WP Super Duper v' . $this->version . '" />';
-		}
-
-		/**
-		 * Get widget settings.
-		 *
-		 * @since 1.0.0
-		 */
-		public static function get_widget_settings() {
-			global $sd_widgets;
-
-			$shortcode = isset( $_REQUEST['shortcode'] ) && $_REQUEST['shortcode'] ? sanitize_title_with_dashes( $_REQUEST['shortcode'] ) : '';
-			if ( ! $shortcode ) {
-				wp_die();
-			}
-			$widget_args = isset( $sd_widgets[ $shortcode ] ) ? $sd_widgets[ $shortcode ] : '';
-			if ( ! $widget_args ) {
-				wp_die();
-			}
-			$class_name = isset( $widget_args['class_name'] ) && $widget_args['class_name'] ? $widget_args['class_name'] : '';
-			if ( ! $class_name ) {
-				wp_die();
-			}
-
-			// invoke an instance method
-			$widget = new $class_name;
-
-			ob_start();
-			$widget->form( array() );
-			$form = ob_get_clean();
-			echo "<form id='$shortcode'>" . $form . "<div class=\"widget-control-save\"></div></form>";
-			echo "<style>" . $widget->widget_css() . "</style>";
-			echo "<script>" . $widget->widget_js() . "</script>";
-			?>
+            $html = ob_get_clean();
+
+            if ( wp_doing_ajax() ) {
+                echo $html;
+                $should_die = true;
+
+                // some builder get the editor via ajax so we should not die on those occasions
+                $dont_die = array(
+                    'parent_tag',// WP Bakery
+                    'avia_request' // enfold
+                );
+
+                foreach ( $dont_die as $request ) {
+                    if ( isset( $_REQUEST[ $request ] ) ) {
+                        $should_die = false;
+                    }
+                }
+
+                if ( $should_die ) {
+                    wp_die();
+                }
+
+            } else {
+                return $html;
+            }
+
+            return '';
+
+        }
+
+        /**
+         * Output the version in the admin header.
+         */
+        public function generator() {
+            echo '<meta name="generator" content="WP Super Duper v' . $this->version . '" />';
+        }
+
+        /**
+         * Get widget settings.
+         *
+         * @since 1.0.0
+         */
+        public static function get_widget_settings() {
+            global $sd_widgets;
+
+            $shortcode = isset( $_REQUEST['shortcode'] ) && $_REQUEST['shortcode'] ? sanitize_title_with_dashes( $_REQUEST['shortcode'] ) : '';
+            if ( ! $shortcode ) {
+                wp_die();
+            }
+            $widget_args = isset( $sd_widgets[ $shortcode ] ) ? $sd_widgets[ $shortcode ] : '';
+            if ( ! $widget_args ) {
+                wp_die();
+            }
+            $class_name = isset( $widget_args['class_name'] ) && $widget_args['class_name'] ? $widget_args['class_name'] : '';
+            if ( ! $class_name ) {
+                wp_die();
+            }
+
+            // invoke an instance method
+            $widget = new $class_name;
+
+            ob_start();
+            $widget->form( array() );
+            $form = ob_get_clean();
+            echo "<form id='$shortcode'>" . $form . "<div class=\"widget-control-save\"></div></form>";
+            echo "<style>" . $widget->widget_css() . "</style>";
+            echo "<script>" . $widget->widget_js() . "</script>";
+            ?>
 			<?php
-			wp_die();
-		}
-
-		/**
-		 * Insert shortcode builder button to classic editor (not inside Gutenberg, not needed).
-		 *
-		 * @since 1.0.0
-		 *
-		 * @param string $editor_id Optional. Shortcode editor id. Default null.
-		 * @param string $insert_shortcode_function Optional. Insert shortcode function. Default null.
-		 */
-		public static function shortcode_insert_button( $editor_id = '', $insert_shortcode_function = '' ) {
-			global $sd_widgets, $shortcode_insert_button_once;
-			if ( $shortcode_insert_button_once ) {
-				return;
-			}
-			add_thickbox();
-
-
-			/**
-			 * Cornerstone makes us play dirty tricks :/
-			 * All media_buttons are removed via JS unless they are two specific id's so we wrap our content in this ID so it is not removed.
-			 */
-			if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
-				echo '<span id="insert-media-button">';
-			}
-
-			echo self::shortcode_button( 'this', 'true' );
-
-			// see opening note
-			if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
-				echo '</span>'; // end #insert-media-button
-			}
-
-			// Add separate script for generatepress theme sections
-			if ( function_exists( 'generate_sections_sections_metabox' ) && did_action( 'generate_sections_metabox' ) ) {
-			} else {
-				self::shortcode_insert_button_script( $editor_id, $insert_shortcode_function );
-			}
-
-			$shortcode_insert_button_once = true;
-		}
-
-		/**
-		 * Gets the shortcode insert button html.
-		 *
-		 * @param string $id
-		 * @param string $search_for_id
-		 *
-		 * @return mixed
-		 */
-		public static function shortcode_button( $id = '', $search_for_id = '' ) {
-			ob_start();
-			?>
+            wp_die();
+        }
+
+        /**
+         * Insert shortcode builder button to classic editor (not inside Gutenberg, not needed).
+         *
+         * @since 1.0.0
+         *
+         * @param string $editor_id Optional. Shortcode editor id. Default null.
+         * @param string $insert_shortcode_function Optional. Insert shortcode function. Default null.
+         */
+        public static function shortcode_insert_button( $editor_id = '', $insert_shortcode_function = '' ) {
+            global $sd_widgets, $shortcode_insert_button_once;
+            if ( $shortcode_insert_button_once ) {
+                return;
+            }
+            add_thickbox();
+
+
+            /**
+             * Cornerstone makes us play dirty tricks :/
+             * All media_buttons are removed via JS unless they are two specific id's so we wrap our content in this ID so it is not removed.
+             */
+            if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
+                echo '<span id="insert-media-button">';
+            }
+
+            echo self::shortcode_button( 'this', 'true' );
+
+            // see opening note
+            if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
+                echo '</span>'; // end #insert-media-button
+            }
+
+            // Add separate script for generatepress theme sections
+            if ( function_exists( 'generate_sections_sections_metabox' ) && did_action( 'generate_sections_metabox' ) ) {
+            } else {
+                self::shortcode_insert_button_script( $editor_id, $insert_shortcode_function );
+            }
+
+            $shortcode_insert_button_once = true;
+        }
+
+        /**
+         * Gets the shortcode insert button html.
+         *
+         * @param string $id
+         * @param string $search_for_id
+         *
+         * @return mixed
+         */
+        public static function shortcode_button( $id = '', $search_for_id = '' ) {
+            ob_start();
+            ?>
 			<span class="sd-lable-shortcode-inserter">
 				<a onclick="sd_ajax_get_picker(<?php echo $id;
-				if ( $search_for_id ) {
-					echo "," . $search_for_id;
-				} ?>);" href="#TB_inline?width=100%&height=550&inlineId=super-duper-content-ajaxed"
+                if ( $search_for_id ) {
+                    echo "," . $search_for_id;
+                } ?>);" href="#TB_inline?width=100%&height=550&inlineId=super-duper-content-ajaxed"
 				   class="thickbox button super-duper-content-open" title="Add Shortcode">
 					<span style="vertical-align: middle;line-height: 18px;font-size: 20px;"
 					      class="dashicons dashicons-screenoptions"></span>
@@ -414,21 +414,21 @@ 
 			</span>
 
 			<?php
-			$html = ob_get_clean();
-
-			// remove line breaks so we can use it in js
-			return preg_replace( "/\r|\n/", "", trim( $html ) );
-		}
-
-		/**
-		 * Makes SD work with the siteOrigin page builder.
-		 *
-		 * @since 1.0.6
-		 * @return mixed
-		 */
-		public static function siteorigin_js() {
-			ob_start();
-			?>
+            $html = ob_get_clean();
+
+            // remove line breaks so we can use it in js
+            return preg_replace( "/\r|\n/", "", trim( $html ) );
+        }
+
+        /**
+         * Makes SD work with the siteOrigin page builder.
+         *
+         * @since 1.0.6
+         * @return mixed
+         */
+        public static function siteorigin_js() {
+            ob_start();
+            ?>
 			<script>
 				/**
 				 * Check a form to see what items should be shown or hidden.
@@ -506,28 +506,28 @@ 
 				});
 			</script>
 			<?php
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', $output );
-		}
-
-		/**
-		 * Output the JS and CSS for the shortcode insert button.
-		 *
-		 * @since 1.0.6
-		 *
-		 * @param string $editor_id
-		 * @param string $insert_shortcode_function
-		 */
-		public static function shortcode_insert_button_script( $editor_id = '', $insert_shortcode_function = '' ) {
-			?>
+            return str_replace( array(
+                '<script>',
+                '</script>'
+            ), '', $output );
+        }
+
+        /**
+         * Output the JS and CSS for the shortcode insert button.
+         *
+         * @since 1.0.6
+         *
+         * @param string $editor_id
+         * @param string $insert_shortcode_function
+         */
+        public static function shortcode_insert_button_script( $editor_id = '', $insert_shortcode_function = '' ) {
+            ?>
 			<style>
 				.sd-shortcode-left-wrap {
 					float: left;
@@ -653,35 +653,35 @@ 
 				<?php } ?>
 			</style>
 			<?php
-			if ( class_exists( 'SiteOrigin_Panels' ) ) {
-				echo "<script>" . self::siteorigin_js() . "</script>";
-			}
-			?>
+            if ( class_exists( 'SiteOrigin_Panels' ) ) {
+                echo "<script>" . self::siteorigin_js() . "</script>";
+            }
+            ?>
 			<script>
 				<?php
-				if(! empty( $insert_shortcode_function )){
-					echo $insert_shortcode_function;
-				}else{
-
-				/**
-				 * Function for super duper insert shortcode.
-				 *
-				 * @since 1.0.0
-				 */
-				?>
+                if(! empty( $insert_shortcode_function )){
+                    echo $insert_shortcode_function;
+                }else{
+
+                /**
+                 * Function for super duper insert shortcode.
+                 *
+                 * @since 1.0.0
+                 */
+                ?>
 				function sd_insert_shortcode($editor_id) {
 					$shortcode = jQuery('#TB_ajaxContent #sd-shortcode-output').val();
 					if ($shortcode) {
 						if (!$editor_id) {
 							<?php
-							if ( isset( $_REQUEST['et_fb'] ) ) {
-								echo '$editor_id = "#main_content_content_vb_tiny_mce";';
-							} elseif ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) {
-								echo '$editor_id = "#elementor-controls .wp-editor-container textarea";';
-							} else {
-								echo '$editor_id = "#wp-content-editor-container textarea";';
-							}
-							?>
+                            if ( isset( $_REQUEST['et_fb'] ) ) {
+                                echo '$editor_id = "#main_content_content_vb_tiny_mce";';
+                            } elseif ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) {
+                                echo '$editor_id = "#elementor-controls .wp-editor-container textarea";';
+                            } else {
+                                echo '$editor_id = "#wp-content-editor-container textarea";';
+                            }
+                            ?>
 						} else {
 							$editor_id = '#' + $editor_id;
 						}
@@ -1007,18 +1007,18 @@ 
 
 			</script>
 			<?php
-		}
-
-		/**
-		 * Gets some CSS for the widgets screen.
-		 *
-		 * @param bool $advanced If we should include advanced CSS.
-		 *
-		 * @return mixed
-		 */
-		public function widget_css( $advanced = true ) {
-			ob_start();
-			?>
+        }
+
+        /**
+         * Gets some CSS for the widgets screen.
+         *
+         * @param bool $advanced If we should include advanced CSS.
+         *
+         * @return mixed
+         */
+        public function widget_css( $advanced = true ) {
+            ob_start();
+            ?>
 			<style>
 				<?php if( $advanced ){ ?>
 				.sd-advanced-setting {
@@ -1056,26 +1056,26 @@ 
 				}
 			</style>
 			<?php
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<style>',
-				'</style>'
-			), '', $output );
-		}
-
-		/**
-		 * Gets some JS for the widgets screen.
-		 *
-		 * @return mixed
-		 */
-		public function widget_js() {
-			ob_start();
-			?>
+            return str_replace( array(
+                '<style>',
+                '</style>'
+            ), '', $output );
+        }
+
+        /**
+         * Gets some JS for the widgets screen.
+         *
+         * @return mixed
+         */
+        public function widget_js() {
+            ob_start();
+            ?>
 			<script>
 
 				/**
@@ -1233,420 +1233,420 @@ 
 				<?php do_action( 'wp_super_duper_widget_js', $this ); ?>
 			</script>
 			<?php
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', $output );
-		}
-
-
-		/**
-		 * Set the name from the argument key.
-		 *
-		 * @param $options
-		 *
-		 * @return mixed
-		 */
-		private function add_name_from_key( $options, $arguments = false ) {
-			if ( ! empty( $options['arguments'] ) ) {
-				foreach ( $options['arguments'] as $key => $val ) {
-					$options['arguments'][ $key ]['name'] = $key;
-				}
-			} elseif ( $arguments && is_array( $options ) && ! empty( $options ) ) {
-				foreach ( $options as $key => $val ) {
-					$options[ $key ]['name'] = $key;
-				}
-			}
-
-			return $options;
-		}
-
-		/**
-		 * Register the parent shortcode.
-		 *
-		 * @since 1.0.0
-		 */
-		public function register_shortcode() {
-			add_shortcode( $this->base_id, array( $this, 'shortcode_output' ) );
-			add_action( 'wp_ajax_super_duper_output_shortcode', array( $this, 'render_shortcode' ) );
-		}
-
-		/**
-		 * Render the shortcode via ajax so we can return it to Gutenberg.
-		 *
-		 * @since 1.0.0
-		 */
-		public function render_shortcode() {
-			check_ajax_referer( 'super_duper_output_shortcode', '_ajax_nonce', true );
-			if ( ! current_user_can( 'manage_options' ) ) {
-				wp_die();
-			}
-
-			// we might need the $post value here so lets set it.
-			if ( isset( $_POST['post_id'] ) && $_POST['post_id'] ) {
-				$post_obj = get_post( absint( $_POST['post_id'] ) );
-				if ( ! empty( $post_obj ) && empty( $post ) ) {
-					global $post;
-					$post = $post_obj;
-				}
-			}
-
-			if ( isset( $_POST['shortcode'] ) && $_POST['shortcode'] ) {
-				$is_preview = $this->is_preview();
-				$shortcode_name   = sanitize_title_with_dashes( $_POST['shortcode'] );
-				$attributes_array = isset( $_POST['attributes'] ) && $_POST['attributes'] ? $_POST['attributes'] : array();
-				$attributes       = '';
-				if ( ! empty( $attributes_array ) ) {
-					foreach ( $attributes_array as $key => $value ) {
-						if ( is_array( $value ) ) {
-							$value = implode( ",", $value );
-						}
-
-						if ( ! empty( $value ) ) {
-							$value = wp_unslash( $value );
-
-							// Encode [ and ].
-							if ( $is_preview ) {
-								$value = $this->encode_shortcodes( $value );
-							}
-						}
-						$attributes .= " " . sanitize_title_with_dashes( $key ) . "='" . esc_attr( $value ) . "' ";
-					}
-				}
-
-				$shortcode = "[" . $shortcode_name . " " . $attributes . "]";
-
-				$content = do_shortcode( $shortcode );
-
-				// Decode [ and ].
-				if ( ! empty( $content ) && $is_preview ) {
-					$content = $this->decode_shortcodes( $content );
-				}
-
-				echo $content;
-			}
-			wp_die();
-		}
-
-		/**
-		 * Output the shortcode.
-		 *
-		 * @param array $args
-		 * @param string $content
-		 *
-		 * @return string
-		 */
-		public function shortcode_output( $args = array(), $content = '' ) {
-			$args = $this->argument_values( $args );
-
-			// add extra argument so we know its a output to gutenberg
-			//$args
-			$args = $this->string_to_bool( $args );
-
-			// if we have a enclosed shortcode we add it to the special `html` argument
-			if ( ! empty( $content ) ) {
-				$args['html'] = $content;
-			}
-
-			$class = isset( $this->options['widget_ops']['classname'] ) ? esc_attr( $this->options['widget_ops']['classname'] ) : '';
-			$class .= " sdel-".$this->get_instance_hash();
-
-			$class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
-			$class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
-
-			$attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
-			$attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
-
-			$shortcode_args = array();
-			$output         = '';
-			$no_wrap        = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
-			if ( isset( $args['no_wrap'] ) && $args['no_wrap'] ) {
-				$no_wrap = true;
-			}
-			$main_content = $this->output( $args, $shortcode_args, $content );
-			if ( $main_content && ! $no_wrap ) {
-				// wrap the shortcode in a div with the same class as the widget
-				$output .= '<div class="' . $class . '" ' . $attrs . '>';
-				if ( ! empty( $args['title'] ) ) {
-					// if its a shortcode and there is a title try to grab the title wrappers
-					$shortcode_args = array( 'before_title' => '', 'after_title' => '' );
-					if ( empty( $instance ) ) {
-						global $wp_registered_sidebars;
-						if ( ! empty( $wp_registered_sidebars ) ) {
-							foreach ( $wp_registered_sidebars as $sidebar ) {
-								if ( ! empty( $sidebar['before_title'] ) ) {
-									$shortcode_args['before_title'] = $sidebar['before_title'];
-									$shortcode_args['after_title']  = $sidebar['after_title'];
-									break;
-								}
-							}
-						}
-					}
-					$output .= $this->output_title( $shortcode_args, $args );
-				}
-				$output .= $main_content;
-				$output .= '</div>';
-			} elseif ( $main_content && $no_wrap ) {
-				$output .= $main_content;
-			}
-
-			// if preview show a placeholder if empty
-			if ( $this->is_preview() && $output == '' ) {
-				$output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
-			}
-
-			return apply_filters( 'wp_super_duper_widget_output', $output, $args, $shortcode_args, $this );
-		}
-
-		/**
-		 * Placeholder text to show if output is empty and we are on a preview/builder page.
-		 *
-		 * @param string $name
-		 *
-		 * @return string
-		 */
-		public function preview_placeholder_text( $name = '' ) {
-			return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . sprintf( __( 'Placeholder for: %s' ), $name ) . "</div>";
-		}
-
-		/**
-		 * Sometimes booleans values can be turned to strings, so we fix that.
-		 *
-		 * @param $options
-		 *
-		 * @return mixed
-		 */
-		public function string_to_bool( $options ) {
-			// convert bool strings to booleans
-			foreach ( $options as $key => $val ) {
-				if ( $val == 'false' ) {
-					$options[ $key ] = false;
-				} elseif ( $val == 'true' ) {
-					$options[ $key ] = true;
-				}
-			}
-
-			return $options;
-		}
-
-		/**
-		 * Get the argument values that are also filterable.
-		 *
-		 * @param $instance
-		 *
-		 * @since 1.0.12 Don't set checkbox default value if the value is empty.
-		 *
-		 * @return array
-		 */
-		public function argument_values( $instance ) {
-			$argument_values = array();
-
-			// set widget instance
-			$this->instance = $instance;
-
-			if ( empty( $this->arguments ) ) {
-				$this->arguments = $this->get_arguments();
-			}
-
-			if ( ! empty( $this->arguments ) ) {
-				foreach ( $this->arguments as $key => $args ) {
-					// set the input name from the key
-					$args['name'] = $key;
-					//
-					$argument_values[ $key ] = isset( $instance[ $key ] ) ? $instance[ $key ] : '';
-					if ( $args['type'] == 'checkbox' && $argument_values[ $key ] == '' ) {
-						// don't set default for an empty checkbox
-					} elseif ( $argument_values[ $key ] == '' && isset( $args['default'] ) ) {
-						$argument_values[ $key ] = $args['default'];
-					}
-				}
-			}
-
-			return $argument_values;
-		}
-
-		/**
-		 * Set arguments in super duper.
-		 *
-		 * @since 1.0.0
-		 *
-		 * @return array Set arguments.
-		 */
-		public function set_arguments() {
-			return $this->arguments;
-		}
-
-		/**
-		 * Get arguments in super duper.
-		 *
-		 * @since 1.0.0
-		 *
-		 * @return array Get arguments.
-		 */
-		public function get_arguments() {
-			if ( empty( $this->arguments ) ) {
-				$this->arguments = $this->set_arguments();
-			}
-
-			$this->arguments = apply_filters( 'wp_super_duper_arguments', $this->arguments, $this->options, $this->instance );
-			$this->arguments = $this->add_name_from_key( $this->arguments, true );
-
-			return $this->arguments;
-		}
-
-		/**
-		 * This is the main output class for all 3 items, widget, shortcode and block, it is extended in the calling class.
-		 *
-		 * @param array $args
-		 * @param array $widget_args
-		 * @param string $content
-		 */
-		public function output( $args = array(), $widget_args = array(), $content = '' ) {
-
-		}
-
-		/**
-		 * Add the dynamic block code inline when the wp-block in enqueued.
-		 */
-		public function register_block() {
-			wp_add_inline_script( 'wp-blocks', $this->block() );
-			if ( class_exists( 'SiteOrigin_Panels' ) ) {
-				wp_add_inline_script( 'wp-blocks', $this->siteorigin_js() );
-			}
-		}
-
-		/**
-		 * Check if we need to show advanced options.
-		 *
-		 * @return bool
-		 */
-		public function block_show_advanced() {
-
-			$show      = false;
-			$arguments = $this->arguments;
-
-			if ( empty( $arguments ) ) {
-				$arguments = $this->get_arguments();
-			}
-
-			if ( ! empty( $arguments ) ) {
-				foreach ( $arguments as $argument ) {
-					if ( isset( $argument['advanced'] ) && $argument['advanced'] ) {
-						$show = true;
-						break; // no need to continue if we know we have it
-					}
-				}
-			}
-
-			return $show;
-		}
-
-		/**
-		 * Get the url path to the current folder.
-		 *
-		 * @return string
-		 */
-		public function get_url() {
-
-			$url = $this->url;
-
-			if ( ! $url ) {
-				// check if we are inside a plugin
-				$file_dir = str_replace( "/includes", "", dirname( __FILE__ ) );
-
-				$dir_parts = explode( "/wp-content/", $file_dir );
-				$url_parts = explode( "/wp-content/", plugins_url() );
-
-				if ( ! empty( $url_parts[0] ) && ! empty( $dir_parts[1] ) ) {
-					$url       = trailingslashit( $url_parts[0] . "/wp-content/" . $dir_parts[1] );
-					$this->url = $url;
-				}
-			}
-
-
-			return $url;
-		}
-
-		/**
-		 * Generate the block icon.
-		 *
-		 * Enables the use of Font Awesome icons.
-		 *
-		 * @note xlink:href is actually deprecated but href is not supported by all so we use both.
-		 *
-		 * @param $icon
-		 *
-		 * @since 1.1.0
-		 * @return string
-		 */
-		public function get_block_icon( $icon ) {
-
-			// check if we have a Font Awesome icon
-			$fa_type = '';
-			if ( substr( $icon, 0, 7 ) === "fas fa-" ) {
-				$fa_type = 'solid';
-			} elseif ( substr( $icon, 0, 7 ) === "far fa-" ) {
-				$fa_type = 'regular';
-			} elseif ( substr( $icon, 0, 7 ) === "fab fa-" ) {
-				$fa_type = 'brands';
-			} else {
-				$icon = "'" . $icon . "'";
-			}
-
-			// set the icon if we found one
-			if ( $fa_type ) {
-				$fa_icon = str_replace( array( "fas fa-", "far fa-", "fab fa-" ), "", $icon );
-				$icon    = "el('svg',{width: 20, height: 20, viewBox: '0 0 20 20'},el('use', {'xlink:href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "','href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "'}))";
-			}
-
-			return $icon;
-		}
-
-		public function group_arguments( $arguments ) {
+            return str_replace( array(
+                '<script>',
+                '</script>'
+            ), '', $output );
+        }
+
+
+        /**
+         * Set the name from the argument key.
+         *
+         * @param $options
+         *
+         * @return mixed
+         */
+        private function add_name_from_key( $options, $arguments = false ) {
+            if ( ! empty( $options['arguments'] ) ) {
+                foreach ( $options['arguments'] as $key => $val ) {
+                    $options['arguments'][ $key ]['name'] = $key;
+                }
+            } elseif ( $arguments && is_array( $options ) && ! empty( $options ) ) {
+                foreach ( $options as $key => $val ) {
+                    $options[ $key ]['name'] = $key;
+                }
+            }
+
+            return $options;
+        }
+
+        /**
+         * Register the parent shortcode.
+         *
+         * @since 1.0.0
+         */
+        public function register_shortcode() {
+            add_shortcode( $this->base_id, array( $this, 'shortcode_output' ) );
+            add_action( 'wp_ajax_super_duper_output_shortcode', array( $this, 'render_shortcode' ) );
+        }
+
+        /**
+         * Render the shortcode via ajax so we can return it to Gutenberg.
+         *
+         * @since 1.0.0
+         */
+        public function render_shortcode() {
+            check_ajax_referer( 'super_duper_output_shortcode', '_ajax_nonce', true );
+            if ( ! current_user_can( 'manage_options' ) ) {
+                wp_die();
+            }
+
+            // we might need the $post value here so lets set it.
+            if ( isset( $_POST['post_id'] ) && $_POST['post_id'] ) {
+                $post_obj = get_post( absint( $_POST['post_id'] ) );
+                if ( ! empty( $post_obj ) && empty( $post ) ) {
+                    global $post;
+                    $post = $post_obj;
+                }
+            }
+
+            if ( isset( $_POST['shortcode'] ) && $_POST['shortcode'] ) {
+                $is_preview = $this->is_preview();
+                $shortcode_name   = sanitize_title_with_dashes( $_POST['shortcode'] );
+                $attributes_array = isset( $_POST['attributes'] ) && $_POST['attributes'] ? $_POST['attributes'] : array();
+                $attributes       = '';
+                if ( ! empty( $attributes_array ) ) {
+                    foreach ( $attributes_array as $key => $value ) {
+                        if ( is_array( $value ) ) {
+                            $value = implode( ",", $value );
+                        }
+
+                        if ( ! empty( $value ) ) {
+                            $value = wp_unslash( $value );
+
+                            // Encode [ and ].
+                            if ( $is_preview ) {
+                                $value = $this->encode_shortcodes( $value );
+                            }
+                        }
+                        $attributes .= " " . sanitize_title_with_dashes( $key ) . "='" . esc_attr( $value ) . "' ";
+                    }
+                }
+
+                $shortcode = "[" . $shortcode_name . " " . $attributes . "]";
+
+                $content = do_shortcode( $shortcode );
+
+                // Decode [ and ].
+                if ( ! empty( $content ) && $is_preview ) {
+                    $content = $this->decode_shortcodes( $content );
+                }
+
+                echo $content;
+            }
+            wp_die();
+        }
+
+        /**
+         * Output the shortcode.
+         *
+         * @param array $args
+         * @param string $content
+         *
+         * @return string
+         */
+        public function shortcode_output( $args = array(), $content = '' ) {
+            $args = $this->argument_values( $args );
+
+            // add extra argument so we know its a output to gutenberg
+            //$args
+            $args = $this->string_to_bool( $args );
+
+            // if we have a enclosed shortcode we add it to the special `html` argument
+            if ( ! empty( $content ) ) {
+                $args['html'] = $content;
+            }
+
+            $class = isset( $this->options['widget_ops']['classname'] ) ? esc_attr( $this->options['widget_ops']['classname'] ) : '';
+            $class .= " sdel-".$this->get_instance_hash();
+
+            $class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
+            $class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
+
+            $attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
+            $attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
+
+            $shortcode_args = array();
+            $output         = '';
+            $no_wrap        = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
+            if ( isset( $args['no_wrap'] ) && $args['no_wrap'] ) {
+                $no_wrap = true;
+            }
+            $main_content = $this->output( $args, $shortcode_args, $content );
+            if ( $main_content && ! $no_wrap ) {
+                // wrap the shortcode in a div with the same class as the widget
+                $output .= '<div class="' . $class . '" ' . $attrs . '>';
+                if ( ! empty( $args['title'] ) ) {
+                    // if its a shortcode and there is a title try to grab the title wrappers
+                    $shortcode_args = array( 'before_title' => '', 'after_title' => '' );
+                    if ( empty( $instance ) ) {
+                        global $wp_registered_sidebars;
+                        if ( ! empty( $wp_registered_sidebars ) ) {
+                            foreach ( $wp_registered_sidebars as $sidebar ) {
+                                if ( ! empty( $sidebar['before_title'] ) ) {
+                                    $shortcode_args['before_title'] = $sidebar['before_title'];
+                                    $shortcode_args['after_title']  = $sidebar['after_title'];
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    $output .= $this->output_title( $shortcode_args, $args );
+                }
+                $output .= $main_content;
+                $output .= '</div>';
+            } elseif ( $main_content && $no_wrap ) {
+                $output .= $main_content;
+            }
+
+            // if preview show a placeholder if empty
+            if ( $this->is_preview() && $output == '' ) {
+                $output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
+            }
+
+            return apply_filters( 'wp_super_duper_widget_output', $output, $args, $shortcode_args, $this );
+        }
+
+        /**
+         * Placeholder text to show if output is empty and we are on a preview/builder page.
+         *
+         * @param string $name
+         *
+         * @return string
+         */
+        public function preview_placeholder_text( $name = '' ) {
+            return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . sprintf( __( 'Placeholder for: %s' ), $name ) . "</div>";
+        }
+
+        /**
+         * Sometimes booleans values can be turned to strings, so we fix that.
+         *
+         * @param $options
+         *
+         * @return mixed
+         */
+        public function string_to_bool( $options ) {
+            // convert bool strings to booleans
+            foreach ( $options as $key => $val ) {
+                if ( $val == 'false' ) {
+                    $options[ $key ] = false;
+                } elseif ( $val == 'true' ) {
+                    $options[ $key ] = true;
+                }
+            }
+
+            return $options;
+        }
+
+        /**
+         * Get the argument values that are also filterable.
+         *
+         * @param $instance
+         *
+         * @since 1.0.12 Don't set checkbox default value if the value is empty.
+         *
+         * @return array
+         */
+        public function argument_values( $instance ) {
+            $argument_values = array();
+
+            // set widget instance
+            $this->instance = $instance;
+
+            if ( empty( $this->arguments ) ) {
+                $this->arguments = $this->get_arguments();
+            }
+
+            if ( ! empty( $this->arguments ) ) {
+                foreach ( $this->arguments as $key => $args ) {
+                    // set the input name from the key
+                    $args['name'] = $key;
+                    //
+                    $argument_values[ $key ] = isset( $instance[ $key ] ) ? $instance[ $key ] : '';
+                    if ( $args['type'] == 'checkbox' && $argument_values[ $key ] == '' ) {
+                        // don't set default for an empty checkbox
+                    } elseif ( $argument_values[ $key ] == '' && isset( $args['default'] ) ) {
+                        $argument_values[ $key ] = $args['default'];
+                    }
+                }
+            }
+
+            return $argument_values;
+        }
+
+        /**
+         * Set arguments in super duper.
+         *
+         * @since 1.0.0
+         *
+         * @return array Set arguments.
+         */
+        public function set_arguments() {
+            return $this->arguments;
+        }
+
+        /**
+         * Get arguments in super duper.
+         *
+         * @since 1.0.0
+         *
+         * @return array Get arguments.
+         */
+        public function get_arguments() {
+            if ( empty( $this->arguments ) ) {
+                $this->arguments = $this->set_arguments();
+            }
+
+            $this->arguments = apply_filters( 'wp_super_duper_arguments', $this->arguments, $this->options, $this->instance );
+            $this->arguments = $this->add_name_from_key( $this->arguments, true );
+
+            return $this->arguments;
+        }
+
+        /**
+         * This is the main output class for all 3 items, widget, shortcode and block, it is extended in the calling class.
+         *
+         * @param array $args
+         * @param array $widget_args
+         * @param string $content
+         */
+        public function output( $args = array(), $widget_args = array(), $content = '' ) {
+
+        }
+
+        /**
+         * Add the dynamic block code inline when the wp-block in enqueued.
+         */
+        public function register_block() {
+            wp_add_inline_script( 'wp-blocks', $this->block() );
+            if ( class_exists( 'SiteOrigin_Panels' ) ) {
+                wp_add_inline_script( 'wp-blocks', $this->siteorigin_js() );
+            }
+        }
+
+        /**
+         * Check if we need to show advanced options.
+         *
+         * @return bool
+         */
+        public function block_show_advanced() {
+
+            $show      = false;
+            $arguments = $this->arguments;
+
+            if ( empty( $arguments ) ) {
+                $arguments = $this->get_arguments();
+            }
+
+            if ( ! empty( $arguments ) ) {
+                foreach ( $arguments as $argument ) {
+                    if ( isset( $argument['advanced'] ) && $argument['advanced'] ) {
+                        $show = true;
+                        break; // no need to continue if we know we have it
+                    }
+                }
+            }
+
+            return $show;
+        }
+
+        /**
+         * Get the url path to the current folder.
+         *
+         * @return string
+         */
+        public function get_url() {
+
+            $url = $this->url;
+
+            if ( ! $url ) {
+                // check if we are inside a plugin
+                $file_dir = str_replace( "/includes", "", dirname( __FILE__ ) );
+
+                $dir_parts = explode( "/wp-content/", $file_dir );
+                $url_parts = explode( "/wp-content/", plugins_url() );
+
+                if ( ! empty( $url_parts[0] ) && ! empty( $dir_parts[1] ) ) {
+                    $url       = trailingslashit( $url_parts[0] . "/wp-content/" . $dir_parts[1] );
+                    $this->url = $url;
+                }
+            }
+
+
+            return $url;
+        }
+
+        /**
+         * Generate the block icon.
+         *
+         * Enables the use of Font Awesome icons.
+         *
+         * @note xlink:href is actually deprecated but href is not supported by all so we use both.
+         *
+         * @param $icon
+         *
+         * @since 1.1.0
+         * @return string
+         */
+        public function get_block_icon( $icon ) {
+
+            // check if we have a Font Awesome icon
+            $fa_type = '';
+            if ( substr( $icon, 0, 7 ) === "fas fa-" ) {
+                $fa_type = 'solid';
+            } elseif ( substr( $icon, 0, 7 ) === "far fa-" ) {
+                $fa_type = 'regular';
+            } elseif ( substr( $icon, 0, 7 ) === "fab fa-" ) {
+                $fa_type = 'brands';
+            } else {
+                $icon = "'" . $icon . "'";
+            }
+
+            // set the icon if we found one
+            if ( $fa_type ) {
+                $fa_icon = str_replace( array( "fas fa-", "far fa-", "fab fa-" ), "", $icon );
+                $icon    = "el('svg',{width: 20, height: 20, viewBox: '0 0 20 20'},el('use', {'xlink:href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "','href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "'}))";
+            }
+
+            return $icon;
+        }
+
+        public function group_arguments( $arguments ) {
 //			echo '###';print_r($arguments);
-			if ( ! empty( $arguments ) ) {
-				$temp_arguments = array();
-				$general        = __( "General" );
-				$add_sections   = false;
-				foreach ( $arguments as $key => $args ) {
-					if ( isset( $args['group'] ) ) {
-						$temp_arguments[ $args['group'] ][ $key ] = $args;
-						$add_sections                             = true;
-					} else {
-						$temp_arguments[ $general ][ $key ] = $args;
-					}
-				}
-
-				// only add sections if more than one
-				if ( $add_sections ) {
-					$arguments = $temp_arguments;
-				}
-			}
+            if ( ! empty( $arguments ) ) {
+                $temp_arguments = array();
+                $general        = __( "General" );
+                $add_sections   = false;
+                foreach ( $arguments as $key => $args ) {
+                    if ( isset( $args['group'] ) ) {
+                        $temp_arguments[ $args['group'] ][ $key ] = $args;
+                        $add_sections                             = true;
+                    } else {
+                        $temp_arguments[ $general ][ $key ] = $args;
+                    }
+                }
+
+                // only add sections if more than one
+                if ( $add_sections ) {
+                    $arguments = $temp_arguments;
+                }
+            }
 
 //			echo '###';print_r($arguments);
-			return $arguments;
-		}
-
-
-		/**
-		 * Output the JS for building the dynamic Guntenberg block.
-		 *
-		 * @since 1.0.4 Added block_wrap property which will set the block wrapping output element ie: div, span, p or empty for no wrap.
-		 * @since 1.0.9 Save numbers as numbers and not strings.
-		 * @since 1.1.0 Font Awesome classes can be used for icons.
-		 * @return mixed
-		 */
-		public function block() {
-			ob_start();
-
-			$show_advanced = $this->block_show_advanced();
-			?>
+            return $arguments;
+        }
+
+
+        /**
+         * Output the JS for building the dynamic Guntenberg block.
+         *
+         * @since 1.0.4 Added block_wrap property which will set the block wrapping output element ie: div, span, p or empty for no wrap.
+         * @since 1.0.9 Save numbers as numbers and not strings.
+         * @since 1.1.0 Font Awesome classes can be used for icons.
+         * @return mixed
+         */
+        public function block() {
+            ob_start();
+
+            $show_advanced = $this->block_show_advanced();
+            ?>
 			<script>
 				/**
 				 * BLOCK: Basic
@@ -1690,97 +1690,97 @@ 
 						icon: <?php echo $this->get_block_icon( $this->options['block-icon'] );?>,//'<?php echo isset( $this->options['block-icon'] ) ? esc_attr( $this->options['block-icon'] ) : 'shield-alt';?>', // Block icon from Dashicons → https://developer.wordpress.org/resource/dashicons/.
 						supports: {
 							<?php
-							if ( isset( $this->options['block-supports'] ) ) {
-								echo $this->array_to_attributes( $this->options['block-supports'] );
-							}
-							?>
+                            if ( isset( $this->options['block-supports'] ) ) {
+                                echo $this->array_to_attributes( $this->options['block-supports'] );
+                            }
+                            ?>
 						},
 						category: '<?php echo isset( $this->options['block-category'] ) ? esc_attr( $this->options['block-category'] ) : 'common';?>', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
 						<?php if ( isset( $this->options['block-keywords'] ) ) {
-						echo "keywords : " . $this->options['block-keywords'] . ",";
-					}?>
+                        echo "keywords : " . $this->options['block-keywords'] . ",";
+                    }?>
 
 						<?php
 
-						// maybe set no_wrap
-						$no_wrap = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
-						if ( isset( $this->arguments['no_wrap'] ) && $this->arguments['no_wrap'] ) {
-							$no_wrap = true;
-						}
-						if ( $no_wrap ) {
-							$this->options['block-wrap'] = '';
-						}
+                        // maybe set no_wrap
+                        $no_wrap = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
+                        if ( isset( $this->arguments['no_wrap'] ) && $this->arguments['no_wrap'] ) {
+                            $no_wrap = true;
+                        }
+                        if ( $no_wrap ) {
+                            $this->options['block-wrap'] = '';
+                        }
 
 
 
-						$show_alignment = false;
-						// align feature
-						/*echo "supports: {";
+                        $show_alignment = false;
+                        // align feature
+                        /*echo "supports: {";
 						echo "	align: true,";
 						echo "  html: false";
 						echo "},";*/
 
-						if ( ! empty( $this->arguments ) ) {
-							echo "attributes : {";
-
-							if ( $show_advanced ) {
-								echo "show_advanced: {";
-								echo "	type: 'boolean',";
-								echo "  default: false,";
-								echo "},";
-							}
-
-							// block wrap element
-							if ( ! empty( $this->options['block-wrap'] ) ) { //@todo we should validate this?
-								echo "block_wrap: {";
-								echo "	type: 'string',";
-								echo "  default: '" . esc_attr( $this->options['block-wrap'] ) . "',";
-								echo "},";
-							}
-
-							foreach ( $this->arguments as $key => $args ) {
-
-								// set if we should show alignment
-								if ( $key == 'alignment' ) {
-									$show_alignment = true;
-								}
-
-								$extra = '';
-
-								if ( $args['type'] == 'checkbox' ) {
-									$type    = 'boolean';
-									$default = isset( $args['default'] ) && $args['default'] ? 'true' : 'false';
-								} elseif ( $args['type'] == 'number' ) {
-									$type    = 'number';
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-								} elseif ( $args['type'] == 'select' && ! empty( $args['multiple'] ) ) {
-									$type = 'array';
-									if ( isset( $args['default'] ) && is_array( $args['default'] ) ) {
-										$default = ! empty( $args['default'] ) ? "['" . implode( "','", $args['default'] ) . "']" : "[]";
-									} else {
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-									}
-								} elseif ( $args['type'] == 'multiselect' ) {
-									$type    = 'array';
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-								} else {
-									$type    = 'string';
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-								}
-								echo $key . " : {";
-								echo "type : '$type',";
-								echo "default : $default,";
-								echo "},";
-							}
-
-							echo "content : {type : 'string',default: 'Please select the attributes in the block settings'},";
-							echo "className: { type: 'string', default: '' },";
-
-							echo "},";
-
-						}
-
-						?>
+                        if ( ! empty( $this->arguments ) ) {
+                            echo "attributes : {";
+
+                            if ( $show_advanced ) {
+                                echo "show_advanced: {";
+                                echo "	type: 'boolean',";
+                                echo "  default: false,";
+                                echo "},";
+                            }
+
+                            // block wrap element
+                            if ( ! empty( $this->options['block-wrap'] ) ) { //@todo we should validate this?
+                                echo "block_wrap: {";
+                                echo "	type: 'string',";
+                                echo "  default: '" . esc_attr( $this->options['block-wrap'] ) . "',";
+                                echo "},";
+                            }
+
+                            foreach ( $this->arguments as $key => $args ) {
+
+                                // set if we should show alignment
+                                if ( $key == 'alignment' ) {
+                                    $show_alignment = true;
+                                }
+
+                                $extra = '';
+
+                                if ( $args['type'] == 'checkbox' ) {
+                                    $type    = 'boolean';
+                                    $default = isset( $args['default'] ) && $args['default'] ? 'true' : 'false';
+                                } elseif ( $args['type'] == 'number' ) {
+                                    $type    = 'number';
+                                    $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+                                } elseif ( $args['type'] == 'select' && ! empty( $args['multiple'] ) ) {
+                                    $type = 'array';
+                                    if ( isset( $args['default'] ) && is_array( $args['default'] ) ) {
+                                        $default = ! empty( $args['default'] ) ? "['" . implode( "','", $args['default'] ) . "']" : "[]";
+                                    } else {
+                                        $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+                                    }
+                                } elseif ( $args['type'] == 'multiselect' ) {
+                                    $type    = 'array';
+                                    $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+                                } else {
+                                    $type    = 'string';
+                                    $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+                                }
+                                echo $key . " : {";
+                                echo "type : '$type',";
+                                echo "default : $default,";
+                                echo "},";
+                            }
+
+                            echo "content : {type : 'string',default: 'Please select the attributes in the block settings'},";
+                            echo "className: { type: 'string', default: '' },";
+
+                            echo "},";
+
+                        }
+
+                        ?>
 
 						// The "edit" property must be a valid function.
 						edit: function (props) {
@@ -1788,9 +1788,9 @@ 
 
 							var $value = '';
 							<?php
-							// if we have a post_type and a category then link them
-							if( isset($this->arguments['post_type']) && isset($this->arguments['category']) && !empty($this->arguments['category']['post_type_linked']) ){
-							?>
+                            // if we have a post_type and a category then link them
+                            if( isset($this->arguments['post_type']) && isset($this->arguments['category']) && !empty($this->arguments['category']['post_type_linked']) ){
+                            ?>
 							if(typeof(prev_attributes[props.id]) != 'undefined' ){
 								$pt = props.attributes.post_type;
 								if(post_type_rest_slugs.length){
@@ -1874,8 +1874,8 @@ 
 										'shortcode': '<?php echo $this->options['base_id'];?>',
 										'attributes': props.attributes,
 										'post_id': <?php global $post; if ( isset( $post->ID ) ) {
-										echo $post->ID;
-									}else{echo '0';}?>,
+                                        echo $post->ID;
+                                    }else{echo '0';}?>,
 										'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_output_shortcode' );?>'
 									};
 
@@ -1927,10 +1927,10 @@ 
 
 									<?php
 
-									if(! empty( $this->arguments )){
+                                    if(! empty( $this->arguments )){
 
-									if ( $show_advanced ) {
-									?>
+                                    if ( $show_advanced ) {
+                                    ?>
 									el('div', {
 											style: {'padding-left': '16px','padding-right': '16px'}
 										},
@@ -1948,79 +1948,79 @@ 
 									,
 									<?php
 
-									}
+                                    }
 
-									$arguments = $this->group_arguments( $this->arguments );
+                                    $arguments = $this->group_arguments( $this->arguments );
 
-									// Do we have sections?
-									$has_sections = $arguments == $this->arguments ? false : true;
+                                    // Do we have sections?
+                                    $has_sections = $arguments == $this->arguments ? false : true;
 
 
-									if($has_sections){
-									$panel_count = 0;
-									foreach($arguments as $key => $args){
-									?>
+                                    if($has_sections){
+                                    $panel_count = 0;
+                                    foreach($arguments as $key => $args){
+                                    ?>
 									el(wp.components.PanelBody, {
 											title: '<?php esc_attr_e( $key ); ?>',
 											initialOpen: <?php if ( $panel_count ) {
-											echo "false";
-										} else {
-											echo "true";
-										}?>
+                                            echo "false";
+                                        } else {
+                                            echo "true";
+                                        }?>
 										},
 										<?php
 
 
 
-										foreach ( $args as $k => $a ) {
+                                        foreach ( $args as $k => $a ) {
 
-											$this->block_row_start( $k, $a );
-											$this->build_block_arguments( $k, $a );
-											$this->block_row_end( $k, $a );
-										}
-										?>
+                                            $this->block_row_start( $k, $a );
+                                            $this->build_block_arguments( $k, $a );
+                                            $this->block_row_end( $k, $a );
+                                        }
+                                        ?>
 									),
 									<?php
-									$panel_count ++;
+                                    $panel_count ++;
 
-									}
-									}else {
-									?>
+                                    }
+                                    }else {
+                                    ?>
 									el(wp.components.PanelBody, {
 											title: '<?php esc_attr_e( "Settings" ); ?>',
 											initialOpen: true
 										},
 										<?php
-										foreach ( $this->arguments as $key => $args ) {
-											$this->block_row_start( $key, $args );
-											$this->build_block_arguments( $key, $args );
-											$this->block_row_end( $key, $args );
-										}
-										?>
+                                        foreach ( $this->arguments as $key => $args ) {
+                                            $this->block_row_start( $key, $args );
+                                            $this->build_block_arguments( $key, $args );
+                                            $this->block_row_end( $key, $args );
+                                        }
+                                        ?>
 									),
 									<?php
-									}
+                                    }
 
-									}
-									?>
+                                    }
+                                    ?>
 
 								),
 
 								<?php
-								// If the user sets block-output array then build it
-								if ( ! empty( $this->options['block-output'] ) ) {
-								$this->block_element( $this->options['block-output'] );
-							}else{
-								// if no block-output is set then we try and get the shortcode html output via ajax.
-								?>
+                                // If the user sets block-output array then build it
+                                if ( ! empty( $this->options['block-output'] ) ) {
+                                $this->block_element( $this->options['block-output'] );
+                            }else{
+                                // if no block-output is set then we try and get the shortcode html output via ajax.
+                                ?>
 								el('div', {
 									dangerouslySetInnerHTML: {__html: onChangeContent()},
 									className: props.className,
 									style: {'minHeight': '30px'}
 								})
 								<?php
-								}
-								?>
+                                }
+                                ?>
 							]; // end return
 						},
 
@@ -2038,10 +2038,10 @@ 
 							$html = '';
 							<?php
 
-							if(! empty( $this->arguments )){
+                            if(! empty( $this->arguments )){
 
-							foreach($this->arguments as $key => $args){
-							?>
+                            foreach($this->arguments as $key => $args){
+                            ?>
 							if (attr.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
 								if ('<?php echo esc_attr( $key );?>' == 'html') {
 									$html = attr.<?php echo esc_attr( $key );?>;
@@ -2050,10 +2050,10 @@ 
 								}
 							}
 							<?php
-							}
-							}
+                            }
+                            }
 
-							?>
+                            ?>
 							content += "]";
 
 							// if has html element
@@ -2076,20 +2076,20 @@ 
 							}
 
 							<?php
-							if(isset( $this->options['block-wrap'] ) && $this->options['block-wrap'] == ''){
-							?>
+                            if(isset( $this->options['block-wrap'] ) && $this->options['block-wrap'] == ''){
+                            ?>
 							return content;
 							<?php
-							}else{
-							?>
+                            }else{
+                            ?>
 							var block_wrap = 'div';
 							if (attr.hasOwnProperty("block_wrap")) {
 								block_wrap = attr.block_wrap;
 							}
 							return el(block_wrap, {dangerouslySetInnerHTML: {__html: content}, className: align});
 							<?php
-							}
-							?>
+                            }
+                            ?>
 
 
 						}
@@ -2097,30 +2097,30 @@ 
 				})();
 			</script>
 			<?php
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', $output );
-		}
+            return str_replace( array(
+                '<script>',
+                '</script>'
+            ), '', $output );
+        }
 
-		public function block_row_start($key, $args){
+        public function block_row_start($key, $args){
 
-			// check for row
-			if(!empty($args['row'])){
+            // check for row
+            if(!empty($args['row'])){
 
-				if(!empty($args['row']['open'])){
+                if(!empty($args['row']['open'])){
 
-				// element require
-				$element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
-				echo $element_require;
+                // element require
+                $element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
+                echo $element_require;
 
-					if(false){?><script><?php }?>
+                    if(false){?><script><?php }?>
 						el('div', {
 								className: 'bsui components-base-control',
 							},
@@ -2150,87 +2150,87 @@ 
 									},
 
 					<?php
-					if(false){?></script><?php }
-				}elseif(!empty($args['row']['close'])){
-					if(false){?><script><?php }?>
+                    if(false){?></script><?php }
+                }elseif(!empty($args['row']['close'])){
+                    if(false){?><script><?php }?>
 						el(
 							'div',
 							{
 								className: 'col pl-0',
 							},
 					<?php
-					if(false){?></script><?php }
-				}else{
-					if(false){?><script><?php }?>
+                    if(false){?></script><?php }
+                }else{
+                    if(false){?><script><?php }?>
 						el(
 							'div',
 							{
 								className: 'col pl-0 pr-2',
 							},
 					<?php
-					if(false){?></script><?php }
-				}
-
-			}
-
-		}
-
-		public function block_row_end($key, $args){
-
-			if(!empty($args['row'])){
-				// maybe close
-				if(!empty($args['row']['close'])){
-					echo "))";
-				}
-
-				echo "),";
-			}
-		}
-
-		public function build_block_arguments( $key, $args ) {
-			$custom_attributes = ! empty( $args['custom_attributes'] ) ? $this->array_to_attributes( $args['custom_attributes'] ) : '';
-			$options           = '';
-			$extra             = '';
-			$require           = '';
-
-			// `content` is a protected and special argument
-			if ( $key == 'content' ) {
-				return;
-			}
-
-
-			// icon
-			$icon = '';
-			if( !empty( $args['icon'] ) ){
-				$icon .= "el('div', {";
-									$icon .= "dangerouslySetInnerHTML: {__html: '".self::get_widget_icon( esc_attr($args['icon']))."'},";
-									$icon .= "className: 'text-center',";
-									$icon .= "title: '".addslashes( $args['title'] )."',";
-								$icon .= "}),";
-
-				// blank title as its added to the icon.
-				$args['title'] = '';
-			}
-
-			// require advanced
-			$require_advanced = ! empty( $args['advanced'] ) ? "props.attributes.show_advanced && " : "";
-
-			// element require
-			$element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
-
-
-			$onchange  = "props.setAttributes({ $key: $key } )";
-			$onchangecomplete  = "";
-			$value     = "props.attributes.$key";
-			$text_type = array( 'text', 'password', 'number', 'email', 'tel', 'url', 'colorx' );
-			if ( in_array( $args['type'], $text_type ) ) {
-				$type = 'TextControl';
-				// Save numbers as numbers and not strings
-				if ( $args['type'] == 'number' ) {
-					$onchange = "props.setAttributes({ $key: Number($key) } )";
-				}
-			}
-			/*
+                    if(false){?></script><?php }
+                }
+
+            }
+
+        }
+
+        public function block_row_end($key, $args){
+
+            if(!empty($args['row'])){
+                // maybe close
+                if(!empty($args['row']['close'])){
+                    echo "))";
+                }
+
+                echo "),";
+            }
+        }
+
+        public function build_block_arguments( $key, $args ) {
+            $custom_attributes = ! empty( $args['custom_attributes'] ) ? $this->array_to_attributes( $args['custom_attributes'] ) : '';
+            $options           = '';
+            $extra             = '';
+            $require           = '';
+
+            // `content` is a protected and special argument
+            if ( $key == 'content' ) {
+                return;
+            }
+
+
+            // icon
+            $icon = '';
+            if( !empty( $args['icon'] ) ){
+                $icon .= "el('div', {";
+                                    $icon .= "dangerouslySetInnerHTML: {__html: '".self::get_widget_icon( esc_attr($args['icon']))."'},";
+                                    $icon .= "className: 'text-center',";
+                                    $icon .= "title: '".addslashes( $args['title'] )."',";
+                                $icon .= "}),";
+
+                // blank title as its added to the icon.
+                $args['title'] = '';
+            }
+
+            // require advanced
+            $require_advanced = ! empty( $args['advanced'] ) ? "props.attributes.show_advanced && " : "";
+
+            // element require
+            $element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
+
+
+            $onchange  = "props.setAttributes({ $key: $key } )";
+            $onchangecomplete  = "";
+            $value     = "props.attributes.$key";
+            $text_type = array( 'text', 'password', 'number', 'email', 'tel', 'url', 'colorx' );
+            if ( in_array( $args['type'], $text_type ) ) {
+                $type = 'TextControl';
+                // Save numbers as numbers and not strings
+                if ( $args['type'] == 'number' ) {
+                    $onchange = "props.setAttributes({ $key: Number($key) } )";
+                }
+            }
+            /*
 			 * https://www.wptricks.com/question/set-current-tab-on-a-gutenberg-tabpanel-component-from-outside-that-component/ es5 layout
 						elseif($args['type']=='tabs'){
 							?>
@@ -2264,85 +2264,85 @@ 
 							return;
 						}
 			*/
-			elseif ( $args['type'] == 'color' ) {
-				$type = 'ColorPicker';
-				$onchange = "";
-				$extra = "color: $value,";
-				if(!empty($args['disable_alpha'])){
-					$extra .= "disableAlpha: true,";
-				}
-				$onchangecomplete = "onChangeComplete: function($key) {
+            elseif ( $args['type'] == 'color' ) {
+                $type = 'ColorPicker';
+                $onchange = "";
+                $extra = "color: $value,";
+                if(!empty($args['disable_alpha'])){
+                    $extra .= "disableAlpha: true,";
+                }
+                $onchangecomplete = "onChangeComplete: function($key) {
 				value =  $key.rgb.a && $key.rgb.a < 1 ? \"rgba(\"+$key.rgb.r+\",\"+$key.rgb.g+\",\"+$key.rgb.b+\",\"+$key.rgb.a+\")\" : $key.hex;
                         props.setAttributes({
                             $key: value
                         });
                     },";
-			}
-			elseif ( $args['type'] == 'checkbox' ) {
-				$type = 'CheckboxControl';
-				$extra .= "checked: props.attributes.$key,";
-				$onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
-			} elseif ( $args['type'] == 'textarea' ) {
-				$type = 'TextareaControl';
-			} elseif ( $args['type'] == 'select' || $args['type'] == 'multiselect' ) {
-				$type = 'SelectControl';
-
-				if($args['name'] == 'category' && !empty($args['post_type_linked'])){
-					$options .= "options: taxonomies_".str_replace("-","_", $this->id).",";
-				}elseif($args['name'] == 'sort_by' && !empty($args['post_type_linked'])){
-					$options .= "options: sort_by_".str_replace("-","_", $this->id).",";
-				}else {
-
-					if ( ! empty( $args['options'] ) ) {
-						$options .= "options: [";
-						foreach ( $args['options'] as $option_val => $option_label ) {
-							$options .= "{ value: '" . esc_attr( $option_val ) . "', label: '" . addslashes( $option_label ) . "' },";
-						}
-						$options .= "],";
-					}
-				}
-				if ( isset( $args['multiple'] ) && $args['multiple'] ) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
-					$extra .= ' multiple: true, ';
-				}
-			} elseif ( $args['type'] == 'alignment' ) {
-				$type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
-			}elseif ( $args['type'] == 'margins' ) {
-
-			} else {
-				return;// if we have not implemented the control then don't break the JS.
-			}
-
-
-
-			// color input does not show the labels so we add them
-			if($args['type']=='color'){
-				// add show only if advanced
-				echo $require_advanced;
-				// add setting require if defined
-				echo $element_require;
-				echo "el('div', {style: {'marginBottom': '8px'}}, '".addslashes( $args['title'] )."'),";
-			}
-
-			// add show only if advanced
-			echo $require_advanced;
-			// add setting require if defined
-			echo $element_require;
-
-			// icon
-			echo $icon;
-			?>
+            }
+            elseif ( $args['type'] == 'checkbox' ) {
+                $type = 'CheckboxControl';
+                $extra .= "checked: props.attributes.$key,";
+                $onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
+            } elseif ( $args['type'] == 'textarea' ) {
+                $type = 'TextareaControl';
+            } elseif ( $args['type'] == 'select' || $args['type'] == 'multiselect' ) {
+                $type = 'SelectControl';
+
+                if($args['name'] == 'category' && !empty($args['post_type_linked'])){
+                    $options .= "options: taxonomies_".str_replace("-","_", $this->id).",";
+                }elseif($args['name'] == 'sort_by' && !empty($args['post_type_linked'])){
+                    $options .= "options: sort_by_".str_replace("-","_", $this->id).",";
+                }else {
+
+                    if ( ! empty( $args['options'] ) ) {
+                        $options .= "options: [";
+                        foreach ( $args['options'] as $option_val => $option_label ) {
+                            $options .= "{ value: '" . esc_attr( $option_val ) . "', label: '" . addslashes( $option_label ) . "' },";
+                        }
+                        $options .= "],";
+                    }
+                }
+                if ( isset( $args['multiple'] ) && $args['multiple'] ) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
+                    $extra .= ' multiple: true, ';
+                }
+            } elseif ( $args['type'] == 'alignment' ) {
+                $type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
+            }elseif ( $args['type'] == 'margins' ) {
+
+            } else {
+                return;// if we have not implemented the control then don't break the JS.
+            }
+
+
+
+            // color input does not show the labels so we add them
+            if($args['type']=='color'){
+                // add show only if advanced
+                echo $require_advanced;
+                // add setting require if defined
+                echo $element_require;
+                echo "el('div', {style: {'marginBottom': '8px'}}, '".addslashes( $args['title'] )."'),";
+            }
+
+            // add show only if advanced
+            echo $require_advanced;
+            // add setting require if defined
+            echo $element_require;
+
+            // icon
+            echo $icon;
+            ?>
 			el( wp.components.<?php echo $type; ?>, {
 			label: '<?php echo addslashes( $args['title'] ); ?>',
 			help: '<?php if ( isset( $args['desc'] ) ) {
-				echo addslashes( $args['desc'] );
-			} ?>',
+                echo addslashes( $args['desc'] );
+            } ?>',
 			value: <?php echo $value; ?>,
 			<?php if ( $type == 'TextControl' && $args['type'] != 'text' ) {
-				echo "type: '" . addslashes( $args['type'] ) . "',";
-			} ?>
+                echo "type: '" . addslashes( $args['type'] ) . "',";
+            } ?>
 			<?php if ( ! empty( $args['placeholder'] ) ) {
-				echo "placeholder: '" . addslashes( $args['placeholder'] ) . "',";
-			} ?>
+                echo "placeholder: '" . addslashes( $args['placeholder'] ) . "',";
+            } ?>
 			<?php echo $options; ?>
 			<?php echo $extra; ?>
 			<?php echo $custom_attributes; ?>
@@ -2354,608 +2354,608 @@ 
 			<?php
 
 
-		}
-
-		/**
-		 * Convert an array of attributes to block string.
-		 *
-		 * @todo there is prob a faster way to do this, also we could add some validation here.
-		 *
-		 * @param $custom_attributes
-		 *
-		 * @return string
-		 */
-		public function array_to_attributes( $custom_attributes, $html = false ) {
-			$attributes = '';
-			if ( ! empty( $custom_attributes ) ) {
-
-				if ( $html ) {
-					foreach ( $custom_attributes as $key => $val ) {
-						$attributes .= " $key='$val' ";
-					}
-				} else {
-					foreach ( $custom_attributes as $key => $val ) {
-						$attributes .= "'$key': '$val',";
-					}
-				}
-			}
-
-			return $attributes;
-		}
-
-		/**
-		 * A self looping function to create the output for JS block elements.
-		 *
-		 * This is what is output in the WP Editor visual view.
-		 *
-		 * @param $args
-		 */
-		public function block_element( $args ) {
-
-
-			if ( ! empty( $args ) ) {
-				foreach ( $args as $element => $new_args ) {
-
-					if ( is_array( $new_args ) ) { // its an element
-
-
-						if ( isset( $new_args['element'] ) ) {
-
-							if ( isset( $new_args['element_require'] ) ) {
-								echo str_replace( array(
-										"'+",
-										"+'"
-									), '', $this->block_props_replace( $new_args['element_require'] ) ) . " &&  ";
-								unset( $new_args['element_require'] );
-							}
-
-							echo "\n el( '" . $new_args['element'] . "', {";
-
-							// get the attributes
-							foreach ( $new_args as $new_key => $new_value ) {
-
-
-								if ( $new_key == 'element' || $new_key == 'content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array( $new_value ) ) {
-									// do nothing
-								} else {
-									echo $this->block_element( array( $new_key => $new_value ) );
-								}
-							}
-
-							echo "},";// end attributes
-
-							// get the content
-							$first_item = 0;
-							foreach ( $new_args as $new_key => $new_value ) {
-								if ( $new_key === 'content' || is_array( $new_value ) ) {
-
-									if ( $new_key === 'content' ) {
-										echo "'" . $this->block_props_replace( wp_slash( $new_value ) ) . "'";
-									}
-
-									if ( is_array( $new_value ) ) {
-
-										if ( isset( $new_value['element_require'] ) ) {
-											echo str_replace( array(
-													"'+",
-													"+'"
-												), '', $this->block_props_replace( $new_value['element_require'] ) ) . " &&  ";
-											unset( $new_value['element_require'] );
-										}
-
-										if ( isset( $new_value['element_repeat'] ) ) {
-											$x = 1;
-											while ( $x <= absint( $new_value['element_repeat'] ) ) {
-												$this->block_element( array( '' => $new_value ) );
-												$x ++;
-											}
-										} else {
-											$this->block_element( array( '' => $new_value ) );
-										}
-									}
-									$first_item ++;
-								}
-							}
-
-							echo ")";// end content
-
-							echo ", \n";
-
-						}
-					} else {
-
-						if ( substr( $element, 0, 3 ) === "if_" ) {
-							echo str_replace( "if_", "", $element ) . ": " . $this->block_props_replace( $new_args, true ) . ",";
-						} elseif ( $element == 'style' ) {
-							echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
-						} else {
-							echo $element . ": '" . $this->block_props_replace( $new_args ) . "',";
-						}
-
-					}
-				}
-			}
-		}
-
-		/**
-		 * Replace block attributes placeholders with the proper naming.
-		 *
-		 * @param $string
-		 *
-		 * @return mixed
-		 */
-		public function block_props_replace( $string, $no_wrap = false ) {
-
-			if ( $no_wrap ) {
-				$string = str_replace( array( "[%", "%]" ), array( "props.attributes.", "" ), $string );
-			} else {
-				$string = str_replace( array( "[%", "%]" ), array( "'+props.attributes.", "+'" ), $string );
-			}
-
-			return $string;
-		}
-
-		/**
-		 * Outputs the content of the widget
-		 *
-		 * @param array $args
-		 * @param array $instance
-		 */
-		public function widget( $args, $instance ) {
-
-			// get the filtered values
-			$argument_values = $this->argument_values( $instance );
-			$argument_values = $this->string_to_bool( $argument_values );
-			$output          = $this->output( $argument_values, $args );
-
-			$no_wrap = false;
-			if ( isset( $argument_values['no_wrap'] ) && $argument_values['no_wrap'] ) {
-				$no_wrap = true;
-			}
-
-			ob_start();
-			if ( $output && ! $no_wrap ) {
-
-				$class_original = $this->options['widget_ops']['classname'];
-				$class = $this->options['widget_ops']['classname']." sdel-".$this->get_instance_hash();
-
-				// Before widget
-				$before_widget = $args['before_widget'];
-				$before_widget = str_replace($class_original,$class,$before_widget);
-				$before_widget = apply_filters( 'wp_super_duper_before_widget', $before_widget, $args, $instance, $this );
-				$before_widget = apply_filters( 'wp_super_duper_before_widget_' . $this->base_id, $before_widget, $args, $instance, $this );
-
-				// After widget
-				$after_widget = $args['after_widget'];
-				$after_widget = apply_filters( 'wp_super_duper_after_widget', $after_widget, $args, $instance, $this );
-				$after_widget = apply_filters( 'wp_super_duper_after_widget_' . $this->base_id, $after_widget, $args, $instance, $this );
-
-				echo $before_widget;
-				// elementor strips the widget wrapping div so we check for and add it back if needed
-				if ( $this->is_elementor_widget_output() ) {
-					// Filter class & attrs for elementor widget output.
-					$class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
-					$class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
-
-					$attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
-					$attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
-
-					echo "<span class='" . esc_attr( $class  ) . "' " . $attrs . ">";
-				}
-				echo $this->output_title( $args, $instance );
-				echo $output;
-				if ( $this->is_elementor_widget_output() ) {
-					echo "</span>";
-				}
-				echo $after_widget;
-			} elseif ( $this->is_preview() && $output == '' ) {// if preview show a placeholder if empty
-				$output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
-				echo $output;
-			} elseif ( $output && $no_wrap ) {
-				echo $output;
-			}
-			$output = ob_get_clean();
-
-			$output = apply_filters( 'wp_super_duper_widget_output', $output, $instance, $args, $this );
-
-			echo $output;
-		}
-
-		/**
-		 * Tests if the current output is inside a elementor container.
-		 *
-		 * @since 1.0.4
-		 * @return bool
-		 */
-		public function is_elementor_widget_output() {
-			$result = false;
-			if ( defined( 'ELEMENTOR_VERSION' ) && isset( $this->number ) && $this->number == 'REPLACE_TO_ID' ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a elementor preview.
-		 *
-		 * @since 1.0.4
-		 * @return bool
-		 */
-		public function is_elementor_preview() {
-			$result = false;
-			if ( isset( $_REQUEST['elementor-preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) || ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor_ajax' ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a Divi preview.
-		 *
-		 * @since 1.0.6
-		 * @return bool
-		 */
-		public function is_divi_preview() {
-			$result = false;
-			if ( isset( $_REQUEST['et_fb'] ) || isset( $_REQUEST['et_pb_preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a Beaver builder preview.
-		 *
-		 * @since 1.0.6
-		 * @return bool
-		 */
-		public function is_beaver_preview() {
-			$result = false;
-			if ( isset( $_REQUEST['fl_builder'] ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a siteorigin builder preview.
-		 *
-		 * @since 1.0.6
-		 * @return bool
-		 */
-		public function is_siteorigin_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a cornerstone builder preview.
-		 *
-		 * @since 1.0.8
-		 * @return bool
-		 */
-		public function is_cornerstone_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['cornerstone_preview'] ) || basename( $_SERVER['REQUEST_URI'] ) == 'cornerstone-endpoint' ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a fusion builder preview.
-		 *
-		 * @since 1.1.0
-		 * @return bool
-		 */
-		public function is_fusion_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['fb-edit'] ) || ! empty( $_REQUEST['fusion_load_nonce'] ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a Oxygen builder preview.
-		 *
-		 * @since 1.0.18
-		 * @return bool
-		 */
-		public function is_oxygen_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['ct_builder'] ) || ( ! empty( $_REQUEST['action'] ) && ( substr( $_REQUEST['action'], 0, 11 ) === "oxy_render_" || substr( $_REQUEST['action'], 0, 10 ) === "ct_render_" ) ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * General function to check if we are in a preview situation.
-		 *
-		 * @since 1.0.6
-		 * @return bool
-		 */
-		public function is_preview() {
-			$preview = false;
-			if ( $this->is_divi_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_elementor_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_beaver_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_siteorigin_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_cornerstone_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_fusion_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_oxygen_preview() ) {
-				$preview = true;
-			} elseif( $this->is_block_content_call() ) {
-				$preview = true;
-			}
-
-			return $preview;
-		}
-
-		/**
-		 * Output the super title.
-		 *
-		 * @param $args
-		 * @param array $instance
-		 *
-		 * @return string
-		 */
-		public function output_title( $args, $instance = array() ) {
-			$output = '';
-			if ( ! empty( $instance['title'] ) ) {
-				/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
-				$title  = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
-
-				if(empty($instance['widget_title_tag'])){
-					$output = $args['before_title'] . $title . $args['after_title'];
-				}else{
-					$title_tag = esc_attr( $instance['widget_title_tag'] );
-
-					// classes
-					$title_classes = array();
-					$title_classes[] = !empty( $instance['widget_title_size_class'] ) ? sanitize_html_class( $instance['widget_title_size_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_align_class'] ) ? sanitize_html_class( $instance['widget_title_align_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_color_class'] ) ? "text-".sanitize_html_class( $instance['widget_title_color_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_border_class'] ) ? sanitize_html_class( $instance['widget_title_border_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_border_color_class'] ) ? "border-".sanitize_html_class( $instance['widget_title_border_color_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mt_class'] ) ? "mt-".absint( $instance['widget_title_mt_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mr_class'] ) ? "mr-".absint( $instance['widget_title_mr_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mb_class'] ) ? "mb-".absint( $instance['widget_title_mb_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_ml_class'] ) ? "ml-".absint( $instance['widget_title_ml_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pt_class'] ) ? "pt-".absint( $instance['widget_title_pt_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pr_class'] ) ? "pr-".absint( $instance['widget_title_pr_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pb_class'] ) ? "pb-".absint( $instance['widget_title_pb_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pl_class'] ) ? "pl-".absint( $instance['widget_title_pl_class'] ) : '';
-
-					$class = !empty( $title_classes ) ? implode(" ",$title_classes) : '';
-					$output = "<$title_tag class='$class' >$title</$title_tag>";
-				}
-
-			}
-
-			return $output;
-		}
-
-		/**
-		 * Outputs the options form inputs for the widget.
-		 *
-		 * @param array $instance The widget options.
-		 */
-		public function form( $instance ) {
-
-			// set widget instance
-			$this->instance = $instance;
-
-			// set it as a SD widget
-			echo $this->widget_advanced_toggle();
-
-			echo "<p>" . esc_attr( $this->options['widget_ops']['description'] ) . "</p>";
-			$arguments_raw = $this->get_arguments();
-
-			if ( is_array( $arguments_raw ) ) {
-
-				$arguments = $this->group_arguments( $arguments_raw );
-
-				// Do we have sections?
-				$has_sections = $arguments == $arguments_raw ? false : true;
-
-
-				if ( $has_sections ) {
-					$panel_count = 0;
-					foreach ( $arguments as $key => $args ) {
-
-						?>
+        }
+
+        /**
+         * Convert an array of attributes to block string.
+         *
+         * @todo there is prob a faster way to do this, also we could add some validation here.
+         *
+         * @param $custom_attributes
+         *
+         * @return string
+         */
+        public function array_to_attributes( $custom_attributes, $html = false ) {
+            $attributes = '';
+            if ( ! empty( $custom_attributes ) ) {
+
+                if ( $html ) {
+                    foreach ( $custom_attributes as $key => $val ) {
+                        $attributes .= " $key='$val' ";
+                    }
+                } else {
+                    foreach ( $custom_attributes as $key => $val ) {
+                        $attributes .= "'$key': '$val',";
+                    }
+                }
+            }
+
+            return $attributes;
+        }
+
+        /**
+         * A self looping function to create the output for JS block elements.
+         *
+         * This is what is output in the WP Editor visual view.
+         *
+         * @param $args
+         */
+        public function block_element( $args ) {
+
+
+            if ( ! empty( $args ) ) {
+                foreach ( $args as $element => $new_args ) {
+
+                    if ( is_array( $new_args ) ) { // its an element
+
+
+                        if ( isset( $new_args['element'] ) ) {
+
+                            if ( isset( $new_args['element_require'] ) ) {
+                                echo str_replace( array(
+                                        "'+",
+                                        "+'"
+                                    ), '', $this->block_props_replace( $new_args['element_require'] ) ) . " &&  ";
+                                unset( $new_args['element_require'] );
+                            }
+
+                            echo "\n el( '" . $new_args['element'] . "', {";
+
+                            // get the attributes
+                            foreach ( $new_args as $new_key => $new_value ) {
+
+
+                                if ( $new_key == 'element' || $new_key == 'content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array( $new_value ) ) {
+                                    // do nothing
+                                } else {
+                                    echo $this->block_element( array( $new_key => $new_value ) );
+                                }
+                            }
+
+                            echo "},";// end attributes
+
+                            // get the content
+                            $first_item = 0;
+                            foreach ( $new_args as $new_key => $new_value ) {
+                                if ( $new_key === 'content' || is_array( $new_value ) ) {
+
+                                    if ( $new_key === 'content' ) {
+                                        echo "'" . $this->block_props_replace( wp_slash( $new_value ) ) . "'";
+                                    }
+
+                                    if ( is_array( $new_value ) ) {
+
+                                        if ( isset( $new_value['element_require'] ) ) {
+                                            echo str_replace( array(
+                                                    "'+",
+                                                    "+'"
+                                                ), '', $this->block_props_replace( $new_value['element_require'] ) ) . " &&  ";
+                                            unset( $new_value['element_require'] );
+                                        }
+
+                                        if ( isset( $new_value['element_repeat'] ) ) {
+                                            $x = 1;
+                                            while ( $x <= absint( $new_value['element_repeat'] ) ) {
+                                                $this->block_element( array( '' => $new_value ) );
+                                                $x ++;
+                                            }
+                                        } else {
+                                            $this->block_element( array( '' => $new_value ) );
+                                        }
+                                    }
+                                    $first_item ++;
+                                }
+                            }
+
+                            echo ")";// end content
+
+                            echo ", \n";
+
+                        }
+                    } else {
+
+                        if ( substr( $element, 0, 3 ) === "if_" ) {
+                            echo str_replace( "if_", "", $element ) . ": " . $this->block_props_replace( $new_args, true ) . ",";
+                        } elseif ( $element == 'style' ) {
+                            echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
+                        } else {
+                            echo $element . ": '" . $this->block_props_replace( $new_args ) . "',";
+                        }
+
+                    }
+                }
+            }
+        }
+
+        /**
+         * Replace block attributes placeholders with the proper naming.
+         *
+         * @param $string
+         *
+         * @return mixed
+         */
+        public function block_props_replace( $string, $no_wrap = false ) {
+
+            if ( $no_wrap ) {
+                $string = str_replace( array( "[%", "%]" ), array( "props.attributes.", "" ), $string );
+            } else {
+                $string = str_replace( array( "[%", "%]" ), array( "'+props.attributes.", "+'" ), $string );
+            }
+
+            return $string;
+        }
+
+        /**
+         * Outputs the content of the widget
+         *
+         * @param array $args
+         * @param array $instance
+         */
+        public function widget( $args, $instance ) {
+
+            // get the filtered values
+            $argument_values = $this->argument_values( $instance );
+            $argument_values = $this->string_to_bool( $argument_values );
+            $output          = $this->output( $argument_values, $args );
+
+            $no_wrap = false;
+            if ( isset( $argument_values['no_wrap'] ) && $argument_values['no_wrap'] ) {
+                $no_wrap = true;
+            }
+
+            ob_start();
+            if ( $output && ! $no_wrap ) {
+
+                $class_original = $this->options['widget_ops']['classname'];
+                $class = $this->options['widget_ops']['classname']." sdel-".$this->get_instance_hash();
+
+                // Before widget
+                $before_widget = $args['before_widget'];
+                $before_widget = str_replace($class_original,$class,$before_widget);
+                $before_widget = apply_filters( 'wp_super_duper_before_widget', $before_widget, $args, $instance, $this );
+                $before_widget = apply_filters( 'wp_super_duper_before_widget_' . $this->base_id, $before_widget, $args, $instance, $this );
+
+                // After widget
+                $after_widget = $args['after_widget'];
+                $after_widget = apply_filters( 'wp_super_duper_after_widget', $after_widget, $args, $instance, $this );
+                $after_widget = apply_filters( 'wp_super_duper_after_widget_' . $this->base_id, $after_widget, $args, $instance, $this );
+
+                echo $before_widget;
+                // elementor strips the widget wrapping div so we check for and add it back if needed
+                if ( $this->is_elementor_widget_output() ) {
+                    // Filter class & attrs for elementor widget output.
+                    $class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
+                    $class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
+
+                    $attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
+                    $attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
+
+                    echo "<span class='" . esc_attr( $class  ) . "' " . $attrs . ">";
+                }
+                echo $this->output_title( $args, $instance );
+                echo $output;
+                if ( $this->is_elementor_widget_output() ) {
+                    echo "</span>";
+                }
+                echo $after_widget;
+            } elseif ( $this->is_preview() && $output == '' ) {// if preview show a placeholder if empty
+                $output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
+                echo $output;
+            } elseif ( $output && $no_wrap ) {
+                echo $output;
+            }
+            $output = ob_get_clean();
+
+            $output = apply_filters( 'wp_super_duper_widget_output', $output, $instance, $args, $this );
+
+            echo $output;
+        }
+
+        /**
+         * Tests if the current output is inside a elementor container.
+         *
+         * @since 1.0.4
+         * @return bool
+         */
+        public function is_elementor_widget_output() {
+            $result = false;
+            if ( defined( 'ELEMENTOR_VERSION' ) && isset( $this->number ) && $this->number == 'REPLACE_TO_ID' ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a elementor preview.
+         *
+         * @since 1.0.4
+         * @return bool
+         */
+        public function is_elementor_preview() {
+            $result = false;
+            if ( isset( $_REQUEST['elementor-preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) || ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor_ajax' ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a Divi preview.
+         *
+         * @since 1.0.6
+         * @return bool
+         */
+        public function is_divi_preview() {
+            $result = false;
+            if ( isset( $_REQUEST['et_fb'] ) || isset( $_REQUEST['et_pb_preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a Beaver builder preview.
+         *
+         * @since 1.0.6
+         * @return bool
+         */
+        public function is_beaver_preview() {
+            $result = false;
+            if ( isset( $_REQUEST['fl_builder'] ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a siteorigin builder preview.
+         *
+         * @since 1.0.6
+         * @return bool
+         */
+        public function is_siteorigin_preview() {
+            $result = false;
+            if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a cornerstone builder preview.
+         *
+         * @since 1.0.8
+         * @return bool
+         */
+        public function is_cornerstone_preview() {
+            $result = false;
+            if ( ! empty( $_REQUEST['cornerstone_preview'] ) || basename( $_SERVER['REQUEST_URI'] ) == 'cornerstone-endpoint' ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a fusion builder preview.
+         *
+         * @since 1.1.0
+         * @return bool
+         */
+        public function is_fusion_preview() {
+            $result = false;
+            if ( ! empty( $_REQUEST['fb-edit'] ) || ! empty( $_REQUEST['fusion_load_nonce'] ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a Oxygen builder preview.
+         *
+         * @since 1.0.18
+         * @return bool
+         */
+        public function is_oxygen_preview() {
+            $result = false;
+            if ( ! empty( $_REQUEST['ct_builder'] ) || ( ! empty( $_REQUEST['action'] ) && ( substr( $_REQUEST['action'], 0, 11 ) === "oxy_render_" || substr( $_REQUEST['action'], 0, 10 ) === "ct_render_" ) ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * General function to check if we are in a preview situation.
+         *
+         * @since 1.0.6
+         * @return bool
+         */
+        public function is_preview() {
+            $preview = false;
+            if ( $this->is_divi_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_elementor_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_beaver_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_siteorigin_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_cornerstone_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_fusion_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_oxygen_preview() ) {
+                $preview = true;
+            } elseif( $this->is_block_content_call() ) {
+                $preview = true;
+            }
+
+            return $preview;
+        }
+
+        /**
+         * Output the super title.
+         *
+         * @param $args
+         * @param array $instance
+         *
+         * @return string
+         */
+        public function output_title( $args, $instance = array() ) {
+            $output = '';
+            if ( ! empty( $instance['title'] ) ) {
+                /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
+                $title  = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
+
+                if(empty($instance['widget_title_tag'])){
+                    $output = $args['before_title'] . $title . $args['after_title'];
+                }else{
+                    $title_tag = esc_attr( $instance['widget_title_tag'] );
+
+                    // classes
+                    $title_classes = array();
+                    $title_classes[] = !empty( $instance['widget_title_size_class'] ) ? sanitize_html_class( $instance['widget_title_size_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_align_class'] ) ? sanitize_html_class( $instance['widget_title_align_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_color_class'] ) ? "text-".sanitize_html_class( $instance['widget_title_color_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_border_class'] ) ? sanitize_html_class( $instance['widget_title_border_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_border_color_class'] ) ? "border-".sanitize_html_class( $instance['widget_title_border_color_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_mt_class'] ) ? "mt-".absint( $instance['widget_title_mt_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_mr_class'] ) ? "mr-".absint( $instance['widget_title_mr_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_mb_class'] ) ? "mb-".absint( $instance['widget_title_mb_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_ml_class'] ) ? "ml-".absint( $instance['widget_title_ml_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_pt_class'] ) ? "pt-".absint( $instance['widget_title_pt_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_pr_class'] ) ? "pr-".absint( $instance['widget_title_pr_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_pb_class'] ) ? "pb-".absint( $instance['widget_title_pb_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_pl_class'] ) ? "pl-".absint( $instance['widget_title_pl_class'] ) : '';
+
+                    $class = !empty( $title_classes ) ? implode(" ",$title_classes) : '';
+                    $output = "<$title_tag class='$class' >$title</$title_tag>";
+                }
+
+            }
+
+            return $output;
+        }
+
+        /**
+         * Outputs the options form inputs for the widget.
+         *
+         * @param array $instance The widget options.
+         */
+        public function form( $instance ) {
+
+            // set widget instance
+            $this->instance = $instance;
+
+            // set it as a SD widget
+            echo $this->widget_advanced_toggle();
+
+            echo "<p>" . esc_attr( $this->options['widget_ops']['description'] ) . "</p>";
+            $arguments_raw = $this->get_arguments();
+
+            if ( is_array( $arguments_raw ) ) {
+
+                $arguments = $this->group_arguments( $arguments_raw );
+
+                // Do we have sections?
+                $has_sections = $arguments == $arguments_raw ? false : true;
+
+
+                if ( $has_sections ) {
+                    $panel_count = 0;
+                    foreach ( $arguments as $key => $args ) {
+
+                        ?>
 						<script>
 							//							jQuery(this).find("i").toggleClass("fas fa-chevron-up fas fa-chevron-down");jQuery(this).next().toggle();
 						</script>
 						<?php
 
-						$hide       = $panel_count ? ' style="display:none;" ' : '';
-						$icon_class = $panel_count ? 'fas fa-chevron-up' : 'fas fa-chevron-down';
-						echo "<button onclick='jQuery(this).find(\"i\").toggleClass(\"fas fa-chevron-up fas fa-chevron-down\");jQuery(this).next().slideToggle();' type='button' class='sd-toggle-group-button sd-input-group-toggle" . sanitize_title_with_dashes( $key ) . "'>" . esc_attr( $key ) . " <i style='float:right;' class='" . $icon_class . "'></i></button>";
-						echo "<div class='sd-toggle-group sd-input-group-" . sanitize_title_with_dashes( $key ) . "' $hide>";
+                        $hide       = $panel_count ? ' style="display:none;" ' : '';
+                        $icon_class = $panel_count ? 'fas fa-chevron-up' : 'fas fa-chevron-down';
+                        echo "<button onclick='jQuery(this).find(\"i\").toggleClass(\"fas fa-chevron-up fas fa-chevron-down\");jQuery(this).next().slideToggle();' type='button' class='sd-toggle-group-button sd-input-group-toggle" . sanitize_title_with_dashes( $key ) . "'>" . esc_attr( $key ) . " <i style='float:right;' class='" . $icon_class . "'></i></button>";
+                        echo "<div class='sd-toggle-group sd-input-group-" . sanitize_title_with_dashes( $key ) . "' $hide>";
 
-						foreach ( $args as $k => $a ) {
+                        foreach ( $args as $k => $a ) {
 
-							$this->widget_inputs_row_start($k, $a);
-							$this->widget_inputs( $a, $instance );
-							$this->widget_inputs_row_end($k, $a);
+                            $this->widget_inputs_row_start($k, $a);
+                            $this->widget_inputs( $a, $instance );
+                            $this->widget_inputs_row_end($k, $a);
 
-						}
+                        }
 
-						echo "</div>";
+                        echo "</div>";
 
-						$panel_count ++;
+                        $panel_count ++;
 
-					}
-				} else {
-					foreach ( $arguments as $key => $args ) {
-						$this->widget_inputs_row_start($key, $args);
-						$this->widget_inputs( $args, $instance );
-						$this->widget_inputs_row_end($key, $args);
-					}
-				}
+                    }
+                } else {
+                    foreach ( $arguments as $key => $args ) {
+                        $this->widget_inputs_row_start($key, $args);
+                        $this->widget_inputs( $args, $instance );
+                        $this->widget_inputs_row_end($key, $args);
+                    }
+                }
 
-			}
-		}
+            }
+        }
 
-		public function widget_inputs_row_start($key, $args){
-			if(!empty($args['row'])){
-				// maybe open
-				if(!empty($args['row']['open'])){
-					?>
+        public function widget_inputs_row_start($key, $args){
+            if(!empty($args['row'])){
+                // maybe open
+                if(!empty($args['row']['open'])){
+                    ?>
 					<div class='bsui sd-argument ' data-argument='<?php echo esc_attr( $args['row']['key'] ); ?>' data-element_require='<?php if ( !empty($args['row']['element_require'])) {
-						echo $this->convert_element_require( $args['row']['element_require'] );
-					} ?>'>
+                        echo $this->convert_element_require( $args['row']['element_require'] );
+                    } ?>'>
 					<?php if(!empty($args['row']['title'])){ ?>
 					<label class="mb-0 "><?php echo esc_attr( $args['row']['title'] ); ?><?php echo $this->widget_field_desc( $args['row'] ); ?></label>
 					<?php }?>
 					<div class='row <?php if(!empty($args['row']['class'])){ echo esc_attr($args['row']['class']);} ?>'>
 					<div class='col pr-2'>
 					<?php
-				}elseif(!empty($args['row']['close'])){
-					echo "<div class='col pl-0'>";
-				}else{
-					echo "<div class='col pl-0 pr-2'>";
-				}
-			}
-		}
-
-		public function widget_inputs_row_end($key, $args){
-
-			if(!empty($args['row'])){
-				// maybe close
-				if(!empty($args['row']['close'])){
-					echo "</div></div>";
-				}
-
-				echo "</div>";
-			}
-		}
-
-		/**
-		 * Get the hidden input that when added makes the advanced button show on widget settings.
-		 *
-		 * @return string
-		 */
-		public function widget_advanced_toggle() {
-
-			$output = '';
-			if ( $this->block_show_advanced() ) {
-				$val = 1;
-			} else {
-				$val = 0;
-			}
-
-			$output .= "<input type='hidden'  class='sd-show-advanced' value='$val' />";
-
-			return $output;
-		}
-
-		/**
-		 * Convert require element.
-		 *
-		 * @since 1.0.0
-		 *
-		 * @param string $input Input element.
-		 *
-		 * @return string $output
-		 */
-		public function convert_element_require( $input ) {
-
-			$input = str_replace( "'", '"', $input );// we only want double quotes
-
-			$output = esc_attr( str_replace( array( "[%", "%]" ), array(
-				"jQuery(form).find('[data-argument=\"",
-				"\"]').find('input,select,textarea').val()"
-			), $input ) );
-
-			return $output;
-		}
-
-		/**
-		 * Builds the inputs for the widget options.
-		 *
-		 * @param $args
-		 * @param $instance
-		 */
-		public function widget_inputs( $args, $instance ) {
-
-			$class             = "";
-			$element_require   = "";
-			$custom_attributes = "";
-
-			// get value
-			if ( isset( $instance[ $args['name'] ] ) ) {
-				$value = $instance[ $args['name'] ];
-			} elseif ( ! isset( $instance[ $args['name'] ] ) && ! empty( $args['default'] ) ) {
-				$value = is_array( $args['default'] ) ? array_map( "esc_html", $args['default'] ) : esc_html( $args['default'] );
-			} else {
-				$value = '';
-			}
-
-			// get placeholder
-			if ( ! empty( $args['placeholder'] ) ) {
-				$placeholder = "placeholder='" . esc_html( $args['placeholder'] ) . "'";
-			} else {
-				$placeholder = '';
-			}
-
-			// get if advanced
-			if ( isset( $args['advanced'] ) && $args['advanced'] ) {
-				$class .= " sd-advanced-setting ";
-			}
-
-			// element_require
-			if ( isset( $args['element_require'] ) && $args['element_require'] ) {
-				$element_require = $args['element_require'];
-			}
-
-			// custom_attributes
-			if ( isset( $args['custom_attributes'] ) && $args['custom_attributes'] ) {
-				$custom_attributes = $this->array_to_attributes( $args['custom_attributes'], true );
-			}
-
-
-			// before wrapper
-			?>
+                }elseif(!empty($args['row']['close'])){
+                    echo "<div class='col pl-0'>";
+                }else{
+                    echo "<div class='col pl-0 pr-2'>";
+                }
+            }
+        }
+
+        public function widget_inputs_row_end($key, $args){
+
+            if(!empty($args['row'])){
+                // maybe close
+                if(!empty($args['row']['close'])){
+                    echo "</div></div>";
+                }
+
+                echo "</div>";
+            }
+        }
+
+        /**
+         * Get the hidden input that when added makes the advanced button show on widget settings.
+         *
+         * @return string
+         */
+        public function widget_advanced_toggle() {
+
+            $output = '';
+            if ( $this->block_show_advanced() ) {
+                $val = 1;
+            } else {
+                $val = 0;
+            }
+
+            $output .= "<input type='hidden'  class='sd-show-advanced' value='$val' />";
+
+            return $output;
+        }
+
+        /**
+         * Convert require element.
+         *
+         * @since 1.0.0
+         *
+         * @param string $input Input element.
+         *
+         * @return string $output
+         */
+        public function convert_element_require( $input ) {
+
+            $input = str_replace( "'", '"', $input );// we only want double quotes
+
+            $output = esc_attr( str_replace( array( "[%", "%]" ), array(
+                "jQuery(form).find('[data-argument=\"",
+                "\"]').find('input,select,textarea').val()"
+            ), $input ) );
+
+            return $output;
+        }
+
+        /**
+         * Builds the inputs for the widget options.
+         *
+         * @param $args
+         * @param $instance
+         */
+        public function widget_inputs( $args, $instance ) {
+
+            $class             = "";
+            $element_require   = "";
+            $custom_attributes = "";
+
+            // get value
+            if ( isset( $instance[ $args['name'] ] ) ) {
+                $value = $instance[ $args['name'] ];
+            } elseif ( ! isset( $instance[ $args['name'] ] ) && ! empty( $args['default'] ) ) {
+                $value = is_array( $args['default'] ) ? array_map( "esc_html", $args['default'] ) : esc_html( $args['default'] );
+            } else {
+                $value = '';
+            }
+
+            // get placeholder
+            if ( ! empty( $args['placeholder'] ) ) {
+                $placeholder = "placeholder='" . esc_html( $args['placeholder'] ) . "'";
+            } else {
+                $placeholder = '';
+            }
+
+            // get if advanced
+            if ( isset( $args['advanced'] ) && $args['advanced'] ) {
+                $class .= " sd-advanced-setting ";
+            }
+
+            // element_require
+            if ( isset( $args['element_require'] ) && $args['element_require'] ) {
+                $element_require = $args['element_require'];
+            }
+
+            // custom_attributes
+            if ( isset( $args['custom_attributes'] ) && $args['custom_attributes'] ) {
+                $custom_attributes = $this->array_to_attributes( $args['custom_attributes'], true );
+            }
+
+
+            // before wrapper
+            ?>
 			<p class="sd-argument <?php echo esc_attr( $class ); ?>"
 			data-argument='<?php echo esc_attr( $args['name'] ); ?>'
 			data-element_require='<?php if ( $element_require ) {
-				echo $this->convert_element_require( $element_require );
-			} ?>'
+                echo $this->convert_element_require( $element_require );
+            } ?>'
 			>
 			<?php
 
 
-			switch ( $args['type'] ) {
-				//array('text','password','number','email','tel','url','color')
-				case "text":
-				case "password":
-				case "number":
-				case "email":
-				case "tel":
-				case "url":
-				case "color":
-					?>
+            switch ( $args['type'] ) {
+                //array('text','password','number','email','tel','url','color')
+                case "text":
+                case "password":
+                case "number":
+                case "email":
+                case "tel":
+                case "url":
+                case "color":
+                    ?>
 					<label
 						for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args );?><?php echo $this->widget_field_desc( $args ); ?></label>
 					<input <?php echo $placeholder; ?> class="widefat"
@@ -2966,47 +2966,47 @@ 
 						                               value="<?php echo esc_attr( $value ); ?>">
 					<?php
 
-					break;
-				case "select":
-					$multiple = isset( $args['multiple'] ) && $args['multiple'] ? true : false;
-					if ( $multiple ) {
-						if ( empty( $value ) ) {
-							$value = array();
-						}
-					}
-					?>
+                    break;
+                case "select":
+                    $multiple = isset( $args['multiple'] ) && $args['multiple'] ? true : false;
+                    if ( $multiple ) {
+                        if ( empty( $value ) ) {
+                            $value = array();
+                        }
+                    }
+                    ?>
 					<label
 						for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
 					<select <?php echo $placeholder; ?> class="widefat"
 						<?php echo $custom_attributes; ?>
 						                                id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
 						                                name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) );
-						                                if ( $multiple ) {
-							                                echo "[]";
-						                                } ?>"
+                                                        if ( $multiple ) {
+                                                            echo "[]";
+                                                        } ?>"
 						<?php if ( $multiple ) {
-							echo "multiple";
-						} //@todo not implemented yet due to gutenberg not supporting it
-						?>
+                            echo "multiple";
+                        } //@todo not implemented yet due to gutenberg not supporting it
+                        ?>
 					>
 						<?php
 
-						if ( ! empty( $args['options'] ) ) {
-							foreach ( $args['options'] as $val => $label ) {
-								if ( $multiple ) {
-									$selected = in_array( $val, $value ) ? 'selected="selected"' : '';
-								} else {
-									$selected = selected( $value, $val, false );
-								}
-								echo "<option value='$val' " . $selected . ">$label</option>";
-							}
-						}
-						?>
+                        if ( ! empty( $args['options'] ) ) {
+                            foreach ( $args['options'] as $val => $label ) {
+                                if ( $multiple ) {
+                                    $selected = in_array( $val, $value ) ? 'selected="selected"' : '';
+                                } else {
+                                    $selected = selected( $value, $val, false );
+                                }
+                                echo "<option value='$val' " . $selected . ">$label</option>";
+                            }
+                        }
+                        ?>
 					</select>
 					<?php
-					break;
-				case "checkbox":
-					?>
+                    break;
+                case "checkbox":
+                    ?>
 					<input <?php echo $placeholder; ?>
 						<?php checked( 1, $value, true ) ?>
 						<?php echo $custom_attributes; ?>
@@ -3016,9 +3016,9 @@ 
 					<label
 						for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args );?><?php echo $this->widget_field_desc( $args ); ?></label>
 					<?php
-					break;
-				case "textarea":
-					?>
+                    break;
+                case "textarea":
+                    ?>
 					<label
 						for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
 					<textarea <?php echo $placeholder; ?> class="widefat"
@@ -3028,280 +3028,280 @@ 
 					><?php echo esc_attr( $value ); ?></textarea>
 					<?php
 
-					break;
-				case "hidden":
-					?>
+                    break;
+                case "hidden":
+                    ?>
 					<input id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
 					       name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="hidden"
 					       value="<?php echo esc_attr( $value ); ?>">
 					<?php
-					break;
-				default:
-					echo "No input type found!"; // @todo we need to add more input types.
-			}
+                    break;
+                default:
+                    echo "No input type found!"; // @todo we need to add more input types.
+            }
 
-			// after wrapper
-			?>
+            // after wrapper
+            ?>
 			</p>
 			<?php
 
 
-		}
-
-		public function get_widget_icon($icon = 'box-top', $title = ''){
-			if($icon=='box-top'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.048" height="9.017" fill="#555D66"></rect><rect x="16.265" y="5.498" width="1.023" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.186" width="8.964" height="2.482" fill="#272B2F"></rect><rect x="5.487" y="16.261" width="9.026" height="1.037" fill="#555D66"></rect></svg>';
-			}elseif($icon=='box-right'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.046" height="9.017" fill="#555D66"></rect><rect x="15.244" y="5.498" width="2.518" height="9.003" fill="#272B2F"></rect><rect x="5.518" y="2.719" width="8.964" height="0.954" fill="#555D66"></rect><rect x="5.487" y="16.308" width="9.026" height="0.99" fill="#555D66"></rect></svg>';
-			}elseif($icon=='box-bottom'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1" height="9.017" fill="#555D66"></rect><rect x="16.261" y="5.498" width="1.027" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.968" fill="#555D66"></rect><rect x="5.487" y="15.28" width="9.026" height="2.499" fill="#272B2F"></rect></svg>';
-			}elseif($icon=='box-left'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.202" y="5.492" width="2.503" height="9.017" fill="#272B2F"></rect><rect x="16.276" y="5.498" width="1.012" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.966" fill="#555D66"></rect><rect x="5.487" y="16.303" width="9.026" height="0.995" fill="#555D66"></rect></svg>';
-			}
-		}
-
-		/**
-		 * Get the widget input description html.
-		 *
-		 * @param $args
-		 *
-		 * @return string
-		 * @todo, need to make its own tooltip script
-		 */
-		public function widget_field_desc( $args ) {
-
-			$description = '';
-			if ( isset( $args['desc'] ) && $args['desc'] ) {
-				if ( isset( $args['desc_tip'] ) && $args['desc_tip'] ) {
-					$description = $this->desc_tip( $args['desc'] );
-				} else {
-					$description = '<span class="description">' . wp_kses_post( $args['desc'] ) . '</span>';
-				}
-			}
-
-			return $description;
-		}
-
-		/**
-		 * Get the widget input title html.
-		 *
-		 * @param $args
-		 *
-		 * @return string
-		 */
-		public function widget_field_title( $args ) {
-
-			$title = '';
-			if ( isset( $args['title'] ) && $args['title'] ) {
-				if ( isset( $args['icon'] ) && $args['icon'] ) {
-					$title = self::get_widget_icon( $args['icon'], $args['title']  );
-				} else {
-					$title = esc_attr($args['title']);
-				}
-			}
-
-			return $title;
-		}
-
-		/**
-		 * Get the tool tip html.
-		 *
-		 * @param $tip
-		 * @param bool $allow_html
-		 *
-		 * @return string
-		 */
-		function desc_tip( $tip, $allow_html = false ) {
-			if ( $allow_html ) {
-				$tip = $this->sanitize_tooltip( $tip );
-			} else {
-				$tip = esc_attr( $tip );
-			}
-
-			return '<span class="gd-help-tip dashicons dashicons-editor-help" title="' . $tip . '"></span>';
-		}
-
-		/**
-		 * Sanitize a string destined to be a tooltip.
-		 *
-		 * @param string $var
-		 *
-		 * @return string
-		 */
-		public function sanitize_tooltip( $var ) {
-			return htmlspecialchars( wp_kses( html_entity_decode( $var ), array(
-				'br'     => array(),
-				'em'     => array(),
-				'strong' => array(),
-				'small'  => array(),
-				'span'   => array(),
-				'ul'     => array(),
-				'li'     => array(),
-				'ol'     => array(),
-				'p'      => array(),
-			) ) );
-		}
-
-		/**
-		 * Processing widget options on save
-		 *
-		 * @param array $new_instance The new options
-		 * @param array $old_instance The previous options
-		 *
-		 * @return array
-		 * @todo we should add some sanitation here.
-		 */
-		public function update( $new_instance, $old_instance ) {
-
-			//save the widget
-			$instance = array_merge( (array) $old_instance, (array) $new_instance );
-
-			// set widget instance
-			$this->instance = $instance;
-
-			if ( empty( $this->arguments ) ) {
-				$this->get_arguments();
-			}
-
-			// check for checkboxes
-			if ( ! empty( $this->arguments ) ) {
-				foreach ( $this->arguments as $argument ) {
-					if ( isset( $argument['type'] ) && $argument['type'] == 'checkbox' && ! isset( $new_instance[ $argument['name'] ] ) ) {
-						$instance[ $argument['name'] ] = '0';
-					}
-				}
-			}
-
-			return $instance;
-		}
-
-		/**
-		 * Checks if the current call is a ajax call to get the block content.
-		 *
-		 * This can be used in your widget to return different content as the block content.
-		 *
-		 * @since 1.0.3
-		 * @return bool
-		 */
-		public function is_block_content_call() {
-			$result = false;
-			if ( wp_doing_ajax() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'super_duper_output_shortcode' ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Get an instance hash that will be unique to the type and settings.
-		 *
-		 * @since 1.0.20
-		 * @return string
-		 */
-		public function get_instance_hash(){
-			$instance_string = $this->base_id.serialize($this->instance);
-			return hash('crc32b',$instance_string);
-		}
-
-		/**
-		 * Generate and return inline styles from CSS rules that will match the unique class of the instance.
-		 *
-		 * @param array $rules
-		 *
-		 * @since 1.0.20
-		 * @return string
-		 */
-		public function get_instance_style($rules = array()){
-			$css = '';
-
-			if(!empty($rules)){
-				$rules = array_unique($rules);
-				$instance_hash = $this->get_instance_hash();
-				$css .= "<style>";
-				foreach($rules as $rule){
-					$css .= ".sdel-$instance_hash $rule";
-				}
-				$css .= "</style>";
-			}
-
-			return $css;
-		}
-
-		/**
-		 * Encode shortcodes tags.
-		 *
-		 * @since 1.0.28
-		 *
-		 * @param string $content Content to search for shortcode tags.
-		 * @return string Content with shortcode tags removed.
-		 */
-		public function encode_shortcodes( $content ) {
-			// Avoids existing encoded tags.
-			$trans   = array(
-				'&#91;' => '&#091;',
-				'&#93;' => '&#093;',
-				'&amp;#91;' => '&#091;',
-				'&amp;#93;' => '&#093;',
-				'&lt;' => '&0lt;',
-				'&gt;' => '&0gt;',
-				'&amp;lt;' => '&0lt;',
-				'&amp;gt;' => '&0gt;',
-			);
-
-			$content = strtr( $content, $trans );
-
-			$trans   = array(
-				'[' => '&#91;',
-				']' => '&#93;',
-				'<' => '&lt;',
-				'>' => '&gt;',
-				'"' => '&quot;',
-				"'" => '&apos;',
-			);
-
-			$content = strtr( $content, $trans );
-
-			return $content;
-		}
-
-		/**
-		 * Remove encoded shortcod tags.
-		 *
-		 * @since 1.0.28
-		 *
-		 * @param string $content Content to search for shortcode tags.
-		 * @return string Content with decoded shortcode tags.
-		 */
-		public function decode_shortcodes( $content ) {
-			$trans   = array(
-				'&#91;' => '[',
-				'&#93;' => ']',
-				'&amp;#91;' => '[',
-				'&amp;#93;' => ']',
-				'&lt;' => '<',
-				'&gt;' => '>',
-				'&amp;lt;' => '<',
-				'&amp;gt;' => '>',
-				'&quot;' => '"',
-				'&apos;' => "'",
-			);
-
-			$content = strtr( $content, $trans );
-
-			$trans   = array(
-				'&#091;' => '&#91;',
-				'&#093;' => '&#93;',
-				'&amp;#091;' => '&#91;',
-				'&amp;#093;' => '&#93;',
-				'&0lt;' => '&lt;',
-				'&0gt;' => '&gt;',
-				'&amp;0lt;' => '&lt;',
-				'&amp;0gt;' => '&gt;',
-			);
-
-			$content = strtr( $content, $trans );
-
-			return $content;
-		}
-	}
+        }
+
+        public function get_widget_icon($icon = 'box-top', $title = ''){
+            if($icon=='box-top'){
+                return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.048" height="9.017" fill="#555D66"></rect><rect x="16.265" y="5.498" width="1.023" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.186" width="8.964" height="2.482" fill="#272B2F"></rect><rect x="5.487" y="16.261" width="9.026" height="1.037" fill="#555D66"></rect></svg>';
+            }elseif($icon=='box-right'){
+                return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.046" height="9.017" fill="#555D66"></rect><rect x="15.244" y="5.498" width="2.518" height="9.003" fill="#272B2F"></rect><rect x="5.518" y="2.719" width="8.964" height="0.954" fill="#555D66"></rect><rect x="5.487" y="16.308" width="9.026" height="0.99" fill="#555D66"></rect></svg>';
+            }elseif($icon=='box-bottom'){
+                return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1" height="9.017" fill="#555D66"></rect><rect x="16.261" y="5.498" width="1.027" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.968" fill="#555D66"></rect><rect x="5.487" y="15.28" width="9.026" height="2.499" fill="#272B2F"></rect></svg>';
+            }elseif($icon=='box-left'){
+                return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.202" y="5.492" width="2.503" height="9.017" fill="#272B2F"></rect><rect x="16.276" y="5.498" width="1.012" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.966" fill="#555D66"></rect><rect x="5.487" y="16.303" width="9.026" height="0.995" fill="#555D66"></rect></svg>';
+            }
+        }
+
+        /**
+         * Get the widget input description html.
+         *
+         * @param $args
+         *
+         * @return string
+         * @todo, need to make its own tooltip script
+         */
+        public function widget_field_desc( $args ) {
+
+            $description = '';
+            if ( isset( $args['desc'] ) && $args['desc'] ) {
+                if ( isset( $args['desc_tip'] ) && $args['desc_tip'] ) {
+                    $description = $this->desc_tip( $args['desc'] );
+                } else {
+                    $description = '<span class="description">' . wp_kses_post( $args['desc'] ) . '</span>';
+                }
+            }
+
+            return $description;
+        }
+
+        /**
+         * Get the widget input title html.
+         *
+         * @param $args
+         *
+         * @return string
+         */
+        public function widget_field_title( $args ) {
+
+            $title = '';
+            if ( isset( $args['title'] ) && $args['title'] ) {
+                if ( isset( $args['icon'] ) && $args['icon'] ) {
+                    $title = self::get_widget_icon( $args['icon'], $args['title']  );
+                } else {
+                    $title = esc_attr($args['title']);
+                }
+            }
+
+            return $title;
+        }
+
+        /**
+         * Get the tool tip html.
+         *
+         * @param $tip
+         * @param bool $allow_html
+         *
+         * @return string
+         */
+        function desc_tip( $tip, $allow_html = false ) {
+            if ( $allow_html ) {
+                $tip = $this->sanitize_tooltip( $tip );
+            } else {
+                $tip = esc_attr( $tip );
+            }
+
+            return '<span class="gd-help-tip dashicons dashicons-editor-help" title="' . $tip . '"></span>';
+        }
+
+        /**
+         * Sanitize a string destined to be a tooltip.
+         *
+         * @param string $var
+         *
+         * @return string
+         */
+        public function sanitize_tooltip( $var ) {
+            return htmlspecialchars( wp_kses( html_entity_decode( $var ), array(
+                'br'     => array(),
+                'em'     => array(),
+                'strong' => array(),
+                'small'  => array(),
+                'span'   => array(),
+                'ul'     => array(),
+                'li'     => array(),
+                'ol'     => array(),
+                'p'      => array(),
+            ) ) );
+        }
+
+        /**
+         * Processing widget options on save
+         *
+         * @param array $new_instance The new options
+         * @param array $old_instance The previous options
+         *
+         * @return array
+         * @todo we should add some sanitation here.
+         */
+        public function update( $new_instance, $old_instance ) {
+
+            //save the widget
+            $instance = array_merge( (array) $old_instance, (array) $new_instance );
+
+            // set widget instance
+            $this->instance = $instance;
+
+            if ( empty( $this->arguments ) ) {
+                $this->get_arguments();
+            }
+
+            // check for checkboxes
+            if ( ! empty( $this->arguments ) ) {
+                foreach ( $this->arguments as $argument ) {
+                    if ( isset( $argument['type'] ) && $argument['type'] == 'checkbox' && ! isset( $new_instance[ $argument['name'] ] ) ) {
+                        $instance[ $argument['name'] ] = '0';
+                    }
+                }
+            }
+
+            return $instance;
+        }
+
+        /**
+         * Checks if the current call is a ajax call to get the block content.
+         *
+         * This can be used in your widget to return different content as the block content.
+         *
+         * @since 1.0.3
+         * @return bool
+         */
+        public function is_block_content_call() {
+            $result = false;
+            if ( wp_doing_ajax() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'super_duper_output_shortcode' ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Get an instance hash that will be unique to the type and settings.
+         *
+         * @since 1.0.20
+         * @return string
+         */
+        public function get_instance_hash(){
+            $instance_string = $this->base_id.serialize($this->instance);
+            return hash('crc32b',$instance_string);
+        }
+
+        /**
+         * Generate and return inline styles from CSS rules that will match the unique class of the instance.
+         *
+         * @param array $rules
+         *
+         * @since 1.0.20
+         * @return string
+         */
+        public function get_instance_style($rules = array()){
+            $css = '';
+
+            if(!empty($rules)){
+                $rules = array_unique($rules);
+                $instance_hash = $this->get_instance_hash();
+                $css .= "<style>";
+                foreach($rules as $rule){
+                    $css .= ".sdel-$instance_hash $rule";
+                }
+                $css .= "</style>";
+            }
+
+            return $css;
+        }
+
+        /**
+         * Encode shortcodes tags.
+         *
+         * @since 1.0.28
+         *
+         * @param string $content Content to search for shortcode tags.
+         * @return string Content with shortcode tags removed.
+         */
+        public function encode_shortcodes( $content ) {
+            // Avoids existing encoded tags.
+            $trans   = array(
+                '&#91;' => '&#091;',
+                '&#93;' => '&#093;',
+                '&amp;#91;' => '&#091;',
+                '&amp;#93;' => '&#093;',
+                '&lt;' => '&0lt;',
+                '&gt;' => '&0gt;',
+                '&amp;lt;' => '&0lt;',
+                '&amp;gt;' => '&0gt;',
+            );
+
+            $content = strtr( $content, $trans );
+
+            $trans   = array(
+                '[' => '&#91;',
+                ']' => '&#93;',
+                '<' => '&lt;',
+                '>' => '&gt;',
+                '"' => '&quot;',
+                "'" => '&apos;',
+            );
+
+            $content = strtr( $content, $trans );
+
+            return $content;
+        }
+
+        /**
+         * Remove encoded shortcod tags.
+         *
+         * @since 1.0.28
+         *
+         * @param string $content Content to search for shortcode tags.
+         * @return string Content with decoded shortcode tags.
+         */
+        public function decode_shortcodes( $content ) {
+            $trans   = array(
+                '&#91;' => '[',
+                '&#93;' => ']',
+                '&amp;#91;' => '[',
+                '&amp;#93;' => ']',
+                '&lt;' => '<',
+                '&gt;' => '>',
+                '&amp;lt;' => '<',
+                '&amp;gt;' => '>',
+                '&quot;' => '"',
+                '&apos;' => "'",
+            );
+
+            $content = strtr( $content, $trans );
+
+            $trans   = array(
+                '&#091;' => '&#91;',
+                '&#093;' => '&#93;',
+                '&amp;#091;' => '&#91;',
+                '&amp;#093;' => '&#93;',
+                '&0lt;' => '&lt;',
+                '&0gt;' => '&gt;',
+                '&amp;0lt;' => '&lt;',
+                '&amp;0gt;' => '&gt;',
+            );
+
+            $content = strtr( $content, $trans );
+
+            return $content;
+        }
+    }
 }
\ No newline at end of file

vendor/composer/InstalledVersions.php

Indentation +60 added lines, -60 removed lines

@@ -12,8 +12,8 @@ 
 class InstalledVersions
 {
 private static $installed = array (
-  'root' => 
-  array (
+    'root' => 
+    array (
     'pretty_version' => 'dev-master',
     'version' => 'dev-master',
     'aliases' => 
@@ -21,96 +21,96 @@ 
     ),
     'reference' => '6acdeda97fbd759d4e263c86581ddd1f32888954',
     'name' => 'ayecode/invoicing',
-  ),
-  'versions' => 
-  array (
+    ),
+    'versions' => 
+    array (
     'ayecode/ayecode-connect-helper' => 
     array (
-      'pretty_version' => '1.0.3',
-      'version' => '1.0.3.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => '1af7cdefdbd20d4443a3ab4834e4c1cd8fe57fb4',
+        'pretty_version' => '1.0.3',
+        'version' => '1.0.3.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => '1af7cdefdbd20d4443a3ab4834e4c1cd8fe57fb4',
     ),
     'ayecode/invoicing' => 
     array (
-      'pretty_version' => 'dev-master',
-      'version' => 'dev-master',
-      'aliases' => 
-      array (
-      ),
-      'reference' => '6acdeda97fbd759d4e263c86581ddd1f32888954',
+        'pretty_version' => 'dev-master',
+        'version' => 'dev-master',
+        'aliases' => 
+        array (
+        ),
+        'reference' => '6acdeda97fbd759d4e263c86581ddd1f32888954',
     ),
     'ayecode/wp-ayecode-ui' => 
     array (
-      'pretty_version' => '0.1.62',
-      'version' => '0.1.62.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'f0625aa6f695cef39fe75bc1707026824e9841d9',
+        'pretty_version' => '0.1.62',
+        'version' => '0.1.62.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => 'f0625aa6f695cef39fe75bc1707026824e9841d9',
     ),
     'ayecode/wp-deactivation-survey' => 
     array (
-      'pretty_version' => '1.0.4',
-      'version' => '1.0.4.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'd2777fed30acfc4da53b45bf3b4fec2fb27d8398',
+        'pretty_version' => '1.0.4',
+        'version' => '1.0.4.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => 'd2777fed30acfc4da53b45bf3b4fec2fb27d8398',
     ),
     'ayecode/wp-font-awesome-settings' => 
     array (
-      'pretty_version' => '1.0.13',
-      'version' => '1.0.13.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'a7a11ee4290674ec214d1fe694139af275350402',
+        'pretty_version' => '1.0.13',
+        'version' => '1.0.13.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => 'a7a11ee4290674ec214d1fe694139af275350402',
     ),
     'ayecode/wp-super-duper' => 
     array (
-      'pretty_version' => '1.0.27',
-      'version' => '1.0.27.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'ce187bc9afc5cd7f5d790d84eb6fd9b98e56992d',
+        'pretty_version' => '1.0.27',
+        'version' => '1.0.27.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => 'ce187bc9afc5cd7f5d790d84eb6fd9b98e56992d',
     ),
     'composer/installers' => 
     array (
-      'pretty_version' => 'v1.12.0',
-      'version' => '1.12.0.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'd20a64ed3c94748397ff5973488761b22f6d3f19',
+        'pretty_version' => 'v1.12.0',
+        'version' => '1.12.0.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => 'd20a64ed3c94748397ff5973488761b22f6d3f19',
     ),
     'maxmind-db/reader' => 
     array (
-      'pretty_version' => 'v1.6.0',
-      'version' => '1.6.0.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'febd4920bf17c1da84cef58e56a8227dfb37fbe4',
+        'pretty_version' => 'v1.6.0',
+        'version' => '1.6.0.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => 'febd4920bf17c1da84cef58e56a8227dfb37fbe4',
     ),
     'roundcube/plugin-installer' => 
     array (
-      'replaced' => 
-      array (
+        'replaced' => 
+        array (
         0 => '*',
-      ),
+        ),
     ),
     'shama/baton' => 
     array (
-      'replaced' => 
-      array (
+        'replaced' => 
+        array (
         0 => '*',
-      ),
+        ),
+    ),
     ),
-  ),
 );
 
 

vendor/composer/installed.php

Indentation +60 added lines, -60 removed lines

@@ -1,6 +1,6 @@ 
 <?php return array (
-  'root' => 
-  array (
+    'root' => 
+    array (
     'pretty_version' => 'dev-master',
     'version' => 'dev-master',
     'aliases' => 
@@ -8,94 +8,94 @@ 
     ),
     'reference' => '6acdeda97fbd759d4e263c86581ddd1f32888954',
     'name' => 'ayecode/invoicing',
-  ),
-  'versions' => 
-  array (
+    ),
+    'versions' => 
+    array (
     'ayecode/ayecode-connect-helper' => 
     array (
-      'pretty_version' => '1.0.3',
-      'version' => '1.0.3.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => '1af7cdefdbd20d4443a3ab4834e4c1cd8fe57fb4',
+        'pretty_version' => '1.0.3',
+        'version' => '1.0.3.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => '1af7cdefdbd20d4443a3ab4834e4c1cd8fe57fb4',
     ),
     'ayecode/invoicing' => 
     array (
-      'pretty_version' => 'dev-master',
-      'version' => 'dev-master',
-      'aliases' => 
-      array (
-      ),
-      'reference' => '6acdeda97fbd759d4e263c86581ddd1f32888954',
+        'pretty_version' => 'dev-master',
+        'version' => 'dev-master',
+        'aliases' => 
+        array (
+        ),
+        'reference' => '6acdeda97fbd759d4e263c86581ddd1f32888954',
     ),
     'ayecode/wp-ayecode-ui' => 
     array (
-      'pretty_version' => '0.1.62',
-      'version' => '0.1.62.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'f0625aa6f695cef39fe75bc1707026824e9841d9',
+        'pretty_version' => '0.1.62',
+        'version' => '0.1.62.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => 'f0625aa6f695cef39fe75bc1707026824e9841d9',
     ),
     'ayecode/wp-deactivation-survey' => 
     array (
-      'pretty_version' => '1.0.4',
-      'version' => '1.0.4.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'd2777fed30acfc4da53b45bf3b4fec2fb27d8398',
+        'pretty_version' => '1.0.4',
+        'version' => '1.0.4.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => 'd2777fed30acfc4da53b45bf3b4fec2fb27d8398',
     ),
     'ayecode/wp-font-awesome-settings' => 
     array (
-      'pretty_version' => '1.0.13',
-      'version' => '1.0.13.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'a7a11ee4290674ec214d1fe694139af275350402',
+        'pretty_version' => '1.0.13',
+        'version' => '1.0.13.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => 'a7a11ee4290674ec214d1fe694139af275350402',
     ),
     'ayecode/wp-super-duper' => 
     array (
-      'pretty_version' => '1.0.27',
-      'version' => '1.0.27.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'ce187bc9afc5cd7f5d790d84eb6fd9b98e56992d',
+        'pretty_version' => '1.0.27',
+        'version' => '1.0.27.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => 'ce187bc9afc5cd7f5d790d84eb6fd9b98e56992d',
     ),
     'composer/installers' => 
     array (
-      'pretty_version' => 'v1.12.0',
-      'version' => '1.12.0.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'd20a64ed3c94748397ff5973488761b22f6d3f19',
+        'pretty_version' => 'v1.12.0',
+        'version' => '1.12.0.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => 'd20a64ed3c94748397ff5973488761b22f6d3f19',
     ),
     'maxmind-db/reader' => 
     array (
-      'pretty_version' => 'v1.6.0',
-      'version' => '1.6.0.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'febd4920bf17c1da84cef58e56a8227dfb37fbe4',
+        'pretty_version' => 'v1.6.0',
+        'version' => '1.6.0.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => 'febd4920bf17c1da84cef58e56a8227dfb37fbe4',
     ),
     'roundcube/plugin-installer' => 
     array (
-      'replaced' => 
-      array (
+        'replaced' => 
+        array (
         0 => '*',
-      ),
+        ),
     ),
     'shama/baton' => 
     array (
-      'replaced' => 
-      array (
+        'replaced' => 
+        array (
         0 => '*',
-      ),
+        ),
+    ),
     ),
-  ),
 );

includes/admin/class-getpaid-metaboxes.php

Indentation +240 added lines, -240 removed lines

@@ -12,276 +12,276 @@
  */
 class GetPaid_Metaboxes {
 
-	/**
-	 * Only save metaboxes once.
-	 *
-	 * @var boolean
-	 */
-	private static $saved_meta_boxes = false;
-
     /**
-	 * Hook in methods.
-	 */
-	public static function init() {
-
-		// Register metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::add_meta_boxes', 5, 2 );
-
-		// Remove metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::remove_meta_boxes', 30 );
-
-		// Rename metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::rename_meta_boxes', 45 );
-
-		// Save metaboxes.
-		add_action( 'save_post', 'GetPaid_Metaboxes::save_meta_boxes', 1, 2 );
-	}
-
-	/**
-	 * Register core metaboxes.
-	 */
-	public static function add_meta_boxes( $post_type, $post ) {
-
-		// For invoices...
-		self::add_invoice_meta_boxes( $post_type, $post );
-
-		// For payment forms.
-		self::add_payment_form_meta_boxes( $post_type, $post );
-
-		// For invoice items.
-		self::add_item_meta_boxes( $post_type );
-
-		// For invoice discounts.
-		if ( $post_type == 'wpi_discount' ) {
-			add_meta_box( 'wpinv_discount_details', __( 'Discount Details', 'invoicing' ), 'GetPaid_Meta_Box_Discount_Details::output', 'wpi_discount', 'normal', 'high' );
-		}
-
-	}
+     * Only save metaboxes once.
+     *
+     * @var boolean
+     */
+    private static $saved_meta_boxes = false;
 
-	/**
-	 * Register core metaboxes.
-	 */
-	protected static function add_payment_form_meta_boxes( $post_type, $post ) {
+    /**
+     * Hook in methods.
+     */
+    public static function init() {
 
-		// For payment forms.
-		if ( $post_type == 'wpi_payment_form' ) {
+        // Register metaboxes.
+        add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::add_meta_boxes', 5, 2 );
 
-			// Design payment form.
-			add_meta_box( 'wpinv-payment-form-design', __( 'Payment Form', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form::output', 'wpi_payment_form', 'normal' );
+        // Remove metaboxes.
+        add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::remove_meta_boxes', 30 );
 
-			// Payment form information.
-			if ( $post->ID != wpinv_get_default_payment_form() ) {
-				add_meta_box( 'wpinv-payment-form-info', __( 'Details', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form_Info::output', 'wpi_payment_form', 'side' );
-			}
+        // Rename metaboxes.
+        add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::rename_meta_boxes', 45 );
 
-		}
+        // Save metaboxes.
+        add_action( 'save_post', 'GetPaid_Metaboxes::save_meta_boxes', 1, 2 );
+    }
 
-	}
+    /**
+     * Register core metaboxes.
+     */
+    public static function add_meta_boxes( $post_type, $post ) {
 
-	/**
-	 * Register core metaboxes.
-	 */
-	protected static function add_item_meta_boxes( $post_type ) {
+        // For invoices...
+        self::add_invoice_meta_boxes( $post_type, $post );
 
-		if ( $post_type == 'wpi_item' ) {
+        // For payment forms.
+        self::add_payment_form_meta_boxes( $post_type, $post );
 
-			// Item details.
-			add_meta_box( 'wpinv_item_details', __( 'Item Details', 'invoicing' ), 'GetPaid_Meta_Box_Item_Details::output', 'wpi_item', 'normal', 'high' );
+        // For invoice items.
+        self::add_item_meta_boxes( $post_type );
 
-			// If taxes are enabled, register the tax metabox.
-			if ( wpinv_use_taxes() ) {
-				add_meta_box( 'wpinv_item_vat', __( 'Tax', 'invoicing' ), 'GetPaid_Meta_Box_Item_VAT::output', 'wpi_item', 'normal', 'high' );
-			}
+        // For invoice discounts.
+        if ( $post_type == 'wpi_discount' ) {
+            add_meta_box( 'wpinv_discount_details', __( 'Discount Details', 'invoicing' ), 'GetPaid_Meta_Box_Discount_Details::output', 'wpi_discount', 'normal', 'high' );
+        }
 
-			// Item info.
-			add_meta_box( 'wpinv_field_item_info', __( 'Item info', 'invoicing' ), 'GetPaid_Meta_Box_Item_Info::output', 'wpi_item', 'side', 'core' );
+    }
 
-		}
+    /**
+     * Register core metaboxes.
+     */
+    protected static function add_payment_form_meta_boxes( $post_type, $post ) {
 
-	}
+        // For payment forms.
+        if ( $post_type == 'wpi_payment_form' ) {
 
-	/**
-	 * Register invoice metaboxes.
-	 */
-	protected static function add_invoice_meta_boxes( $post_type, $post ) {
+            // Design payment form.
+            add_meta_box( 'wpinv-payment-form-design', __( 'Payment Form', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form::output', 'wpi_payment_form', 'normal' );
 
-		// For invoices...
-		if ( getpaid_is_invoice_post_type( $post_type ) ) {
-			$invoice = new WPInv_Invoice( $post );
+            // Payment form information.
+            if ( $post->ID != wpinv_get_default_payment_form() ) {
+                add_meta_box( 'wpinv-payment-form-info', __( 'Details', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form_Info::output', 'wpi_payment_form', 'side' );
+            }
 
-			// Resend invoice.
-			if ( ! $invoice->is_draft() ) {
+        }
 
-				add_meta_box(
-					'wpinv-mb-resend-invoice',
-					sprintf(
-						__( 'Resend %s', 'invoicing' ),
-						ucfirst( $invoice->get_invoice_quote_type() )
-					),
-					'GetPaid_Meta_Box_Resend_Invoice::output',
-					$post_type,
-					'side',
-					'low'
-				);
+    }
 
-			}
+    /**
+     * Register core metaboxes.
+     */
+    protected static function add_item_meta_boxes( $post_type ) {
 
-			// Subscriptions.
-			$subscriptions = getpaid_get_invoice_subscriptions( $invoice );
-			if ( ! empty( $subscriptions ) ) {
+        if ( $post_type == 'wpi_item' ) {
 
-				if ( is_array( $subscriptions ) ) {
-					add_meta_box( 'wpinv-mb-subscriptions', __( 'Related Subscriptions', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output_related', $post_type, 'advanced' );
-				} else {
-					add_meta_box( 'wpinv-mb-subscriptions', __( 'Subscription Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output', $post_type, 'advanced' );
-				}
+            // Item details.
+            add_meta_box( 'wpinv_item_details', __( 'Item Details', 'invoicing' ), 'GetPaid_Meta_Box_Item_Details::output', 'wpi_item', 'normal', 'high' );
 
-				if ( getpaid_count_subscription_invoices( $invoice->is_renewal() ? $invoice->get_parent_id() : $invoice->get_id() ) > 1 ) {
-					add_meta_box( 'wpinv-mb-subscription-invoices', __( 'Related Payments', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output_invoices', $post_type, 'advanced' );
-				}
+            // If taxes are enabled, register the tax metabox.
+            if ( wpinv_use_taxes() ) {
+                add_meta_box( 'wpinv_item_vat', __( 'Tax', 'invoicing' ), 'GetPaid_Meta_Box_Item_VAT::output', 'wpi_item', 'normal', 'high' );
+            }
 
-			}
+            // Item info.
+            add_meta_box( 'wpinv_field_item_info', __( 'Item info', 'invoicing' ), 'GetPaid_Meta_Box_Item_Info::output', 'wpi_item', 'side', 'core' );
 
-			// Invoice details.
-			add_meta_box(
-				'wpinv-details',
-				sprintf(
-					__( '%s Details', 'invoicing' ),
-					ucfirst( $invoice->get_invoice_quote_type() )
-				),
-				'GetPaid_Meta_Box_Invoice_Details::output',
-				$post_type,
-				'side'
-			);
+        }
 
-			// Payment details.
-			add_meta_box( 'wpinv-payment-meta', __( 'Payment Meta', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Payment_Meta::output', $post_type, 'side', 'default' );
+    }
 
-			// Billing details.
-			add_meta_box( 'wpinv-address', __( 'Billing Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Address::output', $post_type, 'normal', 'high' );
+    /**
+     * Register invoice metaboxes.
+     */
+    protected static function add_invoice_meta_boxes( $post_type, $post ) {
+
+        // For invoices...
+        if ( getpaid_is_invoice_post_type( $post_type ) ) {
+            $invoice = new WPInv_Invoice( $post );
+
+            // Resend invoice.
+            if ( ! $invoice->is_draft() ) {
+
+                add_meta_box(
+                    'wpinv-mb-resend-invoice',
+                    sprintf(
+                        __( 'Resend %s', 'invoicing' ),
+                        ucfirst( $invoice->get_invoice_quote_type() )
+                    ),
+                    'GetPaid_Meta_Box_Resend_Invoice::output',
+                    $post_type,
+                    'side',
+                    'low'
+                );
+
+            }
+
+            // Subscriptions.
+            $subscriptions = getpaid_get_invoice_subscriptions( $invoice );
+            if ( ! empty( $subscriptions ) ) {
+
+                if ( is_array( $subscriptions ) ) {
+                    add_meta_box( 'wpinv-mb-subscriptions', __( 'Related Subscriptions', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output_related', $post_type, 'advanced' );
+                } else {
+                    add_meta_box( 'wpinv-mb-subscriptions', __( 'Subscription Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output', $post_type, 'advanced' );
+                }
+
+                if ( getpaid_count_subscription_invoices( $invoice->is_renewal() ? $invoice->get_parent_id() : $invoice->get_id() ) > 1 ) {
+                    add_meta_box( 'wpinv-mb-subscription-invoices', __( 'Related Payments', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output_invoices', $post_type, 'advanced' );
+                }
+
+            }
+
+            // Invoice details.
+            add_meta_box(
+                'wpinv-details',
+                sprintf(
+                    __( '%s Details', 'invoicing' ),
+                    ucfirst( $invoice->get_invoice_quote_type() )
+                ),
+                'GetPaid_Meta_Box_Invoice_Details::output',
+                $post_type,
+                'side'
+            );
+
+            // Payment details.
+            add_meta_box( 'wpinv-payment-meta', __( 'Payment Meta', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Payment_Meta::output', $post_type, 'side', 'default' );
+
+            // Billing details.
+            add_meta_box( 'wpinv-address', __( 'Billing Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Address::output', $post_type, 'normal', 'high' );
 			
-			// Invoice items.
-			add_meta_box(
-				'wpinv-items',
-				sprintf(
-					__( '%s Items', 'invoicing' ),
-					ucfirst( $invoice->get_invoice_quote_type() )
-				),
-				'GetPaid_Meta_Box_Invoice_Items::output',
-				$post_type,
-				'normal',
-				'high'
-			);
+            // Invoice items.
+            add_meta_box(
+                'wpinv-items',
+                sprintf(
+                    __( '%s Items', 'invoicing' ),
+                    ucfirst( $invoice->get_invoice_quote_type() )
+                ),
+                'GetPaid_Meta_Box_Invoice_Items::output',
+                $post_type,
+                'normal',
+                'high'
+            );
 			
-			// Invoice notes.
-			add_meta_box(
-				'wpinv-notes',
-				sprintf(
-					__( '%s Notes', 'invoicing' ),
-					ucfirst( $invoice->get_invoice_quote_type() )
-				),
-				'WPInv_Meta_Box_Notes::output',
-				$post_type,
-				'side',
-				'low'
-			);
-
-			// Shipping Address.
-			if ( get_post_meta( $invoice->get_id(), 'shipping_address', true ) ) {
-				add_meta_box( 'wpinv-invoice-shipping-details', __( 'Shipping Address', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Shipping_Address::output', $post_type, 'side', 'high' );
-			}
-
-			// Payment form information.
-			if ( get_post_meta( $invoice->get_id(), 'payment_form_data', true ) ) {
-				add_meta_box( 'wpinv-invoice-payment-form-details', __( 'Payment Form Details', 'invoicing' ), 'WPInv_Meta_Box_Payment_Form::output_details', $post_type, 'side', 'high' );
-			}
-
-		}
-
-	}
-
-	/**
-	 * Remove some metaboxes.
-	 */
-	public static function remove_meta_boxes() {
-		remove_meta_box( 'wpseo_meta', 'wpi_invoice', 'normal' );
-	}
-
-	/**
-	 * Rename other metaboxes.
-	 */
-	public static function rename_meta_boxes() {
+            // Invoice notes.
+            add_meta_box(
+                'wpinv-notes',
+                sprintf(
+                    __( '%s Notes', 'invoicing' ),
+                    ucfirst( $invoice->get_invoice_quote_type() )
+                ),
+                'WPInv_Meta_Box_Notes::output',
+                $post_type,
+                'side',
+                'low'
+            );
+
+            // Shipping Address.
+            if ( get_post_meta( $invoice->get_id(), 'shipping_address', true ) ) {
+                add_meta_box( 'wpinv-invoice-shipping-details', __( 'Shipping Address', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Shipping_Address::output', $post_type, 'side', 'high' );
+            }
+
+            // Payment form information.
+            if ( get_post_meta( $invoice->get_id(), 'payment_form_data', true ) ) {
+                add_meta_box( 'wpinv-invoice-payment-form-details', __( 'Payment Form Details', 'invoicing' ), 'WPInv_Meta_Box_Payment_Form::output_details', $post_type, 'side', 'high' );
+            }
+
+        }
+
+    }
+
+    /**
+     * Remove some metaboxes.
+     */
+    public static function remove_meta_boxes() {
+        remove_meta_box( 'wpseo_meta', 'wpi_invoice', 'normal' );
+    }
+
+    /**
+     * Rename other metaboxes.
+     */
+    public static function rename_meta_boxes() {
 		
-	}
-
-	/**
-	 * Check if we're saving, then trigger an action based on the post type.
-	 *
-	 * @param  int    $post_id Post ID.
-	 * @param  object $post Post object.
-	 */
-	public static function save_meta_boxes( $post_id, $post ) {
-		$post_id = absint( $post_id );
-		$data    = wp_kses_post_deep( wp_unslash( $_POST ) );
-
-		// Do not save for ajax requests.
-		if ( ( defined( 'DOING_AJAX') && DOING_AJAX ) || isset( $_REQUEST['bulk_edit'] ) ) {
-			return;
-		}
-
-		// $post_id and $post are required
-		if ( empty( $post_id ) || empty( $post ) || self::$saved_meta_boxes ) {
-			return;
-		}
-
-		// Dont' save meta boxes for revisions or autosaves.
-		if ( ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) || is_int( wp_is_post_revision( $post ) ) || is_int( wp_is_post_autosave( $post ) ) ) {
-			return;
-		}
-
-		// Check the nonce.
-		if ( empty( $data['getpaid_meta_nonce'] ) || ! wp_verify_nonce( $data['getpaid_meta_nonce'], 'getpaid_meta_nonce' ) ) {
-			return;
-		}
-
-		// Check the post being saved == the $post_id to prevent triggering this call for other save_post events.
-		if ( empty( $data['post_ID'] ) || absint( $data['post_ID'] ) !== $post_id ) {
-			return;
-		}
-
-		// Check user has permission to edit.
-		if ( ! current_user_can( 'edit_post', $post_id ) ) {
-			return;
-		}
-
-		if ( getpaid_is_invoice_post_type( $post->post_type ) ) {
-
-			// We need this save event to run once to avoid potential endless loops.
-			self::$saved_meta_boxes = true;
-
-			return GetPaid_Meta_Box_Invoice_Address::save( $post_id );
-
-		}
-
-		// Ensure this is our post type.
-		$post_types_map = array(
-			'wpi_item'         => 'GetPaid_Meta_Box_Item_Details',
-			'wpi_payment_form' => 'GetPaid_Meta_Box_Payment_Form',
-			'wpi_discount'     => 'GetPaid_Meta_Box_Discount_Details',
-		);
-
-		// Is this our post type?
-		if ( ! isset( $post_types_map[ $post->post_type ] ) ) {
-			return;
-		}
-
-		// We need this save event to run once to avoid potential endless loops.
-		self::$saved_meta_boxes = true;
+    }
+
+    /**
+     * Check if we're saving, then trigger an action based on the post type.
+     *
+     * @param  int    $post_id Post ID.
+     * @param  object $post Post object.
+     */
+    public static function save_meta_boxes( $post_id, $post ) {
+        $post_id = absint( $post_id );
+        $data    = wp_kses_post_deep( wp_unslash( $_POST ) );
+
+        // Do not save for ajax requests.
+        if ( ( defined( 'DOING_AJAX') && DOING_AJAX ) || isset( $_REQUEST['bulk_edit'] ) ) {
+            return;
+        }
+
+        // $post_id and $post are required
+        if ( empty( $post_id ) || empty( $post ) || self::$saved_meta_boxes ) {
+            return;
+        }
+
+        // Dont' save meta boxes for revisions or autosaves.
+        if ( ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) || is_int( wp_is_post_revision( $post ) ) || is_int( wp_is_post_autosave( $post ) ) ) {
+            return;
+        }
+
+        // Check the nonce.
+        if ( empty( $data['getpaid_meta_nonce'] ) || ! wp_verify_nonce( $data['getpaid_meta_nonce'], 'getpaid_meta_nonce' ) ) {
+            return;
+        }
+
+        // Check the post being saved == the $post_id to prevent triggering this call for other save_post events.
+        if ( empty( $data['post_ID'] ) || absint( $data['post_ID'] ) !== $post_id ) {
+            return;
+        }
+
+        // Check user has permission to edit.
+        if ( ! current_user_can( 'edit_post', $post_id ) ) {
+            return;
+        }
+
+        if ( getpaid_is_invoice_post_type( $post->post_type ) ) {
+
+            // We need this save event to run once to avoid potential endless loops.
+            self::$saved_meta_boxes = true;
+
+            return GetPaid_Meta_Box_Invoice_Address::save( $post_id );
+
+        }
+
+        // Ensure this is our post type.
+        $post_types_map = array(
+            'wpi_item'         => 'GetPaid_Meta_Box_Item_Details',
+            'wpi_payment_form' => 'GetPaid_Meta_Box_Payment_Form',
+            'wpi_discount'     => 'GetPaid_Meta_Box_Discount_Details',
+        );
+
+        // Is this our post type?
+        if ( ! isset( $post_types_map[ $post->post_type ] ) ) {
+            return;
+        }
+
+        // We need this save event to run once to avoid potential endless loops.
+        self::$saved_meta_boxes = true;
 		
-		// Save the post.
-		$class = $post_types_map[ $post->post_type ];
-		$class::save( $post_id, $_POST, $post );
+        // Save the post.
+        $class = $post_types_map[ $post->post_type ];
+        $class::save( $post_id, $_POST, $post );
 
-	}
+    }
 
 }

templates/payment-forms/elements/date.php

Indentation +37 added lines, -37 removed lines

@@ -12,58 +12,58 @@
 $label       = empty( $label ) ? '' : wp_kses_post( $label );
 $label_class = sanitize_key( preg_replace( '/[^A-Za-z0-9_-]/', '-', $label ) );
 if ( ! empty( $required ) ) {
-	$label .= "<span class='text-danger'> *</span>";
+    $label .= "<span class='text-danger'> *</span>";
 }
 
 $disable_dates = array();
 
 if ( ! empty( $disabled_dates ) ) {
-	$disabled_dates = preg_replace( '/\s+/', '', $disabled_dates );
-	$disabled_dates = str_ireplace( 'today', current_time( 'Y-m-d' ), $disabled_dates );
-	$disabled_dates = array_filter( explode( ',', $disabled_dates ) );
+    $disabled_dates = preg_replace( '/\s+/', '', $disabled_dates );
+    $disabled_dates = str_ireplace( 'today', current_time( 'Y-m-d' ), $disabled_dates );
+    $disabled_dates = array_filter( explode( ',', $disabled_dates ) );
 
-	foreach ( $disabled_dates as $disabled_date ) {
+    foreach ( $disabled_dates as $disabled_date ) {
 
-		$disabled_date = trim( $disabled_date );
+        $disabled_date = trim( $disabled_date );
 
-		if ( false === strpos( $disabled_date, '|' ) ) {
-			$disable_dates[] = $disabled_date;
-			continue;
-		}
+        if ( false === strpos( $disabled_date, '|' ) ) {
+            $disable_dates[] = $disabled_date;
+            continue;
+        }
 
-		$disabled_date   = explode( '|', $disabled_date );
-		$disable_dates[] = array(
-			'from' => trim( $disabled_date[0] ),
-			'to'   => trim( $disabled_date[1] ),
-		);
+        $disabled_date   = explode( '|', $disabled_date );
+        $disable_dates[] = array(
+            'from' => trim( $disabled_date[0] ),
+            'to'   => trim( $disabled_date[1] ),
+        );
 
-	}
+    }
 
 }
 
 $options = array(
-	'data-default-date' => empty( 'default_date' ) ? false : $default_date,
-	'data-min-date'     => empty( 'min_date' ) ? false : $min_date,
-	'data-max-date'     => empty( 'max_date' ) ? false : $max_date,
-	'data-mode'         => empty( 'mode' ) ? 'single' : $mode,
-	'data-alt-format'   => get_option( 'date_format', 'F j, Y' ),
-	'data-date-format'  => 'Y-m-d',
-	'data-alt-input'    => 'true',
-	'data-disable_alt'  => empty( $disabled_dates ) ? false : wp_json_encode( $disable_dates ),
-	'data-disable_days_alt'  => empty( $disable_days ) ? false : wp_json_encode( wp_parse_id_list( $disable_days ) ),
+    'data-default-date' => empty( 'default_date' ) ? false : $default_date,
+    'data-min-date'     => empty( 'min_date' ) ? false : $min_date,
+    'data-max-date'     => empty( 'max_date' ) ? false : $max_date,
+    'data-mode'         => empty( 'mode' ) ? 'single' : $mode,
+    'data-alt-format'   => get_option( 'date_format', 'F j, Y' ),
+    'data-date-format'  => 'Y-m-d',
+    'data-alt-input'    => 'true',
+    'data-disable_alt'  => empty( $disabled_dates ) ? false : wp_json_encode( $disable_dates ),
+    'data-disable_days_alt'  => empty( $disable_days ) ? false : wp_json_encode( wp_parse_id_list( $disable_days ) ),
 );
 
 echo aui()->input(
-	array(
-		'name'             => esc_attr( $id ),
-		'id'               => esc_attr( $id ) . uniqid( '_' ),
-		'placeholder'      => empty( $placeholder ) ? '' : esc_attr( $placeholder ),
-		'required'         => ! empty( $required ),
-		'label'            => $label,
-		'label_type'       => 'vertical',
-		'help_text'        => empty( $description ) ? '' : wp_kses_post( $description ),
-		'type'             => 'datepicker',
-		'class'            => $label_class . ' getpaid-init-flatpickr flatpickr-input',
-		'extra_attributes' => array_filter( apply_filters( 'getpaid_date_field_attributes', $options ) ),
-	)
+    array(
+        'name'             => esc_attr( $id ),
+        'id'               => esc_attr( $id ) . uniqid( '_' ),
+        'placeholder'      => empty( $placeholder ) ? '' : esc_attr( $placeholder ),
+        'required'         => ! empty( $required ),
+        'label'            => $label,
+        'label_type'       => 'vertical',
+        'help_text'        => empty( $description ) ? '' : wp_kses_post( $description ),
+        'type'             => 'datepicker',
+        'class'            => $label_class . ' getpaid-init-flatpickr flatpickr-input',
+        'extra_attributes' => array_filter( apply_filters( 'getpaid_date_field_attributes', $options ) ),
+    )
 );

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

Indentation +862 added lines, -862 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -10,203 +10,203 @@ 
 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( $_POST );
-		}
-
-	}
-
-	/**
-	 * Loads submission data.
-	 *
-	 * @param array $data
-	 */
-	public function load_data( $data ) {
-
-		// Remove slashes from the submitted data...
-		$data       = wp_kses_post_deep( wp_unslash( $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( $_POST );
+        }
+
+    }
+
+    /**
+     * Loads submission data.
+     *
+     * @param array $data
+     */
+    public function load_data( $data ) {
+
+        // Remove slashes from the submitted data...
+        $data       = wp_kses_post_deep( wp_unslash( $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.
 	|--------------------------------------------------------------------------
@@ -215,39 +215,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.
 	|--------------------------------------------------------------------------
@@ -256,84 +256,84 @@ 
 	| might be for an existing invoice.
 	*/
 
-	/**
-	 * Prepares the submission's invoice.
-	 *
-	 * @since 1.0.19
-	 */
-	public function process_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'] ) ) {
-			return;
-		}
+        // Abort if there is no invoice.
+        if ( empty( $this->data['invoice_id'] ) ) {
+            return;
+        }
 
-		// If the submission is for an existing invoice, ensure that it exists
-		// and that it is not paid for.
-		$invoice = wpinv_get_invoice( $this->data['invoice_id'] );
+        // If the submission is for an existing invoice, ensure that it exists
+        // and that it is not paid for.
+        $invoice = wpinv_get_invoice( $this->data['invoice_id'] );
 
         if ( empty( $invoice ) ) {
-			throw new Exception( __( 'Invalid invoice', 'invoicing' ) );
-		}
+            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() ) {
+        $this->payment_form->invoice = $invoice;
+        if ( ! $this->payment_form->is_default() ) {
 
-			$items    = array();
-			$item_ids = array();
+            $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 ( $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;
-				}
-			}
+            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->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 );
-	}
-
-	/*
+        } 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.
 	|--------------------------------------------------------------------------
@@ -342,129 +342,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
 	|--------------------------------------------------------------------------
@@ -473,128 +473,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
 	|--------------------------------------------------------------------------
@@ -603,99 +603,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
 	|--------------------------------------------------------------------------
@@ -705,100 +705,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
 	|--------------------------------------------------------------------------
@@ -806,147 +806,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 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 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() );
+    }
 
 }

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

Indentation +479 added lines, -479 removed lines

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

includes/payments/class-getpaid-checkout.php

Indentation +301 added lines, -301 removed lines

@@ -12,184 +12,184 @@ 
  */
 class GetPaid_Checkout {
 
-	/**
-	 * @var GetPaid_Payment_Form_Submission
-	 */
-	protected $payment_form_submission;
-
-	/**
-	 * Class constructor.
-	 * 
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function __construct( $submission ) {
-		$this->payment_form_submission = $submission;
-	}
-
-	/**
-	 * Processes the checkout.
-	 *
-	 */
-	public function process_checkout() {
-
-		// Validate the submission.
-		$this->validate_submission();
-
-		// Prepare the invoice.
-		$items      = $this->get_submission_items();
-		$invoice    = $this->get_submission_invoice();
-		$invoice    = $this->process_submission_invoice( $invoice, $items );
-		$prepared   = $this->prepare_submission_data_for_saving();
-
-		$this->prepare_billing_info( $invoice );
-
-		$shipping   = $this->prepare_shipping_info( $invoice );
-
-		// Save the invoice.
-		$invoice->set_is_viewed( true );
-		$invoice->recalculate_total();
+    /**
+     * @var GetPaid_Payment_Form_Submission
+     */
+    protected $payment_form_submission;
+
+    /**
+     * Class constructor.
+     * 
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function __construct( $submission ) {
+        $this->payment_form_submission = $submission;
+    }
+
+    /**
+     * Processes the checkout.
+     *
+     */
+    public function process_checkout() {
+
+        // Validate the submission.
+        $this->validate_submission();
+
+        // Prepare the invoice.
+        $items      = $this->get_submission_items();
+        $invoice    = $this->get_submission_invoice();
+        $invoice    = $this->process_submission_invoice( $invoice, $items );
+        $prepared   = $this->prepare_submission_data_for_saving();
+
+        $this->prepare_billing_info( $invoice );
+
+        $shipping   = $this->prepare_shipping_info( $invoice );
+
+        // Save the invoice.
+        $invoice->set_is_viewed( true );
+        $invoice->recalculate_total();
         $invoice->save();
 
-		do_action( 'getpaid_checkout_invoice_updated', $invoice );
+        do_action( 'getpaid_checkout_invoice_updated', $invoice );
 
-		// Send to the gateway.
-		$this->post_process_submission( $invoice, $prepared, $shipping );
-	}
+        // Send to the gateway.
+        $this->post_process_submission( $invoice, $prepared, $shipping );
+    }
 
-	/**
-	 * Validates the submission.
-	 *
-	 */
-	protected function validate_submission() {
+    /**
+     * Validates the submission.
+     *
+     */
+    protected function validate_submission() {
 
-		$submission = $this->payment_form_submission;
-		$data       = $submission->get_data();
+        $submission = $this->payment_form_submission;
+        $data       = $submission->get_data();
 
-		// Do we have an error?
+        // Do we have an error?
         if ( ! empty( $submission->last_error ) ) {
-			wp_send_json_error( $submission->last_error );
+            wp_send_json_error( $submission->last_error );
         }
 
-		// We need a billing email.
+        // We need a billing email.
         if ( ! $submission->has_billing_email() ) {
             wp_send_json_error( __( 'Provide a valid billing email.', 'invoicing' ) );
-		}
+        }
 
-		// Non-recurring gateways should not be allowed to process recurring invoices.
-		if ( $submission->should_collect_payment_details() && $submission->has_recurring && ! wpinv_gateway_support_subscription( $data['wpi-gateway'] ) ) {
-			wp_send_json_error( __( 'The selected payment gateway does not support subscription payments.', 'invoicing' ) );
-		}
+        // Non-recurring gateways should not be allowed to process recurring invoices.
+        if ( $submission->should_collect_payment_details() && $submission->has_recurring && ! wpinv_gateway_support_subscription( $data['wpi-gateway'] ) ) {
+            wp_send_json_error( __( 'The selected payment gateway does not support subscription payments.', 'invoicing' ) );
+        }
 
-		// Ensure the gateway is active.
-		if ( $submission->should_collect_payment_details() && ! wpinv_is_gateway_active( $data['wpi-gateway'] ) ) {
-			wp_send_json_error( __( 'The selected payment gateway is not active', 'invoicing' ) );
-		}
+        // Ensure the gateway is active.
+        if ( $submission->should_collect_payment_details() && ! wpinv_is_gateway_active( $data['wpi-gateway'] ) ) {
+            wp_send_json_error( __( 'The selected payment gateway is not active', 'invoicing' ) );
+        }
 
-		// Clear any existing errors.
-		wpinv_clear_errors();
+        // Clear any existing errors.
+        wpinv_clear_errors();
 
-		// Allow themes and plugins to hook to errors
-		do_action( 'getpaid_checkout_error_checks', $submission );
+        // Allow themes and plugins to hook to errors
+        do_action( 'getpaid_checkout_error_checks', $submission );
 
-		// Do we have any errors?
+        // Do we have any errors?
         if ( wpinv_get_errors() ) {
             wp_send_json_error( getpaid_get_errors_html() );
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Retrieves submission items.
-	 *
-	 * @return GetPaid_Form_Item[]
-	 */
-	protected function get_submission_items() {
+    /**
+     * Retrieves submission items.
+     *
+     * @return GetPaid_Form_Item[]
+     */
+    protected function get_submission_items() {
 
-		$items = $this->payment_form_submission->get_items();
+        $items = $this->payment_form_submission->get_items();
 
         // Ensure that we have items.
         if ( empty( $items ) && ! $this->payment_form_submission->has_fees() ) {
             wp_send_json_error( __( 'Please provide at least one item or amount.', 'invoicing' ) );
-		}
-
-		return $items;
-	}
-
-	/**
-	 * Retrieves submission invoice.
-	 *
-	 * @return WPInv_Invoice
-	 */
-	protected function get_submission_invoice() {
-		$submission = $this->payment_form_submission;
-
-		if ( ! $submission->has_invoice() ) {
-			$invoice = new WPInv_Invoice();
-			$invoice->set_created_via( 'payment_form' );
-			return $invoice;
         }
 
-		$invoice = $submission->get_invoice();
+        return $items;
+    }
+
+    /**
+     * Retrieves submission invoice.
+     *
+     * @return WPInv_Invoice
+     */
+    protected function get_submission_invoice() {
+        $submission = $this->payment_form_submission;
+
+        if ( ! $submission->has_invoice() ) {
+            $invoice = new WPInv_Invoice();
+            $invoice->set_created_via( 'payment_form' );
+            return $invoice;
+        }
+
+        $invoice = $submission->get_invoice();
 
-		// Make sure that it is neither paid or refunded.
-		if ( $invoice->is_paid() || $invoice->is_refunded() ) {
-			wp_send_json_error( __( 'This invoice has already been paid for.', 'invoicing' ) );
-		}
+        // Make sure that it is neither paid or refunded.
+        if ( $invoice->is_paid() || $invoice->is_refunded() ) {
+            wp_send_json_error( __( 'This invoice has already been paid for.', 'invoicing' ) );
+        }
 
-		return $invoice;
-	}
+        return $invoice;
+    }
 
-	/**
-	 * Processes the submission invoice.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param GetPaid_Form_Item[] $items
-	 * @return WPInv_Invoice
-	 */
-	protected function process_submission_invoice( $invoice, $items ) {
+    /**
+     * Processes the submission invoice.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param GetPaid_Form_Item[] $items
+     * @return WPInv_Invoice
+     */
+    protected function process_submission_invoice( $invoice, $items ) {
 
-		$submission = $this->payment_form_submission;
+        $submission = $this->payment_form_submission;
 
-		// Set-up the invoice details.
-		$invoice->set_email( sanitize_email( $submission->get_billing_email() ) );
-		$invoice->set_user_id( $this->get_submission_customer() );
-		$invoice->set_payment_form( absint( $submission->get_payment_form()->get_id() ) );
+        // Set-up the invoice details.
+        $invoice->set_email( sanitize_email( $submission->get_billing_email() ) );
+        $invoice->set_user_id( $this->get_submission_customer() );
+        $invoice->set_payment_form( absint( $submission->get_payment_form()->get_id() ) );
         $invoice->set_items( $items );
         $invoice->set_fees( $submission->get_fees() );
         $invoice->set_taxes( $submission->get_taxes() );
-		$invoice->set_discounts( $submission->get_discounts() );
-		$invoice->set_gateway( $submission->get_field( 'wpi-gateway' ) );
-		$invoice->set_currency( $submission->get_currency() );
+        $invoice->set_discounts( $submission->get_discounts() );
+        $invoice->set_gateway( $submission->get_field( 'wpi-gateway' ) );
+        $invoice->set_currency( $submission->get_currency() );
 
-		if ( $submission->has_shipping() ) {
-			$invoice->set_shipping( $submission->get_shipping() );
-		}
+        if ( $submission->has_shipping() ) {
+            $invoice->set_shipping( $submission->get_shipping() );
+        }
 
-		$address_confirmed = $submission->get_field( 'confirm-address' );
-		$invoice->set_address_confirmed( ! empty( $address_confirmed ) );
+        $address_confirmed = $submission->get_field( 'confirm-address' );
+        $invoice->set_address_confirmed( ! empty( $address_confirmed ) );
 
-		if ( $submission->has_discount_code() ) {
+        if ( $submission->has_discount_code() ) {
             $invoice->set_discount_code( $submission->get_discount_code() );
-		}
-
-		getpaid_maybe_add_default_address( $invoice );
-		return $invoice;
-	}
-
-	/**
-	 * Retrieves the submission's customer.
-	 *
-	 * @return int The customer id.
-	 */
-	protected function get_submission_customer() {
-		$submission = $this->payment_form_submission;
-
-		// If this is an existing invoice...
-		if ( $submission->has_invoice() ) {
-			return $submission->get_invoice()->get_user_id();
-		}
-
-		// (Maybe) create the user.
+        }
+
+        getpaid_maybe_add_default_address( $invoice );
+        return $invoice;
+    }
+
+    /**
+     * Retrieves the submission's customer.
+     *
+     * @return int The customer id.
+     */
+    protected function get_submission_customer() {
+        $submission = $this->payment_form_submission;
+
+        // If this is an existing invoice...
+        if ( $submission->has_invoice() ) {
+            return $submission->get_invoice()->get_user_id();
+        }
+
+        // (Maybe) create the user.
         $user = get_current_user_id();
 
         if ( empty( $user ) ) {
@@ -199,11 +199,11 @@ 
         if ( empty( $user ) ) {
             $user = wpinv_create_user( $submission->get_billing_email() );
 
-			// (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 ), $user ) ) {
-				wp_send_new_user_notifications( $user, 'user' );
-			}
+            // (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 ), $user ) ) {
+                wp_send_new_user_notifications( $user, 'user' );
+            }
 
         }
 
@@ -213,49 +213,49 @@ 
 
         if ( is_numeric( $user ) ) {
             return $user;
-		}
+        }
 
-		return $user->ID;
+        return $user->ID;
 
-	}
+    }
 
-	/**
+    /**
      * Prepares submission data for saving to the database.
      *
-	 * @return array
+     * @return array
      */
     public function prepare_submission_data_for_saving() {
 
-		$submission = $this->payment_form_submission;
+        $submission = $this->payment_form_submission;
 
-		// Prepared submission details.
+        // Prepared submission details.
         $prepared = array(
-			'all'  => array(),
-			'meta' => array(),
-		);
+            'all'  => array(),
+            'meta' => array(),
+        );
 
         // Raw submission details.
-		$data     = $submission->get_data();
+        $data     = $submission->get_data();
 
-		// Loop through the submitted details.
+        // Loop through the submitted details.
         foreach ( $submission->get_payment_form()->get_elements() as $field ) {
 
-			// Skip premade fields.
+            // Skip premade fields.
             if ( ! empty( $field['premade'] ) ) {
                 continue;
             }
 
-			// Ensure address is provided.
-			if ( $field['type'] == 'address' ) {
+            // Ensure address is provided.
+            if ( $field['type'] == 'address' ) {
                 $address_type = isset( $field['address_type'] ) && 'shipping' === $field['address_type'] ? 'shipping' : 'billing';
 
-				foreach ( $field['fields'] as $address_field ) {
+                foreach ( $field['fields'] as $address_field ) {
 
-					if ( ! empty( $address_field['visible'] ) && ! empty( $address_field['required'] ) && '' === trim( $_POST[ $address_type ][ $address_field['name'] ] ) ) {
-						wp_send_json_error( __( 'Please fill all required fields.', 'invoicing' ) );
-					}
+                    if ( ! empty( $address_field['visible'] ) && ! empty( $address_field['required'] ) && '' === trim( $_POST[ $address_type ][ $address_field['name'] ] ) ) {
+                        wp_send_json_error( __( 'Please fill all required fields.', 'invoicing' ) );
+                    }
 
-				}
+                }
 
             }
 
@@ -267,31 +267,31 @@ 
             // Handle misc fields.
             if ( isset( $data[ $field['id'] ] ) ) {
 
-				// Uploads.
-				if ( $field['type'] == 'file_upload' ) {
-					$max_file_num = empty( $field['max_file_num'] ) ? 1 : absint( $field['max_file_num'] );
+                // Uploads.
+                if ( $field['type'] == 'file_upload' ) {
+                    $max_file_num = empty( $field['max_file_num'] ) ? 1 : absint( $field['max_file_num'] );
 
-					if ( count( $data[ $field['id'] ] ) > $max_file_num ) {
-						wp_send_json_error( __( 'Maximum number of allowed files exceeded.', 'invoicing' ) );
-					}
+                    if ( count( $data[ $field['id'] ] ) > $max_file_num ) {
+                        wp_send_json_error( __( 'Maximum number of allowed files exceeded.', 'invoicing' ) );
+                    }
 
-					$value = array();
+                    $value = array();
 
-					foreach ( $data[ $field['id'] ] as $url => $name ) {
-						$value[] = sprintf(
-							'<a href="%s" target="_blank">%s</a>',
-							esc_url_raw( $url ),
-							esc_html( $name )
-						);
-					}
+                    foreach ( $data[ $field['id'] ] as $url => $name ) {
+                        $value[] = sprintf(
+                            '<a href="%s" target="_blank">%s</a>',
+                            esc_url_raw( $url ),
+                            esc_html( $name )
+                        );
+                    }
 
-					$value = implode( ' | ', $value );
+                    $value = implode( ' | ', $value );
 
-				} else if ( $field['type'] == 'checkbox' ) {
-					$value = isset( $data[ $field['id'] ] ) ? __( 'Yes', 'invoicing' ) : __( 'No', 'invoicing' );
-				} else {
-					$value = wp_kses_post( $data[ $field['id'] ] );
-				}
+                } else if ( $field['type'] == 'checkbox' ) {
+                    $value = isset( $data[ $field['id'] ] ) ? __( 'Yes', 'invoicing' ) : __( 'No', 'invoicing' );
+                } else {
+                    $value = wp_kses_post( $data[ $field['id'] ] );
+                }
 
                 $label = $field['id'];
 
@@ -299,190 +299,190 @@ 
                     $label = $field['label'];
                 }
 
-				if ( ! empty( $field['add_meta'] ) ) {
-					$prepared['meta'][ wpinv_clean( $label ) ] = wp_kses_post_deep( $value );
-				}
-				$prepared['all'][ wpinv_clean( $label ) ] = wp_kses_post_deep( $value );
+                if ( ! empty( $field['add_meta'] ) ) {
+                    $prepared['meta'][ wpinv_clean( $label ) ] = wp_kses_post_deep( $value );
+                }
+                $prepared['all'][ wpinv_clean( $label ) ] = wp_kses_post_deep( $value );
 
             }
 
-		}
+        }
 
-		return $prepared;
+        return $prepared;
 
-	}
+    }
 
-	/**
+    /**
      * Retrieves address details.
      *
-	 * @return array
-	 * @param WPInv_Invoice $invoice
-	 * @param string $type
+     * @return array
+     * @param WPInv_Invoice $invoice
+     * @param string $type
      */
     public function prepare_address_details( $invoice, $type = 'billing' ) {
 
-		$data     = $this->payment_form_submission->get_data();
-		$type     = sanitize_key( $type );
-		$address  = array();
-		$prepared = array();
+        $data     = $this->payment_form_submission->get_data();
+        $type     = sanitize_key( $type );
+        $address  = array();
+        $prepared = array();
 
-		if ( ! empty( $data[ $type ] ) ) {
-			$address = $data[ $type ];
-		}
+        if ( ! empty( $data[ $type ] ) ) {
+            $address = $data[ $type ];
+        }
 
-		// Clean address details.
-		foreach ( $address as $key => $value ) {
-			$key             = sanitize_key( $key );
-			$key             = str_replace( 'wpinv_', '', $key );
-			$value           = wpinv_clean( $value );
-			$prepared[ $key] = apply_filters( "getpaid_checkout_{$type}_address_$key", $value, $this->payment_form_submission, $invoice );
-		}
+        // Clean address details.
+        foreach ( $address as $key => $value ) {
+            $key             = sanitize_key( $key );
+            $key             = str_replace( 'wpinv_', '', $key );
+            $value           = wpinv_clean( $value );
+            $prepared[ $key] = apply_filters( "getpaid_checkout_{$type}_address_$key", $value, $this->payment_form_submission, $invoice );
+        }
 
-		// Filter address details.
-		$prepared = apply_filters( "getpaid_checkout_{$type}_address", $prepared, $this->payment_form_submission, $invoice );
+        // Filter address details.
+        $prepared = apply_filters( "getpaid_checkout_{$type}_address", $prepared, $this->payment_form_submission, $invoice );
 
-		// Remove non-whitelisted values.
-		return array_filter( $prepared, 'getpaid_is_address_field_whitelisted', ARRAY_FILTER_USE_KEY );
+        // Remove non-whitelisted values.
+        return array_filter( $prepared, 'getpaid_is_address_field_whitelisted', ARRAY_FILTER_USE_KEY );
 
-	}
+    }
 
-	/**
+    /**
      * Prepares the billing details.
      *
-	 * @return array
-	 * @param WPInv_Invoice $invoice
+     * @return array
+     * @param WPInv_Invoice $invoice
      */
     protected function prepare_billing_info( &$invoice ) {
 
-		$billing_address = $this->prepare_address_details( $invoice, 'billing' );
+        $billing_address = $this->prepare_address_details( $invoice, 'billing' );
 
-		// Update the invoice with the billing details.
-		$invoice->set_props( $billing_address );
+        // Update the invoice with the billing details.
+        $invoice->set_props( $billing_address );
 
-	}
+    }
 
-	/**
+    /**
      * Prepares the shipping details.
      *
-	 * @return array
-	 * @param WPInv_Invoice $invoice
+     * @return array
+     * @param WPInv_Invoice $invoice
      */
     protected function prepare_shipping_info( $invoice ) {
 
-		$data = $this->payment_form_submission->get_data();
+        $data = $this->payment_form_submission->get_data();
 
-		if ( empty( $data['same-shipping-address'] ) ) {
-			return $this->prepare_address_details( $invoice, 'shipping' );
-		}
+        if ( empty( $data['same-shipping-address'] ) ) {
+            return $this->prepare_address_details( $invoice, 'shipping' );
+        }
 
-		return $this->prepare_address_details( $invoice, 'billing' );
+        return $this->prepare_address_details( $invoice, 'billing' );
 
-	}
+    }
 
-	/**
-	 * Confirms the submission is valid and send users to the gateway.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param array $prepared_payment_form_data
-	 * @param array $shipping
-	 */
-	protected function post_process_submission( $invoice, $prepared_payment_form_data, $shipping ) {
+    /**
+     * Confirms the submission is valid and send users to the gateway.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param array $prepared_payment_form_data
+     * @param array $shipping
+     */
+    protected function post_process_submission( $invoice, $prepared_payment_form_data, $shipping ) {
 
-		// Ensure the invoice exists.
+        // Ensure the invoice exists.
         if ( ! $invoice->exists() ) {
             wp_send_json_error( __( 'An error occured while saving your invoice. Please try again.', 'invoicing' ) );
         }
 
-		// Save payment form data.
-		$prepared_payment_form_data = apply_filters( 'getpaid_prepared_payment_form_data', $prepared_payment_form_data, $invoice );
+        // Save payment form data.
+        $prepared_payment_form_data = apply_filters( 'getpaid_prepared_payment_form_data', $prepared_payment_form_data, $invoice );
         delete_post_meta( $invoice->get_id(), 'payment_form_data' );
-		delete_post_meta( $invoice->get_id(), 'additional_meta_data' );
-		if ( ! empty( $prepared_payment_form_data ) ) {
+        delete_post_meta( $invoice->get_id(), 'additional_meta_data' );
+        if ( ! empty( $prepared_payment_form_data ) ) {
 
-			if ( ! empty( $prepared_payment_form_data['all'] ) ) {
-				update_post_meta( $invoice->get_id(), 'payment_form_data', $prepared_payment_form_data['all'] );
-			}
+            if ( ! empty( $prepared_payment_form_data['all'] ) ) {
+                update_post_meta( $invoice->get_id(), 'payment_form_data', $prepared_payment_form_data['all'] );
+            }
 
-			if ( ! empty( $prepared_payment_form_data['meta'] ) ) {
-				update_post_meta( $invoice->get_id(), 'additional_meta_data', $prepared_payment_form_data['meta'] );
-			}
+            if ( ! empty( $prepared_payment_form_data['meta'] ) ) {
+                update_post_meta( $invoice->get_id(), 'additional_meta_data', $prepared_payment_form_data['meta'] );
+            }
 
-		}
+        }
 
-		// Save payment form data.
-		$shipping = apply_filters( 'getpaid_checkout_shipping_details', $shipping, $this->payment_form_submission );
+        // Save payment form data.
+        $shipping = apply_filters( 'getpaid_checkout_shipping_details', $shipping, $this->payment_form_submission );
         if ( ! empty( $shipping ) ) {
             update_post_meta( $invoice->get_id(), 'shipping_address', $shipping );
-		}
+        }
 
-		// Backwards compatibility.
+        // Backwards compatibility.
         add_filter( 'wp_redirect', array( $this, 'send_redirect_response' ) );
 
-		$this->process_payment( $invoice );
+        $this->process_payment( $invoice );
 
         // If we are here, there was an error.
-		wpinv_send_back_to_checkout( $invoice );
+        wpinv_send_back_to_checkout( $invoice );
 
-	}
+    }
 
-	/**
-	 * Processes the actual payment.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	protected function process_payment( $invoice ) {
+    /**
+     * Processes the actual payment.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    protected function process_payment( $invoice ) {
 
-		// Clear any checkout errors.
-		wpinv_clear_errors();
+        // Clear any checkout errors.
+        wpinv_clear_errors();
 
-		// No need to send free invoices to the gateway.
-		if ( $invoice->is_free() ) {
-			$this->process_free_payment( $invoice );
-		}
+        // No need to send free invoices to the gateway.
+        if ( $invoice->is_free() ) {
+            $this->process_free_payment( $invoice );
+        }
 
-		$submission = $this->payment_form_submission;
+        $submission = $this->payment_form_submission;
 
-		// Fires before sending to the gateway.
-		do_action( 'getpaid_checkout_before_gateway', $invoice, $submission );
+        // Fires before sending to the gateway.
+        do_action( 'getpaid_checkout_before_gateway', $invoice, $submission );
 
-		// Allow the sumission data to be modified before it is sent to the gateway.
-		$submission_data    = $submission->get_data();
-		$submission_gateway = apply_filters( 'getpaid_gateway_submission_gateway', $invoice->get_gateway(), $submission, $invoice );
-		$submission_data    = apply_filters( 'getpaid_gateway_submission_data', $submission_data, $submission, $invoice );
+        // Allow the sumission data to be modified before it is sent to the gateway.
+        $submission_data    = $submission->get_data();
+        $submission_gateway = apply_filters( 'getpaid_gateway_submission_gateway', $invoice->get_gateway(), $submission, $invoice );
+        $submission_data    = apply_filters( 'getpaid_gateway_submission_data', $submission_data, $submission, $invoice );
 
-		// Validate the currency.
-		if ( ! apply_filters( "getpaid_gateway_{$submission_gateway}_is_valid_for_currency", true, $invoice->get_currency() ) ) {
-			wpinv_set_error( 'invalid_currency', __( 'The chosen payment gateway does not support this currency', 'invoicing' ) );
-		}
+        // Validate the currency.
+        if ( ! apply_filters( "getpaid_gateway_{$submission_gateway}_is_valid_for_currency", true, $invoice->get_currency() ) ) {
+            wpinv_set_error( 'invalid_currency', __( 'The chosen payment gateway does not support this currency', 'invoicing' ) );
+        }
 
-		// Check to see if we have any errors.
-		if ( wpinv_get_errors() ) {
-			wpinv_send_back_to_checkout( $invoice );
-		}
+        // Check to see if we have any errors.
+        if ( wpinv_get_errors() ) {
+            wpinv_send_back_to_checkout( $invoice );
+        }
 
-		// Send info to the gateway for payment processing
-		do_action( "getpaid_gateway_$submission_gateway", $invoice, $submission_data, $submission );
+        // Send info to the gateway for payment processing
+        do_action( "getpaid_gateway_$submission_gateway", $invoice, $submission_data, $submission );
 
-		// Backwards compatibility.
-		wpinv_send_to_gateway( $submission_gateway, $invoice );
+        // Backwards compatibility.
+        wpinv_send_to_gateway( $submission_gateway, $invoice );
 
-	}
+    }
 
-	/**
-	 * Marks the invoice as paid in case the checkout is free.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	protected function process_free_payment( $invoice ) {
+    /**
+     * Marks the invoice as paid in case the checkout is free.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    protected function process_free_payment( $invoice ) {
 
-		$invoice->set_gateway( 'none' );
-		$invoice->add_note( __( "This is a free invoice and won't be sent to the payment gateway", 'invoicing' ), false, false, true );
-		$invoice->mark_paid();
-		wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+        $invoice->set_gateway( 'none' );
+        $invoice->add_note( __( "This is a free invoice and won't be sent to the payment gateway", 'invoicing' ), false, false, true );
+        $invoice->mark_paid();
+        wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
 
-	}
+    }
 
-	/**
+    /**
      * Sends a redrect response to payment details.
      *
      */