AyeCode / invoicing

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

Indentation +571 added lines, -571 removed lines

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

templates/invoice-history.php

Indentation +73 added lines, -73 removed lines

@@ -42,92 +42,92 @@ 
 					<tr class="wpinv-item wpinv-item-<?php echo esc_attr( $invoice->get_status() ); ?>">
 						<?php
 
-							foreach ( wpinv_get_user_invoices_columns( $post_type ) as $column_id => $column_name ) :
+                            foreach ( wpinv_get_user_invoices_columns( $post_type ) as $column_id => $column_name ) :
 
-							$column_id = sanitize_html_class( $column_id );
-							$class     = empty( $column_name['class'] ) ? '' : sanitize_html_class( $column_name['class'] );
+                            $column_id = sanitize_html_class( $column_id );
+                            $class     = empty( $column_name['class'] ) ? '' : sanitize_html_class( $column_name['class'] );
 
-							echo "<td class='" . esc_attr( $column_id . ' ' . $class ) . "'>";
-							switch ( $column_id ) {
+                            echo "<td class='" . esc_attr( $column_id . ' ' . $class ) . "'>";
+                            switch ( $column_id ) {
 
-								case 'invoice-number':
-									echo wp_kses_post( wpinv_invoice_link( $invoice ) );
-									break;
+                                case 'invoice-number':
+                                    echo wp_kses_post( wpinv_invoice_link( $invoice ) );
+                                    break;
 
-								case 'created-date':
-									echo esc_html( getpaid_format_date_value( $invoice->get_date_created() ) );
-									break;
+                                case 'created-date':
+                                    echo esc_html( getpaid_format_date_value( $invoice->get_date_created() ) );
+                                    break;
 
-								case 'payment-date':
-									if ( $invoice->needs_payment() ) {
-										echo '&mdash;';
-										} else {
-										echo esc_html( getpaid_format_date_value( $invoice->get_date_completed() ) );
-										}
+                                case 'payment-date':
+                                    if ( $invoice->needs_payment() ) {
+                                        echo '&mdash;';
+                                        } else {
+                                        echo esc_html( getpaid_format_date_value( $invoice->get_date_completed() ) );
+                                        }
 
-									break;
+                                    break;
 
-								case 'invoice-status':
-									echo wp_kses_post( $invoice->get_status_label_html() );
+                                case 'invoice-status':
+                                    echo wp_kses_post( $invoice->get_status_label_html() );
 
-									break;
+                                    break;
 
-								case 'invoice-total':
-									wpinv_the_price( $invoice->get_total(), $invoice->get_currency() );
+                                case 'invoice-total':
+                                    wpinv_the_price( $invoice->get_total(), $invoice->get_currency() );
 
-									break;
+                                    break;
 
-								case 'invoice-actions':
-									$actions = array(
+                                case 'invoice-actions':
+                                    $actions = array(
 
-										'pay'   => array(
-											'url'   => $invoice->get_checkout_payment_url(),
-											'name'  => __( 'Pay Now', 'invoicing' ),
-											'class' => 'btn-success',
-										),
+                                        'pay'   => array(
+                                            'url'   => $invoice->get_checkout_payment_url(),
+                                            'name'  => __( 'Pay Now', 'invoicing' ),
+                                            'class' => 'btn-success',
+                                        ),
 
-										'print' => array(
-											'url'   => $invoice->get_view_url(),
-											'name'  => __( 'View', 'invoicing' ),
-											'class' => 'btn-secondary',
-											'attrs' => 'target="_blank"',
-										),
-									);
+                                        'print' => array(
+                                            'url'   => $invoice->get_view_url(),
+                                            'name'  => __( 'View', 'invoicing' ),
+                                            'class' => 'btn-secondary',
+                                            'attrs' => 'target="_blank"',
+                                        ),
+                                    );
 
-									if ( ! $invoice->needs_payment() ) {
-										unset( $actions['pay'] );
-										}
+                                    if ( ! $invoice->needs_payment() ) {
+                                        unset( $actions['pay'] );
+                                        }
 
-									if ( $invoice->needs_payment() ) {
-										$actions['delete'] = array(
-											'url'   => getpaid_get_authenticated_action_url( 'delete_invoice', add_query_arg( 'invoice_id', $invoice->get_id() ) ),
-											'name'  => __( 'Delete', 'invoicing' ),
-											'class' => 'btn-danger',
-										);
-										}
+                                    if ( $invoice->needs_payment() ) {
+                                        $actions['delete'] = array(
+                                            'url'   => getpaid_get_authenticated_action_url( 'delete_invoice', add_query_arg( 'invoice_id', $invoice->get_id() ) ),
+                                            'name'  => __( 'Delete', 'invoicing' ),
+                                            'class' => 'btn-danger',
+                                        );
+                                        }
 
-									$actions = apply_filters( 'wpinv_user_invoices_actions', $actions, $invoice, $post_type );
+                                    $actions = apply_filters( 'wpinv_user_invoices_actions', $actions, $invoice, $post_type );
 
-									foreach ( $actions as $key => $action ) {
-										$class = ! empty( $action['class'] ) ? sanitize_html_class( $action['class'] ) : '';
-										echo '<a href="' . esc_url( $action['url'] ) . '" class="btn btn-sm btn-block ' . esc_attr( $class . ' ' . sanitize_html_class( $key ) ) . '" ' . ( ! empty( $action['attrs'] ) ? esc_html( $action['attrs'] ) : '' ) . '>' . esc_attr( $action['name'] ) . '</a>';
-										}
+                                    foreach ( $actions as $key => $action ) {
+                                        $class = ! empty( $action['class'] ) ? sanitize_html_class( $action['class'] ) : '';
+                                        echo '<a href="' . esc_url( $action['url'] ) . '" class="btn btn-sm btn-block ' . esc_attr( $class . ' ' . sanitize_html_class( $key ) ) . '" ' . ( ! empty( $action['attrs'] ) ? esc_html( $action['attrs'] ) : '' ) . '>' . esc_attr( $action['name'] ) . '</a>';
+                                        }
 
-									break;
+                                    break;
 
-								default:
-									do_action( "wpinv_user_invoices_column_$column_id", $invoice );
-									break;
+                                default:
+                                    do_action( "wpinv_user_invoices_column_$column_id", $invoice );
+                                    break;
 
 
-								}
+                                }
 
-							do_action( "wpinv_user_invoices_column_after_$column_id", $invoice );
+                            do_action( "wpinv_user_invoices_column_after_$column_id", $invoice );
 
-							echo '</td>';
+                            echo '</td>';
 
-							endforeach;
-						?>
+                            endforeach;
+                        ?>
 					</tr>
 
 				<?php endforeach; ?>
@@ -141,18 +141,18 @@ 
 	<?php if ( 1 < $invoices->max_num_pages ) : ?>
 		<div class="invoicing-Pagination">
 			<?php
-			$big = 999999;
-
-			echo wp_kses_post(
-				paginate_links(
-					array(
-						'base'   => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
-						'format' => '?paged=%#%',
-						'total'  => $invoices->max_num_pages,
-					)
-				)
+            $big = 999999;
+
+            echo wp_kses_post(
+                paginate_links(
+                    array(
+                        'base'   => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+                        'format' => '?paged=%#%',
+                        'total'  => $invoices->max_num_pages,
+                    )
+                )
             );
-			?>
+            ?>
 		</div>
 	<?php endif; ?>
 

includes/libraries/wp-all-import/rapid-addon.php

Indentation +802 added lines, -802 removed lines

@@ -10,232 +10,232 @@ 
 
 if (!class_exists('RapidAddon')) {
 	
-	class RapidAddon {
-
-		public $name;
-		public $slug;
-		public $fields;
-		public $options = array();
-		public $accordions = array();
-		public $image_sections = array();
-		public $import_function;
-		public $post_saved_function;
-		public $notice_text;
-		public $logger = null;
-		public $when_to_run = false;
-		public $image_options = array(
-			'download_images' => 'yes', 
-			'download_featured_delim' => ',', 
-			'download_featured_image' => '',
-			'gallery_featured_image' => '',
-			'gallery_featured_delim' => ',',
-			'featured_image' => '',
-			'featured_delim' => ',', 
-			'search_existing_images' => 1,
-			'is_featured' => 0,
-			'create_draft' => 'no',
-			'set_image_meta_title' => 0,
-			'image_meta_title_delim' => ',',
-			'image_meta_title' => '',
-			'set_image_meta_caption' => 0,
-			'image_meta_caption_delim' => ',',
-			'image_meta_caption' => '',
-			'set_image_meta_alt' => 0,
-			'image_meta_alt_delim' => ',',
-			'image_meta_alt' => '',
-			'set_image_meta_description' => 0,
-			'image_meta_description_delim' => ',',
-			'image_meta_description_delim_logic' => 'separate',
-			'image_meta_description' => '',
-			'auto_rename_images' => 0,
-			'auto_rename_images_suffix' => '',
-			'auto_set_extension' => 0,
-			'new_extension' => '',
-			'do_not_remove_images' => 1,
+    class RapidAddon {
+
+        public $name;
+        public $slug;
+        public $fields;
+        public $options = array();
+        public $accordions = array();
+        public $image_sections = array();
+        public $import_function;
+        public $post_saved_function;
+        public $notice_text;
+        public $logger = null;
+        public $when_to_run = false;
+        public $image_options = array(
+            'download_images' => 'yes', 
+            'download_featured_delim' => ',', 
+            'download_featured_image' => '',
+            'gallery_featured_image' => '',
+            'gallery_featured_delim' => ',',
+            'featured_image' => '',
+            'featured_delim' => ',', 
+            'search_existing_images' => 1,
+            'is_featured' => 0,
+            'create_draft' => 'no',
+            'set_image_meta_title' => 0,
+            'image_meta_title_delim' => ',',
+            'image_meta_title' => '',
+            'set_image_meta_caption' => 0,
+            'image_meta_caption_delim' => ',',
+            'image_meta_caption' => '',
+            'set_image_meta_alt' => 0,
+            'image_meta_alt_delim' => ',',
+            'image_meta_alt' => '',
+            'set_image_meta_description' => 0,
+            'image_meta_description_delim' => ',',
+            'image_meta_description_delim_logic' => 'separate',
+            'image_meta_description' => '',
+            'auto_rename_images' => 0,
+            'auto_rename_images_suffix' => '',
+            'auto_set_extension' => 0,
+            'new_extension' => '',
+            'do_not_remove_images' => 1,
             'search_existing_images_logic' => 'by_url'
-		);
+        );
 
-		protected $isWizard = true;
+        protected $isWizard = true;
 
-		function __construct($name, $slug) {
-			$this->name = $name;
-			$this->slug = $slug;
-			if (!empty($_GET['id'])){
-				$this->isWizard = false;
-			}
+        function __construct($name, $slug) {
+            $this->name = $name;
+            $this->slug = $slug;
+            if (!empty($_GET['id'])){
+                $this->isWizard = false;
+            }
         }
         
-		function set_import_function($name) {
-			$this->import_function = $name;
-		}
+        function set_import_function($name) {
+            $this->import_function = $name;
+        }
 
-		function set_post_saved_function($name) {
-			$this->post_saved_function = $name;
-		}
+        function set_post_saved_function($name) {
+            $this->post_saved_function = $name;
+        }
 
-		function is_active_addon($post_type = null) {
+        function is_active_addon($post_type = null) {
 			
-			if ( ! class_exists( 'PMXI_Plugin' ) ) {
-				return false;
-			}
+            if ( ! class_exists( 'PMXI_Plugin' ) ) {
+                return false;
+            }
 
-			$addon_active = false;
+            $addon_active = false;
 
-			if ($post_type !== null) {
-				if (@in_array($post_type, $this->active_post_types) or empty($this->active_post_types)) {
-					$addon_active = true;
-				}
-			}
+            if ($post_type !== null) {
+                if (@in_array($post_type, $this->active_post_types) or empty($this->active_post_types)) {
+                    $addon_active = true;
+                }
+            }
 
-			if ($addon_active){
+            if ($addon_active){
 				
-				$current_theme = wp_get_theme();
+                $current_theme = wp_get_theme();
 
-				$parent_theme = $current_theme->parent();				
+                $parent_theme = $current_theme->parent();				
 
-				$theme_name = $current_theme->get('Name');
+                $theme_name = $current_theme->get('Name');
 				
-				$addon_active = (@in_array($theme_name, $this->active_themes) or empty($this->active_themes)) ? true : false;
+                $addon_active = (@in_array($theme_name, $this->active_themes) or empty($this->active_themes)) ? true : false;
 
-				if ( ! $addon_active and $parent_theme ){
-					$parent_theme_name = $parent_theme->get('Name');
-					$addon_active = (@in_array($parent_theme_name, $this->active_themes) or empty($this->active_themes)) ? true : false;
+                if ( ! $addon_active and $parent_theme ){
+                    $parent_theme_name = $parent_theme->get('Name');
+                    $addon_active = (@in_array($parent_theme_name, $this->active_themes) or empty($this->active_themes)) ? true : false;
 
-				}
+                }
 				
-				if ( $addon_active and ! empty($this->active_plugins) ){
+                if ( $addon_active and ! empty($this->active_plugins) ){
 
-					include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+                    include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
 
-					foreach ($this->active_plugins as $plugin) {
-						if ( ! is_plugin_active($plugin) ) {
-							$addon_active = false;
-							break;
-						}
-					}					
-				}
+                    foreach ($this->active_plugins as $plugin) {
+                        if ( ! is_plugin_active($plugin) ) {
+                            $addon_active = false;
+                            break;
+                        }
+                    }					
+                }
 
-			}
+            }
 
-			if ($this->when_to_run == "always") {
-				$addon_active = true;
-			}
+            if ($this->when_to_run == "always") {
+                $addon_active = true;
+            }
 
-			return apply_filters('rapid_is_active_add_on', $addon_active, $post_type, $this->slug);
-		}
+            return apply_filters('rapid_is_active_add_on', $addon_active, $post_type, $this->slug);
+        }
 		
-		/**
-		* 
-		* Add-On Initialization
-		*
-		* @param array $conditions - list of supported themes and post types
-		*
-		*/
-		function run($conditions = array()) {
-
-			if (empty($conditions)) {
-				$this->when_to_run = "always";
-			}
+        /**
+         * 
+         * Add-On Initialization
+         *
+         * @param array $conditions - list of supported themes and post types
+         *
+         */
+        function run($conditions = array()) {
+
+            if (empty($conditions)) {
+                $this->when_to_run = "always";
+            }
 
-			@$this->active_post_types = ( ! empty($conditions['post_types'])) ? $conditions['post_types'] : array();
-			@$this->active_themes = ( ! empty($conditions['themes'])) ? $conditions['themes'] : array();
-			@$this->active_plugins = ( ! empty($conditions['plugins'])) ? $conditions['plugins'] : array();			
+            @$this->active_post_types = ( ! empty($conditions['post_types'])) ? $conditions['post_types'] : array();
+            @$this->active_themes = ( ! empty($conditions['themes'])) ? $conditions['themes'] : array();
+            @$this->active_plugins = ( ! empty($conditions['plugins'])) ? $conditions['plugins'] : array();			
 
-			add_filter('pmxi_addons', array($this, 'wpai_api_register'));
-			add_filter('wp_all_import_addon_parse', array($this, 'wpai_api_parse'));
-			add_filter('wp_all_import_addon_import', array($this, 'wpai_api_import'));
-			add_filter('wp_all_import_addon_saved_post', array($this, 'wpai_api_post_saved'));
-			add_filter('pmxi_options_options', array($this, 'wpai_api_options'));
+            add_filter('pmxi_addons', array($this, 'wpai_api_register'));
+            add_filter('wp_all_import_addon_parse', array($this, 'wpai_api_parse'));
+            add_filter('wp_all_import_addon_import', array($this, 'wpai_api_import'));
+            add_filter('wp_all_import_addon_saved_post', array($this, 'wpai_api_post_saved'));
+            add_filter('pmxi_options_options', array($this, 'wpai_api_options'));
             add_filter('wp_all_import_image_sections', array($this, 'additional_sections'), 10, 1);
             add_filter('pmxi_custom_types', array($this, 'filter_post_types'), 10, 2);
             add_filter('pmxi_post_list_order', array($this,'sort_post_types'), 10, 1);
             add_filter('wp_all_import_post_type_image', array($this, 'post_type_image'), 10, 1 );
-			add_action('pmxi_extend_options_featured',  array($this, 'wpai_api_metabox'), 10, 2);
+            add_action('pmxi_extend_options_featured',  array($this, 'wpai_api_metabox'), 10, 2);
             add_action('admin_init', array($this, 'admin_notice_ignore'));
         }        
 
-		function parse($data) {
+        function parse($data) {
 			
-			if ( ! $this->is_active_addon($data['import']->options['custom_type'])) return false;
+            if ( ! $this->is_active_addon($data['import']->options['custom_type'])) return false;
 
-			$parsedData = $this->helper_parse($data, $this->options_array());
-			return $parsedData;
+            $parsedData = $this->helper_parse($data, $this->options_array());
+            return $parsedData;
 
-		}
+        }
 
 
-		function add_field($field_slug, $field_name, $field_type, $enum_values = null, $tooltip = "", $is_html = true, $default_text = '') {
+        function add_field($field_slug, $field_name, $field_type, $enum_values = null, $tooltip = "", $is_html = true, $default_text = '') {
 
-			$field =  array("name" => $field_name, "type" => $field_type, "enum_values" => $enum_values, "tooltip" => $tooltip, "is_sub_field" => false, "is_main_field" => false, "slug" => $field_slug, "is_html" => $is_html, 'default_text' => $default_text);
+            $field =  array("name" => $field_name, "type" => $field_type, "enum_values" => $enum_values, "tooltip" => $tooltip, "is_sub_field" => false, "is_main_field" => false, "slug" => $field_slug, "is_html" => $is_html, 'default_text' => $default_text);
 
-			$this->fields[$field_slug] = $field;
+            $this->fields[$field_slug] = $field;
 
-			if ( ! empty($enum_values) ){
-				foreach ($enum_values as $key => $value) {
-					if (is_array($value))
-					{
-						if ($field['type'] == 'accordion')
-						{
-							$this->fields[$value['slug']]['is_sub_field'] = true;
-						}
-						else
-						{
-							foreach ($value as $n => $param) {							
-								if (is_array($param) and ! empty($this->fields[$param['slug']])){
-									$this->fields[$param['slug']]['is_sub_field'] = true;								
-								}
-							}
-						}
-					}
-				}
-			}
+            if ( ! empty($enum_values) ){
+                foreach ($enum_values as $key => $value) {
+                    if (is_array($value))
+                    {
+                        if ($field['type'] == 'accordion')
+                        {
+                            $this->fields[$value['slug']]['is_sub_field'] = true;
+                        }
+                        else
+                        {
+                            foreach ($value as $n => $param) {							
+                                if (is_array($param) and ! empty($this->fields[$param['slug']])){
+                                    $this->fields[$param['slug']]['is_sub_field'] = true;								
+                                }
+                            }
+                        }
+                    }
+                }
+            }
 
-			return $field;
+            return $field;
 
-		}
+        }
 
-		function add_acf_field($field){
-			$this->fields[$field->post_name] = array(
-				'type' => 'acf',
-				'field_obj' => $field
-			);
-		}
+        function add_acf_field($field){
+            $this->fields[$field->post_name] = array(
+                'type' => 'acf',
+                'field_obj' => $field
+            );
+        }
 
-		private $acfGroups = array();
+        private $acfGroups = array();
 
-		function use_acf_group($acf_group){
-			$this->add_text(
-				'<div class="postbox acf_postbox default acf_signle_group rad4">
+        function use_acf_group($acf_group){
+            $this->add_text(
+                '<div class="postbox acf_postbox default acf_signle_group rad4">
     <h3 class="hndle" style="margin-top:0;"><span>'.$acf_group['title'].'</span></h3>
 	    <div class="inside">');
-			$acf_fields = get_posts(array('posts_per_page' => -1, 'post_type' => 'acf-field', 'post_parent' => $acf_group['ID'], 'post_status' => 'publish', 'orderby' => 'menu_order', 'order' => 'ASC'));
-			if (!empty($acf_fields)){
-				foreach ($acf_fields as $field) {
-					$this->add_acf_field($field);
-				}
-			}
-			$this->add_text('</div></div>');
-			$this->acfGroups[] = $acf_group['ID'];
-			add_filter('wp_all_import_acf_is_show_group', array($this, 'acf_is_show_group'), 10, 2);
-		}
-
-		function acf_is_show_group($is_show, $acf_group){
-			return (in_array($acf_group['ID'], $this->acfGroups)) ? false : true;
-		}
-
-		/**
-		* 
-		* Add an option to WP All Import options list
-		*
-		* @param string $slug - option name
-		* @param string $default_value - default option value
-		*
-		*/
-		function add_option($slug, $default_value = ''){
-			$this->options[$slug] = $default_value;
-		}
+            $acf_fields = get_posts(array('posts_per_page' => -1, 'post_type' => 'acf-field', 'post_parent' => $acf_group['ID'], 'post_status' => 'publish', 'orderby' => 'menu_order', 'order' => 'ASC'));
+            if (!empty($acf_fields)){
+                foreach ($acf_fields as $field) {
+                    $this->add_acf_field($field);
+                }
+            }
+            $this->add_text('</div></div>');
+            $this->acfGroups[] = $acf_group['ID'];
+            add_filter('wp_all_import_acf_is_show_group', array($this, 'acf_is_show_group'), 10, 2);
+        }
 
-		function options_array() {
+        function acf_is_show_group($is_show, $acf_group){
+            return (in_array($acf_group['ID'], $this->acfGroups)) ? false : true;
+        }
+
+        /**
+         * 
+         * Add an option to WP All Import options list
+         *
+         * @param string $slug - option name
+         * @param string $default_value - default option value
+         *
+         */
+        function add_option($slug, $default_value = ''){
+            $this->options[$slug] = $default_value;
+        }
+
+        function options_array() {
 
             $options_list = array();
             
@@ -255,528 +255,528 @@ 
 
             }			
 
-			if ( ! empty($this->options) ){
-				foreach ($this->options as $slug => $value) {
-					$options_arr[$slug] = $value;
-				}
-			}
+            if ( ! empty($this->options) ){
+                foreach ($this->options as $slug => $value) {
+                    $options_arr[$slug] = $value;
+                }
+            }
 
-			$options_arr[$this->slug]   = $options_list;
-			$options_arr['rapid_addon'] = plugin_basename( __FILE__ );
+            $options_arr[$this->slug]   = $options_list;
+            $options_arr['rapid_addon'] = plugin_basename( __FILE__ );
 
-			return $options_arr;
+            return $options_arr;
 
-		}
+        }
 
-		function wpai_api_options($all_options) {
+        function wpai_api_options($all_options) {
 
-			$all_options = $all_options + $this->options_array();
+            $all_options = $all_options + $this->options_array();
 
-			return $all_options;
+            return $all_options;
 
-		}
+        }
 
 
-		function wpai_api_register($addons) {
+        function wpai_api_register($addons) {
 
-			if (empty($addons[$this->slug])) {
-				$addons[$this->slug] = 1;
-			}
+            if (empty($addons[$this->slug])) {
+                $addons[$this->slug] = 1;
+            }
 
-			return $addons;
+            return $addons;
 
-		}
+        }
 
 
-		function wpai_api_parse($functions) {
+        function wpai_api_parse($functions) {
 
-			$functions[$this->slug] = array($this, 'parse');
-			return $functions;
+            $functions[$this->slug] = array($this, 'parse');
+            return $functions;
 
-		}
+        }
 
-		function wpai_api_post_saved($functions){
-			$functions[$this->slug] = array($this, 'post_saved');
-			return $functions;
-		}
+        function wpai_api_post_saved($functions){
+            $functions[$this->slug] = array($this, 'post_saved');
+            return $functions;
+        }
 
 
-		function wpai_api_import($functions) {
+        function wpai_api_import($functions) {
 
-			$functions[$this->slug] = array($this, 'import');
-			return $functions;
+            $functions[$this->slug] = array($this, 'import');
+            return $functions;
 
-		}
+        }
 
-		function post_saved( $importData ){
+        function post_saved( $importData ){
 
-			if (is_callable($this->post_saved_function))
-				call_user_func($this->post_saved_function, $importData['pid'], $importData['import'], $importData['logger']);
+            if (is_callable($this->post_saved_function))
+                call_user_func($this->post_saved_function, $importData['pid'], $importData['import'], $importData['logger']);
 			
-		}
+        }
 
-		function import($importData, $parsedData) {
+        function import($importData, $parsedData) {
 
-			if (!$this->is_active_addon($importData['post_type'])) {
-				return;
-			}
+            if (!$this->is_active_addon($importData['post_type'])) {
+                return;
+            }
 
-			$import_options = $importData['import']['options'][$this->slug];
+            $import_options = $importData['import']['options'][$this->slug];
 
-	//		echo "<pre>";
-	//		print_r($import_options);
-	//		echo "</pre>";
+    //		echo "<pre>";
+    //		print_r($import_options);
+    //		echo "</pre>";
 
-			if ( ! empty($parsedData) )	{
+            if ( ! empty($parsedData) )	{
 
-				$this->logger = $importData['logger'];
+                $this->logger = $importData['logger'];
 
-				$post_id = $importData['pid'];
-				$index = $importData['i'];
-				$data = array();
-				if (!empty($this->fields)){
-					foreach ($this->fields as $field_slug => $field_params) {
-						if (in_array($field_params['type'], array('title', 'plain_text'))) continue;
-						switch ($field_params['type']) {
+                $post_id = $importData['pid'];
+                $index = $importData['i'];
+                $data = array();
+                if (!empty($this->fields)){
+                    foreach ($this->fields as $field_slug => $field_params) {
+                        if (in_array($field_params['type'], array('title', 'plain_text'))) continue;
+                        switch ($field_params['type']) {
 
-							case 'image':
+                            case 'image':
 								
-								// import the specified image, then set the value of the field to the image ID in the media library
+                                // import the specified image, then set the value of the field to the image ID in the media library
 
-								$image_url_or_path = $parsedData[$field_slug][$index];
+                                $image_url_or_path = $parsedData[$field_slug][$index];
 
-								if ( ! array_key_exists( $field_slug, $import_options['download_image'] ) ) {
-									continue 2;
-								}
+                                if ( ! array_key_exists( $field_slug, $import_options['download_image'] ) ) {
+                                    continue 2;
+                                }
 
-								$download = $import_options['download_image'][$field_slug];
+                                $download = $import_options['download_image'][$field_slug];
 
-								$uploaded_image = PMXI_API::upload_image($post_id, $image_url_or_path, $download, $importData['logger'], true, "", "images", true, $importData['articleData']);
+                                $uploaded_image = PMXI_API::upload_image($post_id, $image_url_or_path, $download, $importData['logger'], true, "", "images", true, $importData['articleData']);
 
-								$data[$field_slug] = array(
-									"attachment_id" => $uploaded_image,
-									"image_url_or_path" => $image_url_or_path,
-									"download" => $download
-								);
+                                $data[$field_slug] = array(
+                                    "attachment_id" => $uploaded_image,
+                                    "image_url_or_path" => $image_url_or_path,
+                                    "download" => $download
+                                );
 
-								break;
+                                break;
 
-							case 'file':
+                            case 'file':
 
-								$image_url_or_path = $parsedData[$field_slug][$index];
+                                $image_url_or_path = $parsedData[$field_slug][$index];
 
-								if ( ! array_key_exists( $field_slug, $import_options['download_image'] ) ) {
-									continue 2;
-								}
+                                if ( ! array_key_exists( $field_slug, $import_options['download_image'] ) ) {
+                                    continue 2;
+                                }
 
-								$download = $import_options['download_image'][$field_slug];
+                                $download = $import_options['download_image'][$field_slug];
 
-								$uploaded_file = PMXI_API::upload_image($post_id, $image_url_or_path, $download, $importData['logger'], true, "", "files", true, $importData['articleData']);
+                                $uploaded_file = PMXI_API::upload_image($post_id, $image_url_or_path, $download, $importData['logger'], true, "", "files", true, $importData['articleData']);
 
-								$data[$field_slug] = array(
-									"attachment_id" => $uploaded_file,
-									"image_url_or_path" => $image_url_or_path,
-									"download" => $download
-								);
+                                $data[$field_slug] = array(
+                                    "attachment_id" => $uploaded_file,
+                                    "image_url_or_path" => $image_url_or_path,
+                                    "download" => $download
+                                );
 
-								break;
+                                break;
 							
-							default:
-								// set the field data to the value of the field after it's been parsed
-								$data[$field_slug] = $parsedData[$field_slug][$index];
-								break;
-						}					
+                            default:
+                                // set the field data to the value of the field after it's been parsed
+                                $data[$field_slug] = $parsedData[$field_slug][$index];
+                                break;
+                        }					
+
+                        // apply mapping rules if they exist
+                        if (!empty($import_options['mapping'][$field_slug])) {
+                            $mapping_rules = json_decode($import_options['mapping'][$field_slug], true);
+
+                            if (!empty($mapping_rules) and is_array($mapping_rules)) {
+                                foreach ($mapping_rules as $rule_number => $map_to) {
+                                    if (isset($map_to[trim($data[$field_slug])])){
+                                        $data[$field_slug] = trim($map_to[trim($data[$field_slug])]);
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                        // --------------------
+                    }
+                }				
 
-						// apply mapping rules if they exist
-						if (!empty($import_options['mapping'][$field_slug])) {
-							$mapping_rules = json_decode($import_options['mapping'][$field_slug], true);
+                call_user_func($this->import_function, $post_id, $data, $importData['import'], $importData['articleData'], $importData['logger']);
+            }
 
-							if (!empty($mapping_rules) and is_array($mapping_rules)) {
-								foreach ($mapping_rules as $rule_number => $map_to) {
-									if (isset($map_to[trim($data[$field_slug])])){
-										$data[$field_slug] = trim($map_to[trim($data[$field_slug])]);
-										break;
-									}
-								}
-							}
-						}
-						// --------------------
-					}
-				}				
+        }
 
-				call_user_func($this->import_function, $post_id, $data, $importData['import'], $importData['articleData'], $importData['logger']);
-			}
 
-		}
+        function wpai_api_metabox($post_type, $current_values) {
 
+            if (!$this->is_active_addon($post_type)) {
+                return;
+            }
 
-		function wpai_api_metabox($post_type, $current_values) {
+            echo $this->helper_metabox_top($this->name);
 
-			if (!$this->is_active_addon($post_type)) {
-				return;
-			}
+            $visible_fields = 0;
 
-			echo $this->helper_metabox_top($this->name);
+            foreach ($this->fields as $field_slug => $field_params) {
+                if ($field_params['is_sub_field']) continue;
+                $visible_fields++;
+            }
 
-			$visible_fields = 0;
+            $counter = 0;
 
-			foreach ($this->fields as $field_slug => $field_params) {
-				if ($field_params['is_sub_field']) continue;
-				$visible_fields++;
-			}
+            foreach ($this->fields as $field_slug => $field_params) {				
 
-			$counter = 0;
+                // do not render sub fields
+                if ($field_params['is_sub_field']) continue;		
 
-			foreach ($this->fields as $field_slug => $field_params) {				
+                $counter++;		
 
-				// do not render sub fields
-				if ($field_params['is_sub_field']) continue;		
+                $this->render_field($field_params, $field_slug, $current_values, $visible_fields == $counter);										
 
-				$counter++;		
+                //if ( $field_params['type'] != 'accordion' ) echo "<br />";				
 
-				$this->render_field($field_params, $field_slug, $current_values, $visible_fields == $counter);										
+            }
 
-				//if ( $field_params['type'] != 'accordion' ) echo "<br />";				
+            echo $this->helper_metabox_bottom();
+
+            if ( ! empty($this->image_sections) ){				
+                $is_images_section_enabled = apply_filters('wp_all_import_is_images_section_enabled', true, $post_type);						
+                foreach ($this->image_sections as $k => $section) {
+                    $section_options = array();
+                    foreach ($this->image_options as $slug => $value) {
+                        $section_options[$section['slug'] . $slug] = $value;
+                    }										
+                    if ( ! $is_images_section_enabled and ! $k ){
+                        $section_options[$section['slug'] . 'is_featured'] = 1;
+                    }
+                    PMXI_API::add_additional_images_section($section['title'], $section['slug'], $current_values, '', true, false, $section['type']);
+                }
+            }
 
-			}
+        }		
 
-			echo $this->helper_metabox_bottom();
+        function render_field($field_params, $field_slug, $current_values, $in_the_bottom = false){
 
-			if ( ! empty($this->image_sections) ){				
-				$is_images_section_enabled = apply_filters('wp_all_import_is_images_section_enabled', true, $post_type);						
-				foreach ($this->image_sections as $k => $section) {
-					$section_options = array();
-					foreach ($this->image_options as $slug => $value) {
-						$section_options[$section['slug'] . $slug] = $value;
-					}										
-					if ( ! $is_images_section_enabled and ! $k ){
-						$section_options[$section['slug'] . 'is_featured'] = 1;
-					}
-					PMXI_API::add_additional_images_section($section['title'], $section['slug'], $current_values, '', true, false, $section['type']);
-				}
-			}
-
-		}		
-
-		function render_field($field_params, $field_slug, $current_values, $in_the_bottom = false){
-
-			if (!isset($current_values[$this->slug][$field_slug])) {
-				$current_values[$this->slug][$field_slug] = isset($field_params['default_text']) ? $field_params['default_text'] : '';
-			}
-
-			if ($field_params['type'] == 'text') {
-
-				PMXI_API::add_field(
-					'simple',
-					$field_params['name'],
-					array(
-						'tooltip' => $field_params['tooltip'],
-						'field_name' => $this->slug."[".$field_slug."]",
-						'field_value' => ( $current_values[$this->slug][$field_slug] == '' && $this->isWizard ) ? $field_params['default_text'] : $current_values[$this->slug][$field_slug]
-					)
-				);
-
-			} else if ($field_params['type'] == 'textarea') {
-
-				PMXI_API::add_field(
-					'textarea',
-					$field_params['name'],
-					array(
-						'tooltip' => $field_params['tooltip'],
-						'field_name' => $this->slug."[".$field_slug."]",
-						'field_value' => ( $current_values[$this->slug][$field_slug] == '' && $this->isWizard ) ? $field_params['default_text'] : $current_values[$this->slug][$field_slug]
-					)
-				);
-
-			} else if ($field_params['type'] == 'wp_editor') {
-
-				PMXI_API::add_field(
-					'wp_editor',
-					$field_params['name'],
-					array(
-						'tooltip' => $field_params['tooltip'],
-						'field_name' => $this->slug."[".$field_slug."]",
-						'field_value' => ( $current_values[$this->slug][$field_slug] == '' && $this->isWizard ) ? $field_params['default_text'] : $current_values[$this->slug][$field_slug]
-					)
-				);
-
-			} else if ($field_params['type'] == 'image' or $field_params['type'] == 'file') {
+            if (!isset($current_values[$this->slug][$field_slug])) {
+                $current_values[$this->slug][$field_slug] = isset($field_params['default_text']) ? $field_params['default_text'] : '';
+            }
+
+            if ($field_params['type'] == 'text') {
+
+                PMXI_API::add_field(
+                    'simple',
+                    $field_params['name'],
+                    array(
+                        'tooltip' => $field_params['tooltip'],
+                        'field_name' => $this->slug."[".$field_slug."]",
+                        'field_value' => ( $current_values[$this->slug][$field_slug] == '' && $this->isWizard ) ? $field_params['default_text'] : $current_values[$this->slug][$field_slug]
+                    )
+                );
+
+            } else if ($field_params['type'] == 'textarea') {
+
+                PMXI_API::add_field(
+                    'textarea',
+                    $field_params['name'],
+                    array(
+                        'tooltip' => $field_params['tooltip'],
+                        'field_name' => $this->slug."[".$field_slug."]",
+                        'field_value' => ( $current_values[$this->slug][$field_slug] == '' && $this->isWizard ) ? $field_params['default_text'] : $current_values[$this->slug][$field_slug]
+                    )
+                );
+
+            } else if ($field_params['type'] == 'wp_editor') {
+
+                PMXI_API::add_field(
+                    'wp_editor',
+                    $field_params['name'],
+                    array(
+                        'tooltip' => $field_params['tooltip'],
+                        'field_name' => $this->slug."[".$field_slug."]",
+                        'field_value' => ( $current_values[$this->slug][$field_slug] == '' && $this->isWizard ) ? $field_params['default_text'] : $current_values[$this->slug][$field_slug]
+                    )
+                );
+
+            } else if ($field_params['type'] == 'image' or $field_params['type'] == 'file') {
 				
-				if (!isset($current_values[$this->slug]['download_image'][$field_slug])) { $current_values[$this->slug]['download_image'][$field_slug] = ''; }
-
-				PMXI_API::add_field(
-					$field_params['type'],
-					$field_params['name'],
-					array(
-						'tooltip' => $field_params['tooltip'],
-						'field_name' => $this->slug."[".$field_slug."]",
-						'field_value' => $current_values[$this->slug][$field_slug],
-						'download_image' => $current_values[$this->slug]['download_image'][$field_slug],
-						'field_key' => $field_slug,
-						'addon_prefix' => $this->slug
-
-					)
-				);
-
-			} else if ($field_params['type'] == 'radio') {					
+                if (!isset($current_values[$this->slug]['download_image'][$field_slug])) { $current_values[$this->slug]['download_image'][$field_slug] = ''; }
+
+                PMXI_API::add_field(
+                    $field_params['type'],
+                    $field_params['name'],
+                    array(
+                        'tooltip' => $field_params['tooltip'],
+                        'field_name' => $this->slug."[".$field_slug."]",
+                        'field_value' => $current_values[$this->slug][$field_slug],
+                        'download_image' => $current_values[$this->slug]['download_image'][$field_slug],
+                        'field_key' => $field_slug,
+                        'addon_prefix' => $this->slug
+
+                    )
+                );
+
+            } else if ($field_params['type'] == 'radio') {					
 				
-				if (!isset($current_values[$this->slug]['mapping'][$field_slug])) { $current_values[$this->slug]['mapping'][$field_slug] = array(); }
-				if (!isset($current_values[$this->slug]['xpaths'][$field_slug])) { $current_values[$this->slug]['xpaths'][$field_slug] = ''; }
-
-				PMXI_API::add_field(
-					'enum',
-					$field_params['name'],
-					array(
-						'tooltip' => $field_params['tooltip'],
-						'field_name' => $this->slug."[".$field_slug."]",
-						'field_value' => $current_values[$this->slug][$field_slug],
-						'enum_values' => $field_params['enum_values'],
-						'mapping' => true,
-						'field_key' => $field_slug,
-						'mapping_rules' => $current_values[$this->slug]['mapping'][$field_slug],
-						'xpath' => $current_values[$this->slug]['xpaths'][$field_slug],
-						'addon_prefix' => $this->slug,
-						'sub_fields' => $this->get_sub_fields($field_params, $field_slug, $current_values)
-					)
-				);
-
-			} else if($field_params['type'] == 'accordion') {
-
-				PMXI_API::add_field(
-					'accordion',
-					$field_params['name'],
-					array(						
-						'tooltip' => $field_params['tooltip'],
-						'field_name' => $this->slug."[".$field_slug."]",																
-						'field_key' => $field_slug,								
-						'addon_prefix' => $this->slug,
-						'sub_fields' => $this->get_sub_fields($field_params, $field_slug, $current_values),
-						'in_the_bottom' => $in_the_bottom						
-					)
-				);
-
-			} else if($field_params['type'] == 'acf') {
-				$fieldData = (!empty($field_params['field_obj']->post_content)) ? unserialize($field_params['field_obj']->post_content) : array();
-				$fieldData['ID']    = $field_params['field_obj']->ID;
-				$fieldData['id']    = $field_params['field_obj']->ID;
-				$fieldData['label'] = $field_params['field_obj']->post_title;
-				$fieldData['key']   = $field_params['field_obj']->post_name;
-				if (empty($fieldData['name'])) $fieldData['name'] = $field_params['field_obj']->post_excerpt;
-				if (function_exists('pmai_render_field')) {
-					echo pmai_render_field($fieldData, ( ! empty($current_values) ) ? $current_values : array() );
-				}
-			} else if($field_params['type'] == 'title'){
-				?>
+                if (!isset($current_values[$this->slug]['mapping'][$field_slug])) { $current_values[$this->slug]['mapping'][$field_slug] = array(); }
+                if (!isset($current_values[$this->slug]['xpaths'][$field_slug])) { $current_values[$this->slug]['xpaths'][$field_slug] = ''; }
+
+                PMXI_API::add_field(
+                    'enum',
+                    $field_params['name'],
+                    array(
+                        'tooltip' => $field_params['tooltip'],
+                        'field_name' => $this->slug."[".$field_slug."]",
+                        'field_value' => $current_values[$this->slug][$field_slug],
+                        'enum_values' => $field_params['enum_values'],
+                        'mapping' => true,
+                        'field_key' => $field_slug,
+                        'mapping_rules' => $current_values[$this->slug]['mapping'][$field_slug],
+                        'xpath' => $current_values[$this->slug]['xpaths'][$field_slug],
+                        'addon_prefix' => $this->slug,
+                        'sub_fields' => $this->get_sub_fields($field_params, $field_slug, $current_values)
+                    )
+                );
+
+            } else if($field_params['type'] == 'accordion') {
+
+                PMXI_API::add_field(
+                    'accordion',
+                    $field_params['name'],
+                    array(						
+                        'tooltip' => $field_params['tooltip'],
+                        'field_name' => $this->slug."[".$field_slug."]",																
+                        'field_key' => $field_slug,								
+                        'addon_prefix' => $this->slug,
+                        'sub_fields' => $this->get_sub_fields($field_params, $field_slug, $current_values),
+                        'in_the_bottom' => $in_the_bottom						
+                    )
+                );
+
+            } else if($field_params['type'] == 'acf') {
+                $fieldData = (!empty($field_params['field_obj']->post_content)) ? unserialize($field_params['field_obj']->post_content) : array();
+                $fieldData['ID']    = $field_params['field_obj']->ID;
+                $fieldData['id']    = $field_params['field_obj']->ID;
+                $fieldData['label'] = $field_params['field_obj']->post_title;
+                $fieldData['key']   = $field_params['field_obj']->post_name;
+                if (empty($fieldData['name'])) $fieldData['name'] = $field_params['field_obj']->post_excerpt;
+                if (function_exists('pmai_render_field')) {
+                    echo pmai_render_field($fieldData, ( ! empty($current_values) ) ? $current_values : array() );
+                }
+            } else if($field_params['type'] == 'title'){
+                ?>
 				<h4 class="wpallimport-add-on-options-title"><?php esc_html_e($field_params['name'], 'wp_all_import_plugin'); ?><?php if ( ! empty($field_params['tooltip'])): ?><a href="#help" class="wpallimport-help" title="<?php echo $field_params['tooltip']; ?>" style="position:relative; top: -1px;">?</a><?php endif; ?></h4>				
 				<?php
 
-			} else if($field_params['type'] == 'plain_text'){
-				if ($field_params['is_html']):					
-					echo $field_params['name'];				
-				else:
-					?>
+            } else if($field_params['type'] == 'plain_text'){
+                if ($field_params['is_html']):					
+                    echo $field_params['name'];				
+                else:
+                    ?>
 					<p style="margin: 0 0 12px 0;"><?php echo $field_params['name'];?></p>
 					<?php
-				endif;
-			}
+                endif;
+            }
 
 
-		}
-		/**
-		*
-		* Helper function for nested radio fields
-		*
-		*/
-		function get_sub_fields($field_params, $field_slug, $current_values){
-			$sub_fields = array();	
-			if ( ! empty($field_params['enum_values']) ){										
-				foreach ($field_params['enum_values'] as $key => $value) {					
-					$sub_fields[$key] = array();	
-					if (is_array($value)){
-						if ($field_params['type'] == 'accordion'){								
-							$sub_fields[$key][] = $this->convert_field($value, $current_values);
-						}
-						else
-						{
-							foreach ($value as $k => $sub_field) {								
-								if (is_array($sub_field) and ! empty($this->fields[$sub_field['slug']]))
-								{									
-									$sub_fields[$key][] = $this->convert_field($sub_field, $current_values);
-								}								
-							}
-						}
-					}
-				}
-			}
-			return $sub_fields;
-		}			
-
-		function convert_field($sub_field, $current_values){
-			$field = array();
-			if (!isset($current_values[$this->slug][$sub_field['slug']])) {
-				$current_values[$this->slug][$sub_field['slug']] = isset($sub_field['default_text']) ? $sub_field['default_text'] : '';
-			}
-			switch ($this->fields[$sub_field['slug']]['type']) {
-				case 'text':
-					$field = array(
-						'type'   => 'simple',
-						'label'  => $this->fields[$sub_field['slug']]['name'],
-						'params' => array(
-							'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
-							'field_name' => $this->slug."[".$sub_field['slug']."]",
-							'field_value' => ($current_values[$this->slug][$sub_field['slug']] == '' && $this->isWizard) ? $sub_field['default_text'] : $current_values[$this->slug][$sub_field['slug']],
-							'is_main_field' => $sub_field['is_main_field']
-						)
-					);
-					break;
-				case 'textarea':
-					$field = array(
-						'type'   => 'textarea',
-						'label'  => $this->fields[$sub_field['slug']]['name'],
-						'params' => array(
-							'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
-							'field_name' => $this->slug."[".$sub_field['slug']."]",
-							'field_value' => ($current_values[$this->slug][$sub_field['slug']] == '' && $this->isWizard) ? $sub_field['default_text'] : $current_values[$this->slug][$sub_field['slug']],
-							'is_main_field' => $sub_field['is_main_field']
-						)
-					);
-					break;
-				case 'wp_editor':
-					$field = array(
-						'type'   => 'wp_editor',
-						'label'  => $this->fields[$sub_field['slug']]['name'],
-						'params' => array(
-							'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
-							'field_name' => $this->slug."[".$sub_field['slug']."]",
-							'field_value' => ($current_values[$this->slug][$sub_field['slug']] == '' && $this->isWizard) ? $sub_field['default_text'] : $current_values[$this->slug][$sub_field['slug']],
-							'is_main_field' => $sub_field['is_main_field']
-						)
-					);
-					break;
-				case 'image':
-					$field = array(
-						'type'   => 'image',
-						'label'  => $this->fields[$sub_field['slug']]['name'],
-						'params' => array(
-							'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
-							'field_name' => $this->slug."[".$sub_field['slug']."]",
-							'field_value' => $current_values[$this->slug][$sub_field['slug']],
-							'download_image' => null,
-							'field_key' => $sub_field['slug'],
-							'addon_prefix' => $this->slug,
-							'is_main_field' => $sub_field['is_main_field']
-						)
-					);
-
-					if ( array_key_exists( 'download_image', $current_values[$this->slug] ) && array_key_exists( $sub_field['slug'], $current_values[$this->slug]['download_image'] ) ) {
-						$field['params']['download_image'] = $current_values[$this->slug]['download_image'][$sub_field['slug']];
-					}
+        }
+        /**
+         *
+         * Helper function for nested radio fields
+         *
+         */
+        function get_sub_fields($field_params, $field_slug, $current_values){
+            $sub_fields = array();	
+            if ( ! empty($field_params['enum_values']) ){										
+                foreach ($field_params['enum_values'] as $key => $value) {					
+                    $sub_fields[$key] = array();	
+                    if (is_array($value)){
+                        if ($field_params['type'] == 'accordion'){								
+                            $sub_fields[$key][] = $this->convert_field($value, $current_values);
+                        }
+                        else
+                        {
+                            foreach ($value as $k => $sub_field) {								
+                                if (is_array($sub_field) and ! empty($this->fields[$sub_field['slug']]))
+                                {									
+                                    $sub_fields[$key][] = $this->convert_field($sub_field, $current_values);
+                                }								
+                            }
+                        }
+                    }
+                }
+            }
+            return $sub_fields;
+        }			
+
+        function convert_field($sub_field, $current_values){
+            $field = array();
+            if (!isset($current_values[$this->slug][$sub_field['slug']])) {
+                $current_values[$this->slug][$sub_field['slug']] = isset($sub_field['default_text']) ? $sub_field['default_text'] : '';
+            }
+            switch ($this->fields[$sub_field['slug']]['type']) {
+                case 'text':
+                    $field = array(
+                        'type'   => 'simple',
+                        'label'  => $this->fields[$sub_field['slug']]['name'],
+                        'params' => array(
+                            'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
+                            'field_name' => $this->slug."[".$sub_field['slug']."]",
+                            'field_value' => ($current_values[$this->slug][$sub_field['slug']] == '' && $this->isWizard) ? $sub_field['default_text'] : $current_values[$this->slug][$sub_field['slug']],
+                            'is_main_field' => $sub_field['is_main_field']
+                        )
+                    );
                     break;
-				case 'file':
-					$field = array(
-						'type'   => 'file',
-						'label'  => $this->fields[$sub_field['slug']]['name'],
-						'params' => array(
-							'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
-							'field_name' => $this->slug."[".$sub_field['slug']."]",
-							'field_value' => $current_values[$this->slug][$sub_field['slug']],
-							'download_image' => null,
-							'field_key' => $sub_field['slug'],
-							'addon_prefix' => $this->slug,
-							'is_main_field' => $sub_field['is_main_field']
-						)
-					);
-
-					if ( array_key_exists( 'download_image', $current_values[$this->slug] )  && array_key_exists( $sub_field['slug'], $current_values[$this->slug]['download_image'] ) ) {
-						$field['params']['download_image'] = $current_values[$this->slug]['download_image'][$sub_field['slug']];
-					}
-
-					break;
-				case 'radio':
-					$field = array(
-						'type'   => 'enum',
-						'label'  => $this->fields[$sub_field['slug']]['name'],
-						'params' => array(
-							'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
-							'field_name' => $this->slug."[".$sub_field['slug']."]",
-							'field_value' => $current_values[$this->slug][$sub_field['slug']],
-							'enum_values' => $this->fields[$sub_field['slug']]['enum_values'],
-							'mapping' => true,
-							'field_key' => $sub_field['slug'],
-							'mapping_rules' => isset($current_values[$this->slug]['mapping'][$sub_field['slug']]) ? $current_values[$this->slug]['mapping'][$sub_field['slug']] : array(),
-							'xpath' => isset($current_values[$this->slug]['xpaths'][$sub_field['slug']]) ? $current_values[$this->slug]['xpaths'][$sub_field['slug']] : '',
-							'addon_prefix' => $this->slug,
-							'sub_fields' => $this->get_sub_fields($this->fields[$sub_field['slug']], $sub_field['slug'], $current_values),
-							'is_main_field' => $sub_field['is_main_field']
-						)
-					);
-					break;
-				case 'accordion':
-					$field = array(
-						'type'   => 'accordion',
-						'label'  => $this->fields[$sub_field['slug']]['name'],
-						'params' => array(
-							'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
-							'field_name' => $this->slug."[".$sub_field['slug']."]",																
-							'field_key' => $sub_field['slug'],								
-							'addon_prefix' => $this->slug,
-							'sub_fields' => $this->get_sub_fields($this->fields[$sub_field['slug']], $sub_field['slug'], $current_values),
-							'in_the_bottom' => false
-						)
-					);						
-					break;
-				default:
-					# code...
-					break;
-			}
-			return $field;
-		}				
-
-		/**
-		* 
-		* Add accordion options
-		*
-		*
-		*/
-		function add_options( $main_field = false, $title = '', $fields = array() ){
+                case 'textarea':
+                    $field = array(
+                        'type'   => 'textarea',
+                        'label'  => $this->fields[$sub_field['slug']]['name'],
+                        'params' => array(
+                            'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
+                            'field_name' => $this->slug."[".$sub_field['slug']."]",
+                            'field_value' => ($current_values[$this->slug][$sub_field['slug']] == '' && $this->isWizard) ? $sub_field['default_text'] : $current_values[$this->slug][$sub_field['slug']],
+                            'is_main_field' => $sub_field['is_main_field']
+                        )
+                    );
+                    break;
+                case 'wp_editor':
+                    $field = array(
+                        'type'   => 'wp_editor',
+                        'label'  => $this->fields[$sub_field['slug']]['name'],
+                        'params' => array(
+                            'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
+                            'field_name' => $this->slug."[".$sub_field['slug']."]",
+                            'field_value' => ($current_values[$this->slug][$sub_field['slug']] == '' && $this->isWizard) ? $sub_field['default_text'] : $current_values[$this->slug][$sub_field['slug']],
+                            'is_main_field' => $sub_field['is_main_field']
+                        )
+                    );
+                    break;
+                case 'image':
+                    $field = array(
+                        'type'   => 'image',
+                        'label'  => $this->fields[$sub_field['slug']]['name'],
+                        'params' => array(
+                            'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
+                            'field_name' => $this->slug."[".$sub_field['slug']."]",
+                            'field_value' => $current_values[$this->slug][$sub_field['slug']],
+                            'download_image' => null,
+                            'field_key' => $sub_field['slug'],
+                            'addon_prefix' => $this->slug,
+                            'is_main_field' => $sub_field['is_main_field']
+                        )
+                    );
+
+                    if ( array_key_exists( 'download_image', $current_values[$this->slug] ) && array_key_exists( $sub_field['slug'], $current_values[$this->slug]['download_image'] ) ) {
+                        $field['params']['download_image'] = $current_values[$this->slug]['download_image'][$sub_field['slug']];
+                    }
+                    break;
+                case 'file':
+                    $field = array(
+                        'type'   => 'file',
+                        'label'  => $this->fields[$sub_field['slug']]['name'],
+                        'params' => array(
+                            'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
+                            'field_name' => $this->slug."[".$sub_field['slug']."]",
+                            'field_value' => $current_values[$this->slug][$sub_field['slug']],
+                            'download_image' => null,
+                            'field_key' => $sub_field['slug'],
+                            'addon_prefix' => $this->slug,
+                            'is_main_field' => $sub_field['is_main_field']
+                        )
+                    );
+
+                    if ( array_key_exists( 'download_image', $current_values[$this->slug] )  && array_key_exists( $sub_field['slug'], $current_values[$this->slug]['download_image'] ) ) {
+                        $field['params']['download_image'] = $current_values[$this->slug]['download_image'][$sub_field['slug']];
+                    }
+
+                    break;
+                case 'radio':
+                    $field = array(
+                        'type'   => 'enum',
+                        'label'  => $this->fields[$sub_field['slug']]['name'],
+                        'params' => array(
+                            'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
+                            'field_name' => $this->slug."[".$sub_field['slug']."]",
+                            'field_value' => $current_values[$this->slug][$sub_field['slug']],
+                            'enum_values' => $this->fields[$sub_field['slug']]['enum_values'],
+                            'mapping' => true,
+                            'field_key' => $sub_field['slug'],
+                            'mapping_rules' => isset($current_values[$this->slug]['mapping'][$sub_field['slug']]) ? $current_values[$this->slug]['mapping'][$sub_field['slug']] : array(),
+                            'xpath' => isset($current_values[$this->slug]['xpaths'][$sub_field['slug']]) ? $current_values[$this->slug]['xpaths'][$sub_field['slug']] : '',
+                            'addon_prefix' => $this->slug,
+                            'sub_fields' => $this->get_sub_fields($this->fields[$sub_field['slug']], $sub_field['slug'], $current_values),
+                            'is_main_field' => $sub_field['is_main_field']
+                        )
+                    );
+                    break;
+                case 'accordion':
+                    $field = array(
+                        'type'   => 'accordion',
+                        'label'  => $this->fields[$sub_field['slug']]['name'],
+                        'params' => array(
+                            'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
+                            'field_name' => $this->slug."[".$sub_field['slug']."]",																
+                            'field_key' => $sub_field['slug'],								
+                            'addon_prefix' => $this->slug,
+                            'sub_fields' => $this->get_sub_fields($this->fields[$sub_field['slug']], $sub_field['slug'], $current_values),
+                            'in_the_bottom' => false
+                        )
+                    );						
+                    break;
+                default:
+                    # code...
+                    break;
+            }
+            return $field;
+        }				
+
+        /**
+         * 
+         * Add accordion options
+         *
+         *
+         */
+        function add_options( $main_field = false, $title = '', $fields = array() ){
 			
-			if ( ! empty($fields) )
-			{				
+            if ( ! empty($fields) )
+            {				
 				
-				if ($main_field){
+                if ($main_field){
 
-					$main_field['is_main_field'] = true;
-					$fields[] = $main_field;
+                    $main_field['is_main_field'] = true;
+                    $fields[] = $main_field;
 
-				}
+                }
 
-				return $this->add_field('accordion_' . $fields[0]['slug'], $title, 'accordion', $fields);							
+                return $this->add_field('accordion_' . $fields[0]['slug'], $title, 'accordion', $fields);							
 			
-			}
+            }
 
-		}			
+        }			
 
-		function add_title($title = '', $tooltip = ''){
+        function add_title($title = '', $tooltip = ''){
 
-			if (empty($title)) return;
+            if (empty($title)) return;
 
-			return $this->add_field(sanitize_key($title) . time(), $title, 'title', null, $tooltip);			
+            return $this->add_field(sanitize_key($title) . time(), $title, 'title', null, $tooltip);			
 
-		}		
+        }		
 
-		function add_text($text = '', $is_html = false){
+        function add_text($text = '', $is_html = false){
 
-			if (empty($text)) return;
+            if (empty($text)) return;
 
-			$count = is_array($this->fields) ? count($this->fields) : 0;
+            $count = is_array($this->fields) ? count($this->fields) : 0;
 
-			return $this->add_field(sanitize_key($text) . time() . uniqid() . $count, $text, 'plain_text', null, "", $is_html);
+            return $this->add_field(sanitize_key($text) . time() . uniqid() . $count, $text, 'plain_text', null, "", $is_html);
 
-		}			
+        }			
 
-		function helper_metabox_top($name) {
+        function helper_metabox_top($name) {
 
-			return '
+            return '
 			<style type="text/css">
 				.wpallimport-plugin .wpallimport-addon div.input {
 					margin-bottom: 15px;
@@ -872,11 +872,11 @@ 
 							<table class="form-table" style="max-width:none;">
 								<tr>
 									<td colspan="3">';
-		}
+        }
 
-		function helper_metabox_bottom() {
+        function helper_metabox_bottom() {
 
-			return '				</td>
+            return '				</td>
 								</tr>
 							</table>
 						</div>
@@ -884,298 +884,298 @@ 
 				</div>
 			</div>';
 
-		}
+        }
 
-		/**
-		*
-		* simply add an additional section for attachments
-		*
-		*/
-		function import_files( $slug, $title, $callback = NULL ){
-			$this->import_images( $slug, $title, 'files', $callback);
-		}
+        /**
+         *
+         * simply add an additional section for attachments
+         *
+         */
+        function import_files( $slug, $title, $callback = NULL ){
+            $this->import_images( $slug, $title, 'files', $callback);
+        }
 
-		/**
-		*
-		* simply add an additional section 
-		*
-		*/
-		function import_images( $slug, $title, $type = 'images', $callback = NULL ){
+        /**
+         *
+         * simply add an additional section 
+         *
+         */
+        function import_images( $slug, $title, $type = 'images', $callback = NULL ){
 			
-			if ( empty($title) or empty($slug) ) return;
+            if ( empty($title) or empty($slug) ) return;
 
-			if (is_array($slug)) {
+            if (is_array($slug)) {
                 $section_slug = 'pmxi_' . md5(serialize($slug));
             } else {
                 $section_slug = 'pmxi_' . $slug;
             }
 
-			$this->image_sections[] = array(
-				'title' => $title,
-				'slug'  => $section_slug,
-				'type'  => $type
-			);			
+            $this->image_sections[] = array(
+                'title' => $title,
+                'slug'  => $section_slug,
+                'type'  => $type
+            );			
 			
-			foreach ($this->image_options as $option_slug => $value) {
-				$this->add_option($section_slug . $option_slug, $value);
-			}
+            foreach ($this->image_options as $option_slug => $value) {
+                $this->add_option($section_slug . $option_slug, $value);
+            }
 
-			if (count($this->image_sections) > 1){
-				add_filter('wp_all_import_is_show_add_new_images', array($this, 'filter_is_show_add_new_images'), 10, 2);
-			}
+            if (count($this->image_sections) > 1){
+                add_filter('wp_all_import_is_show_add_new_images', array($this, 'filter_is_show_add_new_images'), 10, 2);
+            }
 
-			add_filter('wp_all_import_is_allow_import_images', array($this, 'is_allow_import_images'), 10, 2);			
+            add_filter('wp_all_import_is_allow_import_images', array($this, 'is_allow_import_images'), 10, 2);			
 
-			if ($callback && is_callable($callback)) {
+            if ($callback && is_callable($callback)) {
                 add_action( $section_slug, $callback, 10, 4);
             } else {
                 if (function_exists($slug)) {
                     add_action( $section_slug, $slug, 10, 4);
                 }
             }
-		}			
-			/**
-			*
-			* filter to allow import images for free edition of WP All Import
-			*
-			*/
-			function is_allow_import_images($is_allow, $post_type){
-				return ($this->is_active_addon($post_type)) ? true : $is_allow;
-			}
-
-		/**
-		*
-		* filter to control additional images sections
-		*
-		*/
-		function additional_sections($sections){
-			if ( ! empty($this->image_sections) ){
-				foreach ($this->image_sections as $add_section) {
-					$sections[] = $add_section;
-				}
-			}
+        }			
+            /**
+             *
+             * filter to allow import images for free edition of WP All Import
+             *
+             */
+            function is_allow_import_images($is_allow, $post_type){
+                return ($this->is_active_addon($post_type)) ? true : $is_allow;
+            }
+
+        /**
+         *
+         * filter to control additional images sections
+         *
+         */
+        function additional_sections($sections){
+            if ( ! empty($this->image_sections) ){
+                foreach ($this->image_sections as $add_section) {
+                    $sections[] = $add_section;
+                }
+            }
 			
-			return $sections;
-		}
-			/**
-			*
-			* remove the 'Don't touch existing images, append new images' when more than one image section is in use.
-			*
-			*/
-			function filter_is_show_add_new_images($is_show, $post_type){
-				return ($this->is_active_addon($post_type)) ? false : $is_show;
-			}
-
-		/**
-		*
-		* disable the default images section
-		*
-		*/		
-		function disable_default_images($post_type = false){
+            return $sections;
+        }
+            /**
+             *
+             * remove the 'Don't touch existing images, append new images' when more than one image section is in use.
+             *
+             */
+            function filter_is_show_add_new_images($is_show, $post_type){
+                return ($this->is_active_addon($post_type)) ? false : $is_show;
+            }
+
+        /**
+         *
+         * disable the default images section
+         *
+         */		
+        function disable_default_images($post_type = false){
 									
-			add_filter('wp_all_import_is_images_section_enabled', array($this, 'is_enable_default_images_section'), 10, 2);
+            add_filter('wp_all_import_is_images_section_enabled', array($this, 'is_enable_default_images_section'), 10, 2);
 
-		}
-			function is_enable_default_images_section($is_enabled, $post_type){						
+        }
+            function is_enable_default_images_section($is_enabled, $post_type){						
 				
-				return ($this->is_active_addon($post_type)) ? false : true;
+                return ($this->is_active_addon($post_type)) ? false : true;
 								
-			}
+            }
 
-		function helper_parse($parsingData, $options) {
+        function helper_parse($parsingData, $options) {
 
-			extract($parsingData);
+            extract($parsingData);
 
-			$data = array(); // parsed data
+            $data = array(); // parsed data
 
-			if ( ! empty($import->options[$this->slug])){
+            if ( ! empty($import->options[$this->slug])){
 
-				$this->logger = $parsingData['logger'];
+                $this->logger = $parsingData['logger'];
 
-				$cxpath = $xpath_prefix . $import->xpath;
+                $cxpath = $xpath_prefix . $import->xpath;
 
-				$tmp_files = array();
+                $tmp_files = array();
 
-				foreach ($options[$this->slug] as $option_name => $option_value) {					
-					if ( isset($import->options[$this->slug][$option_name]) and $import->options[$this->slug][$option_name] != '') {						
-						if ($import->options[$this->slug][$option_name] == "xpath") {
-							if ($import->options[$this->slug]['xpaths'][$option_name] == ""){
-								$count and $data[$option_name] = array_fill(0, $count, "");
-							} else {
-								$data[$option_name] = XmlImportParser::factory($xml, $cxpath, (string) $import->options[$this->slug]['xpaths'][$option_name], $file)->parse();
-								$tmp_files[] = $file;						
-							}
-						} 
-						else {							
-							$data[$option_name] = XmlImportParser::factory($xml, $cxpath, (string) $import->options[$this->slug][$option_name], $file)->parse();
-							$tmp_files[] = $file;
-						}
+                foreach ($options[$this->slug] as $option_name => $option_value) {					
+                    if ( isset($import->options[$this->slug][$option_name]) and $import->options[$this->slug][$option_name] != '') {						
+                        if ($import->options[$this->slug][$option_name] == "xpath") {
+                            if ($import->options[$this->slug]['xpaths'][$option_name] == ""){
+                                $count and $data[$option_name] = array_fill(0, $count, "");
+                            } else {
+                                $data[$option_name] = XmlImportParser::factory($xml, $cxpath, (string) $import->options[$this->slug]['xpaths'][$option_name], $file)->parse();
+                                $tmp_files[] = $file;						
+                            }
+                        } 
+                        else {							
+                            $data[$option_name] = XmlImportParser::factory($xml, $cxpath, (string) $import->options[$this->slug][$option_name], $file)->parse();
+                            $tmp_files[] = $file;
+                        }
 
 
-					} else {
-						$data[$option_name] = array_fill(0, $count, "");
-					}
+                    } else {
+                        $data[$option_name] = array_fill(0, $count, "");
+                    }
 
-				}
+                }
 
-				foreach ($tmp_files as $file) { // remove all temporary files created
-					unlink($file);
-				}
+                foreach ($tmp_files as $file) { // remove all temporary files created
+                    unlink($file);
+                }
 
-			}
+            }
 
-			return $data;
-		}
+            return $data;
+        }
 
 
-		function can_update_meta($meta_key, $import_options) {
+        function can_update_meta($meta_key, $import_options) {
 
-			//echo "<pre>";
-			//print_r($import_options['options']);
-			//echo "</pre>";
+            //echo "<pre>";
+            //print_r($import_options['options']);
+            //echo "</pre>";
 			
-			$import_options = $import_options['options'];
+            $import_options = $import_options['options'];
 
-			if ($import_options['update_all_data'] == 'yes') return true;
+            if ($import_options['update_all_data'] == 'yes') return true;
 
-			if ( ! $import_options['is_update_custom_fields'] ) return false;			
+            if ( ! $import_options['is_update_custom_fields'] ) return false;			
 
-			if ($import_options['update_custom_fields_logic'] == "full_update") return true;
-			if ($import_options['update_custom_fields_logic'] == "only" and ! empty($import_options['custom_fields_list']) and is_array($import_options['custom_fields_list']) and in_array($meta_key, $import_options['custom_fields_list']) ) return true;
-			if ($import_options['update_custom_fields_logic'] == "all_except" and ( empty($import_options['custom_fields_list']) or ! in_array($meta_key, $import_options['custom_fields_list']) )) return true;
+            if ($import_options['update_custom_fields_logic'] == "full_update") return true;
+            if ($import_options['update_custom_fields_logic'] == "only" and ! empty($import_options['custom_fields_list']) and is_array($import_options['custom_fields_list']) and in_array($meta_key, $import_options['custom_fields_list']) ) return true;
+            if ($import_options['update_custom_fields_logic'] == "all_except" and ( empty($import_options['custom_fields_list']) or ! in_array($meta_key, $import_options['custom_fields_list']) )) return true;
 
-			return false;
+            return false;
 
-		}
+        }
 
-		function can_update_taxonomy($tax_name, $import_options) {
+        function can_update_taxonomy($tax_name, $import_options) {
 
-			//echo "<pre>";
-			//print_r($import_options['options']);
-			//echo "</pre>";
+            //echo "<pre>";
+            //print_r($import_options['options']);
+            //echo "</pre>";
 			
-			$import_options = $import_options['options'];
+            $import_options = $import_options['options'];
 
-			if ($import_options['update_all_data'] == 'yes') return true;
+            if ($import_options['update_all_data'] == 'yes') return true;
 
-			if ( ! $import_options['is_update_categories'] ) return false;			
+            if ( ! $import_options['is_update_categories'] ) return false;			
 
-			if ($import_options['update_categories_logic'] == "full_update") return true;
-			if ($import_options['update_categories_logic'] == "only" and ! empty($import_options['taxonomies_list']) and is_array($import_options['taxonomies_list']) and in_array($tax_name, $import_options['taxonomies_list']) ) return true;
-			if ($import_options['update_categories_logic'] == "all_except" and ( empty($import_options['taxonomies_list']) or ! in_array($tax_name, $import_options['taxonomies_list']) )) return true;
+            if ($import_options['update_categories_logic'] == "full_update") return true;
+            if ($import_options['update_categories_logic'] == "only" and ! empty($import_options['taxonomies_list']) and is_array($import_options['taxonomies_list']) and in_array($tax_name, $import_options['taxonomies_list']) ) return true;
+            if ($import_options['update_categories_logic'] == "all_except" and ( empty($import_options['taxonomies_list']) or ! in_array($tax_name, $import_options['taxonomies_list']) )) return true;
 
-			return false;
+            return false;
 
-		}
+        }
 
-		function can_update_image($import_options) {
+        function can_update_image($import_options) {
 
-			$import_options = $import_options['options'];
+            $import_options = $import_options['options'];
 
-			if ($import_options['update_all_data'] == 'yes') return true;
+            if ($import_options['update_all_data'] == 'yes') return true;
 
-			if (!$import_options['is_update_images']) return false;			
+            if (!$import_options['is_update_images']) return false;			
 
-			if ($import_options['is_update_images']) return true;			
+            if ($import_options['is_update_images']) return true;			
 
-			return false;
-		}
+            return false;
+        }
 
 
-		function admin_notice_ignore() {
-			if (isset($_GET[$this->slug.'_ignore']) && '0' == $_GET[$this->slug.'_ignore'] ) {
-				update_option($this->slug.'_ignore', 'true');
-			}
-		}
+        function admin_notice_ignore() {
+            if (isset($_GET[$this->slug.'_ignore']) && '0' == $_GET[$this->slug.'_ignore'] ) {
+                update_option($this->slug.'_ignore', 'true');
+            }
+        }
 
-		function display_admin_notice() {
+        function display_admin_notice() {
 
 
-			if ($this->notice_text) {
-				$notice_text = $this->notice_text;
-			} else {
-				$notice_text = $this->name.' requires WP All Import <a href="http://www.wpallimport.com/" target="_blank">Pro</a> or <a href="http://wordpress.org/plugins/wp-all-import" target="_blank">Free</a>.';
-			}
+            if ($this->notice_text) {
+                $notice_text = $this->notice_text;
+            } else {
+                $notice_text = $this->name.' requires WP All Import <a href="http://www.wpallimport.com/" target="_blank">Pro</a> or <a href="http://wordpress.org/plugins/wp-all-import" target="_blank">Free</a>.';
+            }
 
-			if (!get_option(sanitize_key($this->slug).'_notice_ignore')) {
+            if (!get_option(sanitize_key($this->slug).'_notice_ignore')) {
 
-				?>
+                ?>
 
 	    		<div class="error notice is-dismissible wpallimport-dismissible" style="margin-top: 10px;" rel="<?php echo esc_attr($this->slug); ?>">
 	    		    <p><?php echo wp_kses_post(__(
-		    		    	sprintf(
-	    			    		$notice_text,
-	    			    		'?'.$this->slug.'_ignore=0'
-	    			    	), 
-	    		    		'rapid_addon_'.$this->slug
-	    		    	)); ?></p>
+                            sprintf(
+                                $notice_text,
+                                '?'.$this->slug.'_ignore=0'
+                            ), 
+                            'rapid_addon_'.$this->slug
+                        )); ?></p>
 			    </div>
 
 				<?php
 
-			}
+            }
 
-		}
+        }
 
-		/*
+        /*
 		*
 		* $conditions - array('themes' => array('Realia'), 'plugins' => array('plugin-directory/plugin-file.php', 'plugin-directory2/plugin-file.php')) 
 		*
 		*/
-		function admin_notice($notice_text = '', $conditions = array()) {
+        function admin_notice($notice_text = '', $conditions = array()) {
 
-			$is_show_notice = false;
+            $is_show_notice = false;
 
-			include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+            include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
 
-			if ( ! class_exists( 'PMXI_Plugin' ) ) {
-				$is_show_notice = true;
-			}
+            if ( ! class_exists( 'PMXI_Plugin' ) ) {
+                $is_show_notice = true;
+            }
 
-			// Supported Themes
-			if ( ! $is_show_notice and ! empty($conditions['themes']) ){
+            // Supported Themes
+            if ( ! $is_show_notice and ! empty($conditions['themes']) ){
 
-				$themeInfo    = wp_get_theme();
-				$parentInfo = $themeInfo->parent();				
-				$currentTheme = $themeInfo->get('Name');
+                $themeInfo    = wp_get_theme();
+                $parentInfo = $themeInfo->parent();				
+                $currentTheme = $themeInfo->get('Name');
 				
-				$is_show_notice = in_array($currentTheme, $conditions['themes']) ? false : true;				
+                $is_show_notice = in_array($currentTheme, $conditions['themes']) ? false : true;				
 
-				if ( $is_show_notice and $parentInfo ){
-					$parent_theme = $parentInfo->get('Name');
-					$is_show_notice = in_array($parent_theme, $conditions['themes']) ? false : true;					
-				}
+                if ( $is_show_notice and $parentInfo ){
+                    $parent_theme = $parentInfo->get('Name');
+                    $is_show_notice = in_array($parent_theme, $conditions['themes']) ? false : true;					
+                }
 
-			}			
+            }			
 
-			// Required Plugins
-			if ( ! $is_show_notice and ! empty($conditions['plugins']) ){				
+            // Required Plugins
+            if ( ! $is_show_notice and ! empty($conditions['plugins']) ){				
 
-				$requires_counter = 0;
-				foreach ($conditions['plugins'] as $plugin) {
-					if ( is_plugin_active($plugin) ) $requires_counter++;
-				}
+                $requires_counter = 0;
+                foreach ($conditions['plugins'] as $plugin) {
+                    if ( is_plugin_active($plugin) ) $requires_counter++;
+                }
 
-				if ($requires_counter != count($conditions['plugins'])){ 					
-					$is_show_notice = true;			
-				}
+                if ($requires_counter != count($conditions['plugins'])){ 					
+                    $is_show_notice = true;			
+                }
 
-			}
+            }
 
-			if ( $is_show_notice ){
+            if ( $is_show_notice ){
 
-				if ( $notice_text != '' ) {
-					$this->notice_text = $notice_text;
-				}
+                if ( $notice_text != '' ) {
+                    $this->notice_text = $notice_text;
+                }
 
-				add_action('admin_notices', array($this, 'display_admin_notice'));
-			}
+                add_action('admin_notices', array($this, 'display_admin_notice'));
+            }
 
-		}
+        }
 
-		function log( $m = false){		
+        function log( $m = false){		
 
-			$m and $this->logger and call_user_func($this->logger, $m);
+            $m and $this->logger and call_user_func($this->logger, $m);
 
         }
         
@@ -1293,5 +1293,5 @@ 
             }
             return $image;
         }
-	}	
+    }	
 }
\ No newline at end of file

templates/invoice/line-item.php

Indentation +62 added lines, -62 removed lines

@@ -26,90 +26,90 @@
 
 				<?php
 
-					// Fires before printing a line item column.
-					do_action( "getpaid_invoice_line_item_before_$column", $item, $invoice );
+                    // Fires before printing a line item column.
+                    do_action( "getpaid_invoice_line_item_before_$column", $item, $invoice );
 
-					// Item name.
-					if ( 'name' === $column ) {
+                    // Item name.
+                    if ( 'name' === $column ) {
 
-						$has_featured_image = has_post_thumbnail( $item->get_id() );
+                        $has_featured_image = has_post_thumbnail( $item->get_id() );
 
-						if ( $has_featured_image ) {
-							echo '<div class="d-flex align-items-center getpaid-form-item-has-featured-image">';
-							echo '<div class="getpaid-form-item-image-container mr-2">';
-							echo get_the_post_thumbnail( $item->get_id(), 'thumbnail', array( 'class' => 'getpaid-form-item-image mb-0' ) );
-							echo '</div>';
-							echo '<div class="getpaid-form-item-name-container">';
-						}
+                        if ( $has_featured_image ) {
+                            echo '<div class="d-flex align-items-center getpaid-form-item-has-featured-image">';
+                            echo '<div class="getpaid-form-item-image-container mr-2">';
+                            echo get_the_post_thumbnail( $item->get_id(), 'thumbnail', array( 'class' => 'getpaid-form-item-image mb-0' ) );
+                            echo '</div>';
+                            echo '<div class="getpaid-form-item-name-container">';
+                        }
 
-						// Display the name.
-						echo '<div class="mb-1">' . esc_html( $item->get_name() ) . '</div>';
+                        // Display the name.
+                        echo '<div class="mb-1">' . esc_html( $item->get_name() ) . '</div>';
 
-						// And an optional description.
-						$description = $item->get_description();
+                        // And an optional description.
+                        $description = $item->get_description();
 
-						if ( ! empty( $description ) ) {
-							echo "<small class='form-text text-muted pr-2 m-0'>" . wp_kses_post( $description ) . '</small>';
-						}
+                        if ( ! empty( $description ) ) {
+                            echo "<small class='form-text text-muted pr-2 m-0'>" . wp_kses_post( $description ) . '</small>';
+                        }
 
-						// Fires before printing the line item actions.
-						do_action( 'getpaid_before_invoice_line_item_actions', $item, $invoice );
+                        // Fires before printing the line item actions.
+                        do_action( 'getpaid_before_invoice_line_item_actions', $item, $invoice );
 
-						$actions = apply_filters( 'getpaid-invoice-page-line-item-actions', array(), $item, $invoice );
+                        $actions = apply_filters( 'getpaid-invoice-page-line-item-actions', array(), $item, $invoice );
 
-						if ( ! empty( $actions ) ) {
+                        if ( ! empty( $actions ) ) {
 
-							$sanitized  = array();
-							foreach ( $actions as $key => $item_action ) {
-								$key         = sanitize_html_class( $key );
-								$item_action = wp_kses_post( $item_action );
-								$sanitized[] = "<span class='$key'>$item_action</span>";
-							}
+                            $sanitized  = array();
+                            foreach ( $actions as $key => $item_action ) {
+                                $key         = sanitize_html_class( $key );
+                                $item_action = wp_kses_post( $item_action );
+                                $sanitized[] = "<span class='$key'>$item_action</span>";
+                            }
 
-							echo "<small class='form-text getpaid-line-item-actions'>";
-							echo wp_kses_post( implode( ' | ', $sanitized ) );
-							echo '</small>';
+                            echo "<small class='form-text getpaid-line-item-actions'>";
+                            echo wp_kses_post( implode( ' | ', $sanitized ) );
+                            echo '</small>';
 
-						}
+                        }
 
-						if ( $has_featured_image ) {
-							echo '</div>';
-							echo '</div>';
-						}
-					}
+                        if ( $has_featured_image ) {
+                            echo '</div>';
+                            echo '</div>';
+                        }
+                    }
 
-					// Item price.
-					if ( 'price' === $column ) {
+                    // Item price.
+                    if ( 'price' === $column ) {
 
-					// Display the item price (or recurring price if this is a renewal invoice)
-					$price = $invoice->is_renewal() ? $item->get_price() : $item->get_initial_price();
-					wpinv_the_price( $price, $invoice->get_currency() );
+                    // Display the item price (or recurring price if this is a renewal invoice)
+                    $price = $invoice->is_renewal() ? $item->get_price() : $item->get_initial_price();
+                    wpinv_the_price( $price, $invoice->get_currency() );
 
-					}
+                    }
 
-					// Tax rate.
-					if ( 'tax_rate' === $column ) {
-					echo floatval( round( getpaid_get_invoice_tax_rate( $invoice, $item ), 2 ) ) . '%';
-					}
+                    // Tax rate.
+                    if ( 'tax_rate' === $column ) {
+                    echo floatval( round( getpaid_get_invoice_tax_rate( $invoice, $item ), 2 ) ) . '%';
+                    }
 
-					// Item quantity.
-					if ( 'quantity' === $column ) {
-					echo (float) $item->get_quantity();
-					}
+                    // Item quantity.
+                    if ( 'quantity' === $column ) {
+                    echo (float) $item->get_quantity();
+                    }
 
-					// Item sub total.
-					if ( 'subtotal' === $column ) {
-					$subtotal = $invoice->is_renewal() ? $item->get_recurring_sub_total() : $item->get_sub_total();
-					wpinv_the_price( $subtotal, $invoice->get_currency() );
-					}
+                    // Item sub total.
+                    if ( 'subtotal' === $column ) {
+                    $subtotal = $invoice->is_renewal() ? $item->get_recurring_sub_total() : $item->get_sub_total();
+                    wpinv_the_price( $subtotal, $invoice->get_currency() );
+                    }
 
-					// Fires when printing a line item column.
-					do_action( "getpaid_invoice_line_item_$column", $item, $invoice );
+                    // Fires when printing a line item column.
+                    do_action( "getpaid_invoice_line_item_$column", $item, $invoice );
 
-					// Fires after printing a line item column.
-					do_action( "getpaid_invoice_line_item_after_$column", $item, $invoice );
+                    // Fires after printing a line item column.
+                    do_action( "getpaid_invoice_line_item_after_$column", $item, $invoice );
 
-				?>
+                ?>
 
 			</div>
 

includes/class-getpaid-tax.php

Indentation +192 added lines, -192 removed lines

@@ -13,199 +13,199 @@
  */
 class GetPaid_Tax {
 
-	/**
-	 * Calculates tax for a line item.
-	 *
-	 * @param  float   $price              The price to calc tax on.
-	 * @param  array   $rates              The rates to apply.
-	 * @param  boolean $price_includes_tax Whether the passed price has taxes included.
-	 * @return array                       Array of tax name => tax amount.
-	 */
-	public static function calc_tax( $price, $rates, $price_includes_tax = false ) {
-
-		if ( $price_includes_tax ) {
-			$taxes = self::calc_inclusive_tax( $price, $rates );
-		} else {
-			$taxes = self::calc_exclusive_tax( $price, $rates );
-		}
-
-		return apply_filters( 'getpaid_calc_tax', $taxes, $price, $rates, $price_includes_tax );
-
-	}
-
-	/**
-	 * Calc tax from inclusive price.
-	 *
-	 * @param  float $price Price to calculate tax for.
-	 * @param  array $rates Array of tax rates.
-	 * @return array
-	 */
-	public static function calc_inclusive_tax( $price, $rates ) {
-		$taxes     = array();
-		$tax_rates = wp_list_pluck( $rates, 'rate', 'name' );
-
-		// Add tax rates.
-		$tax_rate  = 1 + ( array_sum( $tax_rates ) / 100 );
-
-		foreach ( $tax_rates as $name => $rate ) {
-			$the_rate       = ( $rate / 100 ) / $tax_rate;
-			$net_price      = $price - ( $the_rate * $price );
-			$tax_amount     = apply_filters( 'getpaid_price_inc_tax_amount', $price - $net_price, $name, $rate, $price );
-			$taxes[ $name ] = $tax_amount;
-		}
-
-		// Round all taxes to precision (4DP) before passing them back.
-		$taxes = array_map( array( __CLASS__, 'round' ), $taxes );
-
-		return $taxes;
-	}
-
-	/**
-	 * Calc tax from exclusive price.
-	 *
-	 * @param  float $price Price to calculate tax for.
-	 * @param  array $rates Array of tax rates.
-	 * @return array
-	 */
-	public static function calc_exclusive_tax( $price, $rates ) {
-		$taxes     = array();
-		$tax_rates = wp_list_pluck( $rates, 'rate', 'name' );
-
-		foreach ( $tax_rates as $name => $rate ) {
-
-			$tax_amount     = $price * ( $rate / 100 );
-			$taxes[ $name ] = apply_filters( 'getpaid_price_ex_tax_amount', $tax_amount, $name, $rate, $price );
-
-		}
-
-		// Round all taxes to precision (4DP) before passing them back.
-		$taxes = array_map( array( __CLASS__, 'round' ), $taxes );
-
-		return $taxes;
-	}
-
-	/**
-	 * Get's an array of all tax rates.
-	 *
-	 * @return array
-	 */
-	public static function get_all_tax_rates() {
-
-		$rates = get_option( 'wpinv_tax_rates', array() );
-
-		return apply_filters(
-			'getpaid_get_all_tax_rates',
-			array_filter( wpinv_parse_list( $rates ) )
-		);
-
-	}
-
-	/**
-	 * Get's an array of default tax rates.
-	 *
-	 * @return array
-	 */
-	public static function get_default_tax_rates() {
-
-		return apply_filters(
-			'getpaid_get_default_tax_rates',
-			array(
-				array(
-					'country' => wpinv_get_default_country(),
-					'state'   => wpinv_get_default_state(),
-					'global'  => true,
-					'rate'    => wpinv_get_default_tax_rate(),
-					'name'    => __( 'Base Tax', 'invoicing' ),
-				),
-			)
-		);
-
-	}
-
-	/**
-	 * Get's an array of all tax rules.
-	 *
-	 * @return array
-	 */
-	public static function get_all_tax_rules() {
-
-		$rules = get_option(
-			'wpinv_tax_rules',
-			array(
-				array(
-					'key'               => 'physical',
-					'label'             => __( 'Physical Item', 'invoicing' ),
-					'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
-					'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
-				),
-				array(
-					'key'               => 'digital',
-					'label'             => __( 'Digital Item', 'invoicing' ),
-					'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
-					'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
-				),
-        	)
-		);
-
-		return apply_filters(
-			'getpaid_tax_rules',
-			array_filter( array_values( wpinv_parse_list( $rules ) ) )
-		);
-
-	}
-
-	/**
-	 * Get's an array of tax rates for a given address.
-	 *
-	 * @param string $country
-	 * @param string $state
-	 * @return array
-	 */
-	public static function get_address_tax_rates( $country, $state ) {
-
-		$all_tax_rates  = self::get_all_tax_rates();
-		$matching_rates = array_merge(
-			wp_list_filter( $all_tax_rates, array( 'country' => $country ) ),
-			wp_list_filter( $all_tax_rates, array( 'country' => '' ) )
-		);
-
-		foreach ( $matching_rates as $i => $rate ) {
-
-			$states = array_filter( wpinv_clean( explode( ',', strtolower( $rate['state'] ) ) ) );
-			if ( empty( $rate['global'] ) && ! in_array( strtolower( $state ), $states ) ) {
-				unset( $matching_rates[ $i ] );
-			}
+    /**
+     * Calculates tax for a line item.
+     *
+     * @param  float   $price              The price to calc tax on.
+     * @param  array   $rates              The rates to apply.
+     * @param  boolean $price_includes_tax Whether the passed price has taxes included.
+     * @return array                       Array of tax name => tax amount.
+     */
+    public static function calc_tax( $price, $rates, $price_includes_tax = false ) {
+
+        if ( $price_includes_tax ) {
+            $taxes = self::calc_inclusive_tax( $price, $rates );
+        } else {
+            $taxes = self::calc_exclusive_tax( $price, $rates );
+        }
+
+        return apply_filters( 'getpaid_calc_tax', $taxes, $price, $rates, $price_includes_tax );
+
+    }
+
+    /**
+     * Calc tax from inclusive price.
+     *
+     * @param  float $price Price to calculate tax for.
+     * @param  array $rates Array of tax rates.
+     * @return array
+     */
+    public static function calc_inclusive_tax( $price, $rates ) {
+        $taxes     = array();
+        $tax_rates = wp_list_pluck( $rates, 'rate', 'name' );
+
+        // Add tax rates.
+        $tax_rate  = 1 + ( array_sum( $tax_rates ) / 100 );
+
+        foreach ( $tax_rates as $name => $rate ) {
+            $the_rate       = ( $rate / 100 ) / $tax_rate;
+            $net_price      = $price - ( $the_rate * $price );
+            $tax_amount     = apply_filters( 'getpaid_price_inc_tax_amount', $price - $net_price, $name, $rate, $price );
+            $taxes[ $name ] = $tax_amount;
+        }
+
+        // Round all taxes to precision (4DP) before passing them back.
+        $taxes = array_map( array( __CLASS__, 'round' ), $taxes );
+
+        return $taxes;
+    }
+
+    /**
+     * Calc tax from exclusive price.
+     *
+     * @param  float $price Price to calculate tax for.
+     * @param  array $rates Array of tax rates.
+     * @return array
+     */
+    public static function calc_exclusive_tax( $price, $rates ) {
+        $taxes     = array();
+        $tax_rates = wp_list_pluck( $rates, 'rate', 'name' );
+
+        foreach ( $tax_rates as $name => $rate ) {
+
+            $tax_amount     = $price * ( $rate / 100 );
+            $taxes[ $name ] = apply_filters( 'getpaid_price_ex_tax_amount', $tax_amount, $name, $rate, $price );
+
+        }
+
+        // Round all taxes to precision (4DP) before passing them back.
+        $taxes = array_map( array( __CLASS__, 'round' ), $taxes );
+
+        return $taxes;
+    }
+
+    /**
+     * Get's an array of all tax rates.
+     *
+     * @return array
+     */
+    public static function get_all_tax_rates() {
+
+        $rates = get_option( 'wpinv_tax_rates', array() );
+
+        return apply_filters(
+            'getpaid_get_all_tax_rates',
+            array_filter( wpinv_parse_list( $rates ) )
+        );
+
+    }
+
+    /**
+     * Get's an array of default tax rates.
+     *
+     * @return array
+     */
+    public static function get_default_tax_rates() {
+
+        return apply_filters(
+            'getpaid_get_default_tax_rates',
+            array(
+                array(
+                    'country' => wpinv_get_default_country(),
+                    'state'   => wpinv_get_default_state(),
+                    'global'  => true,
+                    'rate'    => wpinv_get_default_tax_rate(),
+                    'name'    => __( 'Base Tax', 'invoicing' ),
+                ),
+            )
+        );
+
+    }
+
+    /**
+     * Get's an array of all tax rules.
+     *
+     * @return array
+     */
+    public static function get_all_tax_rules() {
+
+        $rules = get_option(
+            'wpinv_tax_rules',
+            array(
+                array(
+                    'key'               => 'physical',
+                    'label'             => __( 'Physical Item', 'invoicing' ),
+                    'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
+                    'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
+                ),
+                array(
+                    'key'               => 'digital',
+                    'label'             => __( 'Digital Item', 'invoicing' ),
+                    'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
+                    'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
+                ),
+            )
+        );
+
+        return apply_filters(
+            'getpaid_tax_rules',
+            array_filter( array_values( wpinv_parse_list( $rules ) ) )
+        );
+
+    }
+
+    /**
+     * Get's an array of tax rates for a given address.
+     *
+     * @param string $country
+     * @param string $state
+     * @return array
+     */
+    public static function get_address_tax_rates( $country, $state ) {
+
+        $all_tax_rates  = self::get_all_tax_rates();
+        $matching_rates = array_merge(
+            wp_list_filter( $all_tax_rates, array( 'country' => $country ) ),
+            wp_list_filter( $all_tax_rates, array( 'country' => '' ) )
+        );
+
+        foreach ( $matching_rates as $i => $rate ) {
+
+            $states = array_filter( wpinv_clean( explode( ',', strtolower( $rate['state'] ) ) ) );
+            if ( empty( $rate['global'] ) && ! in_array( strtolower( $state ), $states ) ) {
+                unset( $matching_rates[ $i ] );
+            }
 }
 
-		return apply_filters( 'getpaid_get_address_tax_rates', $matching_rates, $country, $state );
-
-	}
-
-	/**
-	 * Sums a set of taxes to form a single total. Result is rounded to precision.
-	 *
-	 * @param  array $taxes Array of taxes.
-	 * @return float
-	 */
-	public static function get_tax_total( $taxes ) {
-		return self::round( array_sum( $taxes ) );
-	}
-
-	/**
-	 * Round to precision.
-	 *
-	 * Filter example: to return rounding to .5 cents you'd use:
-	 *
-	 * function euro_5cent_rounding( $in ) {
-	 *      return round( $in / 5, 2 ) * 5;
-	 * }
-	 * add_filter( 'getpaid_tax_round', 'euro_5cent_rounding' );
-	 *
-	 * @param float|int $in Value to round.
-	 * @return float
-	 */
-	public static function round( $in ) {
-		return apply_filters( 'getpaid_tax_round', round( $in, 4 ), $in );
-	}
+        return apply_filters( 'getpaid_get_address_tax_rates', $matching_rates, $country, $state );
+
+    }
+
+    /**
+     * Sums a set of taxes to form a single total. Result is rounded to precision.
+     *
+     * @param  array $taxes Array of taxes.
+     * @return float
+     */
+    public static function get_tax_total( $taxes ) {
+        return self::round( array_sum( $taxes ) );
+    }
+
+    /**
+     * Round to precision.
+     *
+     * Filter example: to return rounding to .5 cents you'd use:
+     *
+     * function euro_5cent_rounding( $in ) {
+     *      return round( $in / 5, 2 ) * 5;
+     * }
+     * add_filter( 'getpaid_tax_round', 'euro_5cent_rounding' );
+     *
+     * @param float|int $in Value to round.
+     * @return float
+     */
+    public static function round( $in ) {
+        return apply_filters( 'getpaid_tax_round', round( $in, 4 ), $in );
+    }
 
 }

includes/admin/views/html-tax-rules-edit.php

Indentation +2 added lines, -2 removed lines

@@ -8,8 +8,8 @@
 
 $dummy_rule = array(
     'key'               => 'TAX_RULE_KEY',
-	'label'             => __( 'New Tax Rule', 'invoicing' ),
-	'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
+    'label'             => __( 'New Tax Rule', 'invoicing' ),
+    'tax_base'          => wpinv_get_option( 'tax_base', 'billing' ),
     'same_country_rule' => wpinv_get_option( 'vat_same_country_rule', 'vat_too' ),
 );
 

includes/user-functions.php

Indentation +73 added lines, -73 removed lines

@@ -34,11 +34,11 @@ 
  */
 function wpinv_get_capability( $capalibilty = 'manage_invoicing' ) {
 
-	if ( current_user_can( 'manage_options' ) ) {
-		return 'manage_options';
-	};
+    if ( current_user_can( 'manage_options' ) ) {
+        return 'manage_options';
+    };
 
-	return $capalibilty;
+    return $capalibilty;
 }
 
 /**
@@ -62,10 +62,10 @@ 
     // Prepare user values.
     $prefix = preg_replace( '/\s+/', '', $prefix );
     $prefix = empty( $prefix ) ? $email : $prefix;
-	$args   = array(
-		'user_login' => wpinv_generate_user_name( $prefix ),
-		'user_pass'  => wp_generate_password(),
-		'user_email' => $email,
+    $args   = array(
+        'user_login' => wpinv_generate_user_name( $prefix ),
+        'user_pass'  => wp_generate_password(),
+        'user_email' => $email,
         'role'       => 'subscriber',
     );
 
@@ -82,16 +82,16 @@ 
 function wpinv_generate_user_name( $prefix = '' ) {
 
     // If prefix is an email, retrieve the part before the email.
-	$prefix = strtok( $prefix, '@' );
+    $prefix = strtok( $prefix, '@' );
     $prefix = trim( $prefix, '.' );
 
-	// Sanitize the username.
-	$prefix = sanitize_user( $prefix, true );
+    // Sanitize the username.
+    $prefix = sanitize_user( $prefix, true );
 
-	$illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
-	if ( empty( $prefix ) || in_array( strtolower( $prefix ), array_map( 'strtolower', $illegal_logins ), true ) ) {
-		$prefix = 'gtp_' . zeroise( wp_rand( 0, 9999 ), 4 );
-	}
+    $illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
+    if ( empty( $prefix ) || in_array( strtolower( $prefix ), array_map( 'strtolower', $illegal_logins ), true ) ) {
+        $prefix = 'gtp_' . zeroise( wp_rand( 0, 9999 ), 4 );
+    }
 
     $username = $prefix;
     $postfix  = 2;
@@ -220,43 +220,43 @@ 
 
                     foreach ( getpaid_user_address_fields() as $key => $label ) {
 
-					// Display the country.
-					if ( 'country' == $key ) {
-
-						aui()->select(
-							array(
-								'options'     => wpinv_get_country_list(),
-								'name'        => 'getpaid_address[' . esc_attr( $key ) . ']',
-								'id'          => 'wpinv-' . sanitize_html_class( $key ),
-								'value'       => sanitize_text_field( getpaid_get_user_address_field( get_current_user_id(), $key ) ),
-								'placeholder' => $label,
-								'label'       => wp_kses_post( $label ),
-								'label_type'  => 'vertical',
-								'class'       => 'getpaid-address-field',
+                    // Display the country.
+                    if ( 'country' == $key ) {
+
+                        aui()->select(
+                            array(
+                                'options'     => wpinv_get_country_list(),
+                                'name'        => 'getpaid_address[' . esc_attr( $key ) . ']',
+                                'id'          => 'wpinv-' . sanitize_html_class( $key ),
+                                'value'       => sanitize_text_field( getpaid_get_user_address_field( get_current_user_id(), $key ) ),
+                                'placeholder' => $label,
+                                'label'       => wp_kses_post( $label ),
+                                'label_type'  => 'vertical',
+                                'class'       => 'getpaid-address-field',
                             ),
                             true
-						);
-
-					}
-
-					// Display the state.
-					elseif ( 'state' == $key ) {
-
-						getpaid_get_states_select_markup(
-							getpaid_get_user_address_field( get_current_user_id(), 'country' ),
-							getpaid_get_user_address_field( get_current_user_id(), 'state' ),
-							$label,
-							$label,
-							'',
-							false,
-							'',
-							'getpaid_address[' . esc_attr( $key ) . ']',
+                        );
+
+                    }
+
+                    // Display the state.
+                    elseif ( 'state' == $key ) {
+
+                        getpaid_get_states_select_markup(
+                            getpaid_get_user_address_field( get_current_user_id(), 'country' ),
+                            getpaid_get_user_address_field( get_current_user_id(), 'state' ),
+                            $label,
+                            $label,
+                            '',
+                            false,
+                            '',
+                            'getpaid_address[' . esc_attr( $key ) . ']',
                             true
-						);
+                        );
 
                         } else {
 
-						aui()->input(
+                        aui()->input(
                             array(
                                 'name'        => 'getpaid_address[' . esc_attr( $key ) . ']',
                                 'id'          => 'wpinv-' . sanitize_html_class( $key ),
@@ -268,7 +268,7 @@ 
                                 'class'       => 'getpaid-address-field',
                             ),
                             true
-						);
+                        );
 
                         }
                     }
@@ -407,7 +407,7 @@ 
 function getpaid_allowed_html() {
     $allowed_html = wp_kses_allowed_html( 'post' );
 
-	// form fields
+    // form fields
     $allowed_html['form'] = array(
         'action'         => true,
         'accept'         => true,
@@ -419,12 +419,12 @@ 
     );
 
     // - input
-	$allowed_html['input'] = array(
-		'class'        => array(),
-		'id'           => array(),
-		'name'         => array(),
-		'value'        => array(),
-		'type'         => array(),
+    $allowed_html['input'] = array(
+        'class'        => array(),
+        'id'           => array(),
+        'name'         => array(),
+        'value'        => array(),
+        'type'         => array(),
         'placeholder'  => array(),
         'autocomplete' => array(),
         'autofocus'    => array(),
@@ -438,33 +438,33 @@ 
         'max'          => array(),
         'step'         => array(),
         'size'         => array(),
-	);
+    );
 
     // - input
-	$allowed_html['textarea'] = array(
-		'class' => array(),
-		'id'    => array(),
-		'name'  => array(),
-		'value' => array(),
-	);
-
-	// select
-	$allowed_html['select'] = array(
-		'class'        => array(),
-		'id'           => array(),
-		'name'         => array(),
+    $allowed_html['textarea'] = array(
+        'class' => array(),
+        'id'    => array(),
+        'name'  => array(),
+        'value' => array(),
+    );
+
+    // select
+    $allowed_html['select'] = array(
+        'class'        => array(),
+        'id'           => array(),
+        'name'         => array(),
         'autocomplete' => array(),
         'multiple'     => array(),
-	);
+    );
 
-	// select options
-	$allowed_html['option'] = array(
-		'selected' => array(),
+    // select options
+    $allowed_html['option'] = array(
+        'selected' => array(),
         'disabled' => array(),
         'value'    => array(),
-	);
+    );
 
-	return $allowed_html;
+    return $allowed_html;
 
 }
 

templates/payment-forms/embed.php

Indentation +39 added lines, -39 removed lines

@@ -1,32 +1,32 @@ 
 <?php
 
-	// Is the request set up correctly?
-	if ( empty( $_GET['form'] ) && empty( $_GET['item'] ) ) {
-		return aui()->alert(
-			array(
-				'type'    => 'warning',
-				'content' => __( 'No payment form or item selected', 'invoicing' ),
-			)
-		);
-		wp_die( esc_html__( 'No payment form or item selected', 'invoicing' ), 400 );
-	}
-
-	// Payment form or button?
-	if ( ! empty( $_GET['form'] ) ) {
-
-		$shortcode = sprintf(
-			'[getpaid form=%s]',
-			(int) $_GET['form']
-		);
-
-	} else {
-
-		$shortcode = sprintf(
-			'[getpaid item=%s]',
-			esc_attr( urldecode( $_GET['item'] ) )
-		);
-
-	}
+    // Is the request set up correctly?
+    if ( empty( $_GET['form'] ) && empty( $_GET['item'] ) ) {
+        return aui()->alert(
+            array(
+                'type'    => 'warning',
+                'content' => __( 'No payment form or item selected', 'invoicing' ),
+            )
+        );
+        wp_die( esc_html__( 'No payment form or item selected', 'invoicing' ), 400 );
+    }
+
+    // Payment form or button?
+    if ( ! empty( $_GET['form'] ) ) {
+
+        $shortcode = sprintf(
+            '[getpaid form=%s]',
+            (int) $_GET['form']
+        );
+
+    } else {
+
+        $shortcode = sprintf(
+            '[getpaid item=%s]',
+            esc_attr( urldecode( $_GET['item'] ) )
+        );
+
+    }
 
 ?>
 
@@ -44,13 +44,13 @@ 
 
         <title><?php echo esc_html( get_bloginfo( 'name' ) ); ?></title>
 		<?php
-			wp_enqueue_scripts();
-			wp_print_styles();
-			wp_print_head_scripts();
-			wp_custom_css_cb();
-			wpinv_get_template( 'frontend-head.php' );
-			wp_site_icon();
-		?>
+            wp_enqueue_scripts();
+            wp_print_styles();
+            wp_print_head_scripts();
+            wp_custom_css_cb();
+            wpinv_get_template( 'frontend-head.php' );
+            wp_site_icon();
+        ?>
 
 		<style type="text/css">
 			.body{ 
@@ -84,11 +84,11 @@ 
 	<body class="body page-template-default page">
 		<div id="getpaid-form-embed" class="container my-5 page type-page status-publish hentry post post-content">
 			<?php
-				do_action( 'getpaid_payment_form_embed_top' );
-				echo do_shortcode( $shortcode );
-				do_action( 'getpaid_payment_form_embed_bottom' );
-				wpinv_get_template( 'frontend-footer.php' );
-			?>
+                do_action( 'getpaid_payment_form_embed_top' );
+                echo do_shortcode( $shortcode );
+                do_action( 'getpaid_payment_form_embed_bottom' );
+                wpinv_get_template( 'frontend-footer.php' );
+            ?>
 		</div>
 		<?php wp_footer(); ?>
 	</body>

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

Indentation +37 added lines, -37 removed lines

@@ -13,30 +13,30 @@ 
 class GetPaid_Manual_Gateway extends GetPaid_Payment_Gateway {
 
     /**
-	 * Payment method id.
-	 *
-	 * @var string
-	 */
+     * Payment method id.
+     *
+     * @var string
+     */
     public $id = 'manual';
 
     /**
-	 * An array of features that this gateway supports.
-	 *
-	 * @var array
-	 */
+     * An array of features that this gateway supports.
+     *
+     * @var array
+     */
     protected $supports = array( 'subscription', 'addons', 'single_subscription_group', 'multiple_subscription_groups' );
 
     /**
-	 * Payment method order.
-	 *
-	 * @var int
-	 */
-	public $order = 11;
+     * Payment method order.
+     *
+     * @var int
+     */
+    public $order = 11;
 
     /**
-	 * Class constructor.
-	 */
-	public function __construct() {
+     * Class constructor.
+     */
+    public function __construct() {
         parent::__construct();
 
         $this->title        = __( 'Test Gateway', 'invoicing' );
@@ -46,15 +46,15 @@ 
     }
 
     /**
-	 * Process Payment.
-	 *
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @param array $submission_data Posted checkout fields.
-	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
-	 * @return array
-	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+     * Process Payment.
+     *
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @param array $submission_data Posted checkout fields.
+     * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
+     * @return array
+     */
+    public function process_payment( $invoice, $submission_data, $submission ) {
 
         // Mark it as paid.
         $invoice->mark_paid();
@@ -84,12 +84,12 @@ 
     }
 
     /**
-	 * (Maybe) renews a manual subscription profile.
-	 *
-	 *
+     * (Maybe) renews a manual subscription profile.
+     *
+     *
      * @param WPInv_Subscription $subscription
-	 */
-	public function maybe_renew_subscription( $subscription ) {
+     */
+    public function maybe_renew_subscription( $subscription ) {
 
         // Ensure its our subscription && it's active.
         if ( $this->id === $subscription->get_gateway() && $subscription->has_status( 'active trialling' ) ) {
@@ -109,13 +109,13 @@ 
     }
 
     /**
-	 * Processes invoice addons.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param GetPaid_Form_Item[] $items
-	 * @return WPInv_Invoice
-	 */
-	public function process_addons( $invoice, $items ) {
+     * Processes invoice addons.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param GetPaid_Form_Item[] $items
+     * @return WPInv_Invoice
+     */
+    public function process_addons( $invoice, $items ) {
 
         foreach ( $items as $item ) {
             $invoice->add_item( $item );