AyeCode / invoicing

widgets/subscriptions.php

Indentation +15 added lines, -15 removed lines

@@ -46,25 +46,25 @@
         parent::__construct( $options );
     }
 
-	/**
-	 * The Super block output function.
-	 *
-	 * @param array $args
-	 * @param array $widget_args
-	 * @param string $content
-	 *
-	 * @return mixed|string|bool
-	 */
+    /**
+     * The Super block output function.
+     *
+     * @param array $args
+     * @param array $widget_args
+     * @param string $content
+     *
+     * @return mixed|string|bool
+     */
     public function output( $args = array(), $widget_args = array(), $content = '' ) {
 
-	    ob_start();
+        ob_start();
 
-	    do_action( 'wpinv_before_user_subscriptions' );
-	    wpinv_get_template_part( 'wpinv-subscriptions-history' );
-	    do_action( 'wpinv_after_user_subscriptions' );
+        do_action( 'wpinv_before_user_subscriptions' );
+        wpinv_get_template_part( 'wpinv-subscriptions-history' );
+        do_action( 'wpinv_after_user_subscriptions' );
 
-	    $output = ob_get_clean();
-	    return trim($output);
+        $output = ob_get_clean();
+        return trim($output);
 
     }
 

widgets/invoice-receipt.php

Indentation +15 added lines, -15 removed lines

@@ -44,25 +44,25 @@
         parent::__construct( $options );
     }
 
-	/**
-	 * The Super block output function.
-	 *
-	 * @param array $args
-	 * @param array $widget_args
-	 * @param string $content
-	 *
-	 * @return mixed|string|bool
-	 */
+    /**
+     * The Super block output function.
+     *
+     * @param array $args
+     * @param array $widget_args
+     * @param string $content
+     *
+     * @return mixed|string|bool
+     */
     public function output( $args = array(), $widget_args = array(), $content = '' ) {
 
-	    ob_start();
+        ob_start();
 
-	    do_action( 'wpinv_success_content_before' );
-	    echo wpinv_payment_receipt( $args );
-	    do_action( 'wpinv_success_content_after' );
+        do_action( 'wpinv_success_content_before' );
+        echo wpinv_payment_receipt( $args );
+        do_action( 'wpinv_success_content_after' );
 
-	    $output = ob_get_clean();
-	    return trim($output);
+        $output = ob_get_clean();
+        return trim($output);
 
     }
 

includes/admin/register-settings.php

Indentation +328 added lines, -328 removed lines

@@ -984,326 +984,326 @@ 
 }
 
 function wpinv_get_pages( $with_slug = false, $default_label = NULL ) {
-	$pages_options = array();
+    $pages_options = array();
 
-	if( $default_label !== NULL && $default_label !== false ) {
-		$pages_options = array( '' => $default_label ); // Blank option
-	}
+    if( $default_label !== NULL && $default_label !== false ) {
+        $pages_options = array( '' => $default_label ); // Blank option
+    }
 
-	$pages = get_pages();
-	if ( $pages ) {
-		foreach ( $pages as $page ) {
-			$title = $with_slug ? $page->post_title . ' (' . $page->post_name . ')' : $page->post_title;
+    $pages = get_pages();
+    if ( $pages ) {
+        foreach ( $pages as $page ) {
+            $title = $with_slug ? $page->post_title . ' (' . $page->post_name . ')' : $page->post_title;
             $pages_options[ $page->ID ] = $title;
-		}
-	}
+        }
+    }
 
-	return $pages_options;
+    return $pages_options;
 }
 
 function wpinv_header_callback( $args ) {
-	if ( !empty( $args['desc'] ) ) {
+    if ( !empty( $args['desc'] ) ) {
         echo $args['desc'];
     }
 }
 
 function wpinv_hidden_callback( $args ) {
-	global $wpinv_options;
-
-	if ( isset( $args['set_value'] ) ) {
-		$value = $args['set_value'];
-	} elseif ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
-
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
-		$args['readonly'] = true;
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-		$name  = '';
-	} else {
-		$name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
-	}
-
-	$html = '<input type="hidden" id="wpinv_settings[' . wpinv_sanitize_key( $args['id'] ) . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '" />';
+    global $wpinv_options;
+
+    if ( isset( $args['set_value'] ) ) {
+        $value = $args['set_value'];
+    } elseif ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
+
+    if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+        $args['readonly'] = true;
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+        $name  = '';
+    } else {
+        $name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
+    }
+
+    $html = '<input type="hidden" id="wpinv_settings[' . wpinv_sanitize_key( $args['id'] ) . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '" />';
     
-	echo $html;
+    echo $html;
 }
 
 function wpinv_checkbox_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
-		$name = '';
-	} else {
-		$name = 'name="wpinv_settings[' . $sanitize_id . ']"';
-	}
+    if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+        $name = '';
+    } else {
+        $name = 'name="wpinv_settings[' . $sanitize_id . ']"';
+    }
 
-	$checked = isset( $wpinv_options[ $args['id'] ] ) ? checked( 1, $wpinv_options[ $args['id'] ], false ) : '';
-	$html = '<input type="checkbox" id="wpinv_settings[' . $sanitize_id . ']"' . $name . ' value="1" ' . $checked . '/>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    $checked = isset( $wpinv_options[ $args['id'] ] ) ? checked( 1, $wpinv_options[ $args['id'] ], false ) : '';
+    $html = '<input type="checkbox" id="wpinv_settings[' . $sanitize_id . ']"' . $name . ' value="1" ' . $checked . '/>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_multicheck_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
 
-	$sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
+    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
 
-	if ( ! empty( $args['options'] ) ) {
-		echo '<div class="wpi-mcheck-rows wpi-mcheck-' . $sanitize_id . $class . '">';
+    if ( ! empty( $args['options'] ) ) {
+        echo '<div class="wpi-mcheck-rows wpi-mcheck-' . $sanitize_id . $class . '">';
         foreach( $args['options'] as $key => $option ):
-			$sanitize_key = wpinv_sanitize_key( $key );
-			if ( isset( $wpinv_options[$args['id']][$sanitize_key] ) ) { 
-				$enabled = $sanitize_key;
-			} else { 
-				$enabled = NULL; 
-			}
-			echo '<div class="wpi-mcheck-row"><input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $sanitize_key ) . '" ' . checked( $sanitize_key, $enabled, false ) . '/>&nbsp;';
-			echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . wp_kses_post( $option ) . '</label></div>';
-		endforeach;
-		echo '</div>';
-		echo '<p class="description">' . $args['desc'] . '</p>';
-	}
+            $sanitize_key = wpinv_sanitize_key( $key );
+            if ( isset( $wpinv_options[$args['id']][$sanitize_key] ) ) { 
+                $enabled = $sanitize_key;
+            } else { 
+                $enabled = NULL; 
+            }
+            echo '<div class="wpi-mcheck-row"><input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $sanitize_key ) . '" ' . checked( $sanitize_key, $enabled, false ) . '/>&nbsp;';
+            echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . wp_kses_post( $option ) . '</label></div>';
+        endforeach;
+        echo '</div>';
+        echo '<p class="description">' . $args['desc'] . '</p>';
+    }
 }
 
 function wpinv_payment_icons_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( ! empty( $args['options'] ) ) {
-		foreach( $args['options'] as $key => $option ) {
+    if ( ! empty( $args['options'] ) ) {
+        foreach( $args['options'] as $key => $option ) {
             $sanitize_key = wpinv_sanitize_key( $key );
             
-			if( isset( $wpinv_options[$args['id']][$key] ) ) {
-				$enabled = $option;
-			} else {
-				$enabled = NULL;
-			}
-
-			echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" style="margin-right:10px;line-height:16px;height:16px;display:inline-block;">';
-
-				echo '<input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked( $option, $enabled, false ) . '/>&nbsp;';
-
-				if ( wpinv_string_is_image_url( $key ) ) {
-					echo '<img class="payment-icon" src="' . esc_url( $key ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
-				} else {
-					$card = strtolower( str_replace( ' ', '', $option ) );
-
-					if ( has_filter( 'wpinv_accepted_payment_' . $card . '_image' ) ) {
-						$image = apply_filters( 'wpinv_accepted_payment_' . $card . '_image', '' );
-					} else {
-						$image       = wpinv_locate_template( 'images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false );
-						$content_dir = WP_CONTENT_DIR;
-
-						if ( function_exists( 'wp_normalize_path' ) ) {
-							// Replaces backslashes with forward slashes for Windows systems
-							$image = wp_normalize_path( $image );
-							$content_dir = wp_normalize_path( $content_dir );
-						}
-
-						$image = str_replace( $content_dir, content_url(), $image );
-					}
-
-					echo '<img class="payment-icon" src="' . esc_url( $image ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
-				}
-			echo $option . '</label>';
-		}
-		echo '<p class="description" style="margin-top:16px;">' . wp_kses_post( $args['desc'] ) . '</p>';
-	}
+            if( isset( $wpinv_options[$args['id']][$key] ) ) {
+                $enabled = $option;
+            } else {
+                $enabled = NULL;
+            }
+
+            echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" style="margin-right:10px;line-height:16px;height:16px;display:inline-block;">';
+
+                echo '<input name="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked( $option, $enabled, false ) . '/>&nbsp;';
+
+                if ( wpinv_string_is_image_url( $key ) ) {
+                    echo '<img class="payment-icon" src="' . esc_url( $key ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+                } else {
+                    $card = strtolower( str_replace( ' ', '', $option ) );
+
+                    if ( has_filter( 'wpinv_accepted_payment_' . $card . '_image' ) ) {
+                        $image = apply_filters( 'wpinv_accepted_payment_' . $card . '_image', '' );
+                    } else {
+                        $image       = wpinv_locate_template( 'images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false );
+                        $content_dir = WP_CONTENT_DIR;
+
+                        if ( function_exists( 'wp_normalize_path' ) ) {
+                            // Replaces backslashes with forward slashes for Windows systems
+                            $image = wp_normalize_path( $image );
+                            $content_dir = wp_normalize_path( $content_dir );
+                        }
+
+                        $image = str_replace( $content_dir, content_url(), $image );
+                    }
+
+                    echo '<img class="payment-icon" src="' . esc_url( $image ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+                }
+            echo $option . '</label>';
+        }
+        echo '<p class="description" style="margin-top:16px;">' . wp_kses_post( $args['desc'] ) . '</p>';
+    }
 }
 
 function wpinv_radio_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
     
     foreach ( $args['options'] as $key => $option ) :
-		$sanitize_key = wpinv_sanitize_key( $key );
+        $sanitize_key = wpinv_sanitize_key( $key );
         
         $checked = false;
 
-		if ( isset( $wpinv_options[ $args['id'] ] ) && $wpinv_options[ $args['id'] ] == $key )
-			$checked = true;
-		elseif( isset( $args['std'] ) && $args['std'] == $key && ! isset( $wpinv_options[ $args['id'] ] ) )
-			$checked = true;
+        if ( isset( $wpinv_options[ $args['id'] ] ) && $wpinv_options[ $args['id'] ] == $key )
+            $checked = true;
+        elseif( isset( $args['std'] ) && $args['std'] == $key && ! isset( $wpinv_options[ $args['id'] ] ) )
+            $checked = true;
 
-		echo '<input name="wpinv_settings[' . $sanitize_id . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="radio" value="' . $sanitize_key . '" ' . checked(true, $checked, false) . '/>&nbsp;';
-		echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . esc_html( $option ) . '</label><br/>';
-	endforeach;
+        echo '<input name="wpinv_settings[' . $sanitize_id . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="radio" value="' . $sanitize_key . '" ' . checked(true, $checked, false) . '/>&nbsp;';
+        echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . esc_html( $option ) . '</label><br/>';
+    endforeach;
 
-	echo '<p class="description">' . wp_kses_post( $args['desc'] ) . '</p>';
+    echo '<p class="description">' . wp_kses_post( $args['desc'] ) . '</p>';
 }
 
 function wpinv_gateways_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	foreach ( $args['options'] as $key => $option ) :
-		$sanitize_key = wpinv_sanitize_key( $key );
+    foreach ( $args['options'] as $key => $option ) :
+        $sanitize_key = wpinv_sanitize_key( $key );
         
         if ( isset( $wpinv_options['gateways'][ $key ] ) )
-			$enabled = '1';
-		else
-			$enabled = null;
+            $enabled = '1';
+        else
+            $enabled = null;
 
-		echo '<input name="wpinv_settings[' . esc_attr( $args['id'] ) . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="1" ' . checked('1', $enabled, false) . '/>&nbsp;';
-		echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . esc_html( $option['admin_label'] ) . '</label><br/>';
-	endforeach;
+        echo '<input name="wpinv_settings[' . esc_attr( $args['id'] ) . '][' . $sanitize_key . ']" id="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']" type="checkbox" value="1" ' . checked('1', $enabled, false) . '/>&nbsp;';
+        echo '<label for="wpinv_settings[' . $sanitize_id . '][' . $sanitize_key . ']">' . esc_html( $option['admin_label'] ) . '</label><br/>';
+    endforeach;
 }
 
 function wpinv_gateway_select_callback($args) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
     $class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
 
-	echo '<select name="wpinv_settings[' . $sanitize_id . ']"" id="wpinv_settings[' . $sanitize_id . ']" class="'.$class.'" >';
+    echo '<select name="wpinv_settings[' . $sanitize_id . ']"" id="wpinv_settings[' . $sanitize_id . ']" class="'.$class.'" >';
 
-	foreach ( $args['options'] as $key => $option ) :
-		if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
+    foreach ( $args['options'] as $key => $option ) :
+        if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
             $selected = selected( $key, $args['selected'], false );
         } else {
             $selected = isset( $wpinv_options[ $args['id'] ] ) ? selected( $key, $wpinv_options[$args['id']], false ) : '';
         }
-		echo '<option value="' . wpinv_sanitize_key( $key ) . '"' . $selected . '>' . esc_html( $option['admin_label'] ) . '</option>';
-	endforeach;
+        echo '<option value="' . wpinv_sanitize_key( $key ) . '"' . $selected . '>' . esc_html( $option['admin_label'] ) . '</option>';
+    endforeach;
 
-	echo '</select>';
-	echo '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    echo '</select>';
+    echo '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 }
 
 function wpinv_text_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
-
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
-		$args['readonly'] = true;
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-		$name  = '';
-	} else {
-		$name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
-	}
-	$class = !empty( $args['class'] ) ? sanitize_html_class( $args['class'] ) : '';
-
-	$readonly = $args['readonly'] === true ? ' readonly="readonly"' : '';
-	$size     = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html     = '<input type="text" class="' . sanitize_html_class( $size ) . '-text ' . $class . '" id="wpinv_settings[' . $sanitize_id . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '"' . $readonly . '/>';
-	$html    .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
-
-	echo $html;
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
+
+    if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+        $args['readonly'] = true;
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+        $name  = '';
+    } else {
+        $name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
+    }
+    $class = !empty( $args['class'] ) ? sanitize_html_class( $args['class'] ) : '';
+
+    $readonly = $args['readonly'] === true ? ' readonly="readonly"' : '';
+    $size     = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
+    $html     = '<input type="text" class="' . sanitize_html_class( $size ) . '-text ' . $class . '" id="wpinv_settings[' . $sanitize_id . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '"' . $readonly . '/>';
+    $html    .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+
+    echo $html;
 }
 
 function wpinv_number_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
-
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
-		$args['readonly'] = true;
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-		$name  = '';
-	} else {
-		$name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
-	}
-
-	$max  = isset( $args['max'] ) ? $args['max'] : 999999;
-	$min  = isset( $args['min'] ) ? $args['min'] : 0;
-	$step = isset( $args['step'] ) ? $args['step'] : 1;
-	$class = !empty( $args['class'] ) ? sanitize_html_class( $args['class'] ) : '';
-
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="number" step="' . esc_attr( $step ) . '" max="' . esc_attr( $max ) . '" min="' . esc_attr( $min ) . '" class="' . sanitize_html_class( $size ) . '-text ' . $class . '" id="wpinv_settings[' . $sanitize_id . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '"/>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
-
-	echo $html;
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
+
+    if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+        $args['readonly'] = true;
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+        $name  = '';
+    } else {
+        $name = 'name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"';
+    }
+
+    $max  = isset( $args['max'] ) ? $args['max'] : 999999;
+    $min  = isset( $args['min'] ) ? $args['min'] : 0;
+    $step = isset( $args['step'] ) ? $args['step'] : 1;
+    $class = !empty( $args['class'] ) ? sanitize_html_class( $args['class'] ) : '';
+
+    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
+    $html = '<input type="number" step="' . esc_attr( $step ) . '" max="' . esc_attr( $max ) . '" min="' . esc_attr( $min ) . '" class="' . sanitize_html_class( $size ) . '-text ' . $class . '" id="wpinv_settings[' . $sanitize_id . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '"/>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+
+    echo $html;
 }
 
 function wpinv_textarea_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
     
     $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
     $class = ( isset( $args['class'] ) && ! is_null( $args['class'] ) ) ? $args['class'] : 'large-text';
 
-	$html = '<textarea class="' . sanitize_html_class( $class ) . ' txtarea-' . sanitize_html_class( $size ) . ' wpi-' . esc_attr( sanitize_html_class( $sanitize_id ) ) . ' " cols="' . $args['cols'] . '" rows="' . $args['rows'] . '" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    $html = '<textarea class="' . sanitize_html_class( $class ) . ' txtarea-' . sanitize_html_class( $size ) . ' wpi-' . esc_attr( sanitize_html_class( $sanitize_id ) ) . ' " cols="' . $args['cols'] . '" rows="' . $args['rows'] . '" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_password_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="password" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '"/>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
+    $html = '<input type="password" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '"/>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_missing_callback($args) {
-	printf(
-		__( 'The callback function used for the %s setting is missing.', 'invoicing' ),
-		'<strong>' . $args['id'] . '</strong>'
-	);
+    printf(
+        __( 'The callback function used for the %s setting is missing.', 'invoicing' ),
+        '<strong>' . $args['id'] . '</strong>'
+    );
 }
 
 function wpinv_select_callback($args) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
     
     if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
         $value = $args['selected'];
     }
 
-	if ( isset( $args['placeholder'] ) ) {
-		$placeholder = $args['placeholder'];
-	} else {
-		$placeholder = '';
-	}
+    if ( isset( $args['placeholder'] ) ) {
+        $placeholder = $args['placeholder'];
+    } else {
+        $placeholder = '';
+    }
     
     if( !empty( $args['onchange'] ) ) {
         $onchange = ' onchange="' . esc_attr( $args['onchange'] ) . '"';
@@ -1313,142 +1313,142 @@ 
 
     $class = !empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
 
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" class="'.$class.'"  name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" data-placeholder="' . esc_html( $placeholder ) . '"' . $onchange . ' />';
+    $html = '<select id="wpinv_settings[' . $sanitize_id . ']" class="'.$class.'"  name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" data-placeholder="' . esc_html( $placeholder ) . '"' . $onchange . ' />';
 
-	foreach ( $args['options'] as $option => $name ) {
-		$selected = selected( $option, $value, false );
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
-	}
+    foreach ( $args['options'] as $option => $name ) {
+        $selected = selected( $option, $value, false );
+        $html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
+    }
 
-	$html .= '</select>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    $html .= '</select>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_color_select_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
 
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"/>';
+    $html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"/>';
 
-	foreach ( $args['options'] as $option => $color ) {
-		$selected = selected( $option, $value, false );
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $color['label'] ) . '</option>';
-	}
+    foreach ( $args['options'] as $option => $color ) {
+        $selected = selected( $option, $value, false );
+        $html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $color['label'] ) . '</option>';
+    }
 
-	$html .= '</select>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    $html .= '</select>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_rich_editor_callback( $args ) {
-	global $wpinv_options, $wp_version;
+    global $wpinv_options, $wp_version;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
 
-		if( empty( $args['allow_blank'] ) && empty( $value ) ) {
-			$value = isset( $args['std'] ) ? $args['std'] : '';
-		}
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+        if( empty( $args['allow_blank'] ) && empty( $value ) ) {
+            $value = isset( $args['std'] ) ? $args['std'] : '';
+        }
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
 
-	$rows = isset( $args['size'] ) ? $args['size'] : 20;
+    $rows = isset( $args['size'] ) ? $args['size'] : 20;
 
-	if ( $wp_version >= 3.3 && function_exists( 'wp_editor' ) ) {
-		ob_start();
-		wp_editor( stripslashes( $value ), 'wpinv_settings_' . esc_attr( $args['id'] ), array( 'textarea_name' => 'wpinv_settings[' . esc_attr( $args['id'] ) . ']', 'textarea_rows' => absint( $rows ), 'media_buttons' => false ) );
-		$html = ob_get_clean();
-	} else {
-		$html = '<textarea class="large-text" rows="10" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="wpi-' . esc_attr( sanitize_html_class( $args['id'] ) ) . '">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
-	}
+    if ( $wp_version >= 3.3 && function_exists( 'wp_editor' ) ) {
+        ob_start();
+        wp_editor( stripslashes( $value ), 'wpinv_settings_' . esc_attr( $args['id'] ), array( 'textarea_name' => 'wpinv_settings[' . esc_attr( $args['id'] ) . ']', 'textarea_rows' => absint( $rows ), 'media_buttons' => false ) );
+        $html = ob_get_clean();
+    } else {
+        $html = '<textarea class="large-text" rows="10" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="wpi-' . esc_attr( sanitize_html_class( $args['id'] ) ) . '">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
+    }
 
-	$html .= '<br/><label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    $html .= '<br/><label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_upload_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[$args['id']];
-	} else {
-		$value = isset($args['std']) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[$args['id']];
+    } else {
+        $value = isset($args['std']) ? $args['std'] : '';
+    }
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="text" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( stripslashes( $value ) ) . '"/>';
-	$html .= '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . __( 'Upload File', 'invoicing' ) . '"/></span>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
+    $html = '<input type="text" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( stripslashes( $value ) ) . '"/>';
+    $html .= '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . __( 'Upload File', 'invoicing' ) . '"/></span>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_color_callback( $args ) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $wpinv_options[ $args['id'] ] ) ) {
-		$value = $wpinv_options[ $args['id'] ];
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+    if ( isset( $wpinv_options[ $args['id'] ] ) ) {
+        $value = $wpinv_options[ $args['id'] ];
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
 
-	$default = isset( $args['std'] ) ? $args['std'] : '';
+    $default = isset( $args['std'] ) ? $args['std'] : '';
 
-	$html = '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '" data-default-color="' . esc_attr( $default ) . '" />';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    $html = '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '" data-default-color="' . esc_attr( $default ) . '" />';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_country_states_callback($args) {
-	global $wpinv_options;
+    global $wpinv_options;
     
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $args['placeholder'] ) ) {
-		$placeholder = $args['placeholder'];
-	} else {
-		$placeholder = '';
-	}
+    if ( isset( $args['placeholder'] ) ) {
+        $placeholder = $args['placeholder'];
+    } else {
+        $placeholder = '';
+    }
 
-	$states = wpinv_get_country_states();
+    $states = wpinv_get_country_states();
 
-	$class = empty( $states ) ? ' class="wpinv-no-states"' : ' class="wpi_select2"';
-	$html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"' . $class . 'data-placeholder="' . esc_html( $placeholder ) . '"/>';
+    $class = empty( $states ) ? ' class="wpinv-no-states"' : ' class="wpi_select2"';
+    $html = '<select id="wpinv_settings[' . $sanitize_id . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"' . $class . 'data-placeholder="' . esc_html( $placeholder ) . '"/>';
 
-	foreach ( $states as $option => $name ) {
-		$selected = isset( $wpinv_options[ $args['id'] ] ) ? selected( $option, $wpinv_options[$args['id']], false ) : '';
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
-	}
+    foreach ( $states as $option => $name ) {
+        $selected = isset( $wpinv_options[ $args['id'] ] ) ? selected( $option, $wpinv_options[$args['id']], false ) : '';
+        $html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
+    }
 
-	$html .= '</select>';
-	$html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
+    $html .= '</select>';
+    $html .= '<label for="wpinv_settings[' . $sanitize_id . ']"> '  . wp_kses_post( $args['desc'] ) . '</label>';
 
-	echo $html;
+    echo $html;
 }
 
 function wpinv_tax_rates_callback($args) {
-	global $wpinv_options;
-	$rates = wpinv_get_tax_rates();
-	ob_start(); ?>
+    global $wpinv_options;
+    $rates = wpinv_get_tax_rates();
+    ob_start(); ?>
     </td><tr>
     <td colspan="2" class="wpinv_tax_tdbox">
 	<p><?php echo $args['desc']; ?></p>
@@ -1472,40 +1472,40 @@ 
 			<tr>
 				<td class="wpinv_tax_country">
 					<?php
-					echo wpinv_html_select( array(
-						'options'          => wpinv_get_country_list( true ),
-						'name'             => 'tax_rates[' . $sanitized_key . '][country]',
+                    echo wpinv_html_select( array(
+                        'options'          => wpinv_get_country_list( true ),
+                        'name'             => 'tax_rates[' . $sanitized_key . '][country]',
                         'id'               => 'tax_rates[' . $sanitized_key . '][country]',
-						'selected'         => $rate['country'],
-						'show_option_all'  => false,
-						'show_option_none' => false,
-						'class'            => 'wpinv-tax-country wpi_select2',
-						'placeholder'      => __( 'Choose a country', 'invoicing' )
-					) );
-					?>
+                        'selected'         => $rate['country'],
+                        'show_option_all'  => false,
+                        'show_option_none' => false,
+                        'class'            => 'wpinv-tax-country wpi_select2',
+                        'placeholder'      => __( 'Choose a country', 'invoicing' )
+                    ) );
+                    ?>
 				</td>
 				<td class="wpinv_tax_state">
 					<?php
-					$states = wpinv_get_country_states( $rate['country'] );
-					if( !empty( $states ) ) {
-						echo wpinv_html_select( array(
-							'options'          => array_merge( array( '' => '' ), $states ),
-							'name'             => 'tax_rates[' . $sanitized_key . '][state]',
+                    $states = wpinv_get_country_states( $rate['country'] );
+                    if( !empty( $states ) ) {
+                        echo wpinv_html_select( array(
+                            'options'          => array_merge( array( '' => '' ), $states ),
+                            'name'             => 'tax_rates[' . $sanitized_key . '][state]',
                             'id'               => 'tax_rates[' . $sanitized_key . '][state]',
-							'selected'         => $rate['state'],
-							'show_option_all'  => false,
-							'show_option_none' => false,
+                            'selected'         => $rate['state'],
+                            'show_option_all'  => false,
+                            'show_option_none' => false,
                             'class'            => 'wpi_select2',
-							'placeholder'      => __( 'Choose a state', 'invoicing' )
-						) );
-					} else {
-						echo wpinv_html_text( array(
-							'name'  => 'tax_rates[' . $sanitized_key . '][state]', $rate['state'],
-							'value' => ! empty( $rate['state'] ) ? $rate['state'] : '',
+                            'placeholder'      => __( 'Choose a state', 'invoicing' )
+                        ) );
+                    } else {
+                        echo wpinv_html_text( array(
+                            'name'  => 'tax_rates[' . $sanitized_key . '][state]', $rate['state'],
+                            'value' => ! empty( $rate['state'] ) ? $rate['state'] : '',
                             'id'    => 'tax_rates[' . $sanitized_key . '][state]',
-						) );
-					}
-					?>
+                        ) );
+                    }
+                    ?>
 				</td>
 				<td class="wpinv_tax_global">
 					<input type="checkbox" name="tax_rates[<?php echo $sanitized_key; ?>][global]" id="tax_rates[<?php echo $sanitized_key; ?>][global]" value="1"<?php checked( true, ! empty( $rate['global'] ) ); ?>/>
@@ -1520,19 +1520,19 @@ 
 			<tr>
 				<td class="wpinv_tax_country">
 					<?php
-					echo wpinv_html_select( array(
-						'options'          => wpinv_get_country_list( true ),
-						'name'             => 'tax_rates[0][country]',
-						'show_option_all'  => false,
-						'show_option_none' => false,
-						'class'            => 'wpinv-tax-country wpi_select2',
-						'placeholder'      => __( 'Choose a country', 'invoicing' )
-					) ); ?>
+                    echo wpinv_html_select( array(
+                        'options'          => wpinv_get_country_list( true ),
+                        'name'             => 'tax_rates[0][country]',
+                        'show_option_all'  => false,
+                        'show_option_none' => false,
+                        'class'            => 'wpinv-tax-country wpi_select2',
+                        'placeholder'      => __( 'Choose a country', 'invoicing' )
+                    ) ); ?>
 				</td>
 				<td class="wpinv_tax_state">
 					<?php echo wpinv_html_text( array(
-						'name' => 'tax_rates[0][state]'
-					) ); ?>
+                        'name' => 'tax_rates[0][state]'
+                    ) ); ?>
 				</td>
 				<td class="wpinv_tax_global">
 					<input type="checkbox" name="tax_rates[0][global]" id="tax_rates[0][global]" value="1"/>
@@ -1547,7 +1547,7 @@ 
         <tfoot><tr><td colspan="5"></td><td class="wpinv_tax_action"><span class="button-secondary" id="wpinv_add_tax_rate"><?php _e( 'Add Tax Rate', 'invoicing' ); ?></span></td></tr></tfoot>
 	</table>
 	<?php
-	echo ob_get_clean();
+    echo ob_get_clean();
 }
 
 function wpinv_tools_callback($args) {
@@ -1575,15 +1575,15 @@ 
 }
 
 function wpinv_descriptive_text_callback( $args ) {
-	echo wp_kses_post( $args['desc'] );
+    echo wp_kses_post( $args['desc'] );
 }
 
 function wpinv_hook_callback( $args ) {
-	do_action( 'wpinv_' . $args['id'], $args );
+    do_action( 'wpinv_' . $args['id'], $args );
 }
 
 function wpinv_set_settings_cap() {
-	return wpinv_get_capability();
+    return wpinv_get_capability();
 }
 add_filter( 'option_page_capability_wpinv_settings', 'wpinv_set_settings_cap' );
 

includes/admin/wpinv-admin-functions.php

Indentation +45 added lines, -45 removed lines

@@ -101,9 +101,9 @@ 
         case 'status' :
             $value   = $wpi_invoice->get_status( true ) . ( $wpi_invoice->is_recurring() && $wpi_invoice->is_parent() ? ' <span class="wpi-suffix">' . __( '(r)', 'invoicing' ) . '</span>' : '' );
             $is_viewed = wpinv_is_invoice_viewed( $wpi_invoice->ID );
-	        $gateway_title = wpinv_get_gateway_admin_label( $wpi_invoice->get_gateway() );
-	        $offline_gateways = apply_filters('wpinv_offline_payments', array('bank_transfer', 'cheque', 'cod'));
-	        $is_offline_payment = in_array($wpi_invoice->get_gateway(), $offline_gateways) ? true : false;
+            $gateway_title = wpinv_get_gateway_admin_label( $wpi_invoice->get_gateway() );
+            $offline_gateways = apply_filters('wpinv_offline_payments', array('bank_transfer', 'cheque', 'cod'));
+            $is_offline_payment = in_array($wpi_invoice->get_gateway(), $offline_gateways) ? true : false;
 
             if ( 1 == $is_viewed ) {
                 $value .= '&nbsp;&nbsp;<i class="fa fa-eye" title="'.__( 'Viewed by Customer', 'invoicing' ).'"></i>';
@@ -174,69 +174,69 @@ 
 }
 
 function wpinv_admin_messages() {
-	global $wpinv_options, $pagenow, $post;
+    global $wpinv_options, $pagenow, $post;
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_added' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		 add_settings_error( 'wpinv-notices', 'wpinv-discount-added', __( 'Discount code added.', 'invoicing' ), 'updated' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'discount_added' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
+            add_settings_error( 'wpinv-notices', 'wpinv-discount-added', __( 'Discount code added.', 'invoicing' ), 'updated' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_add_failed' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-discount-add-fail', __( 'There was a problem adding your discount code, please try again.', 'invoicing' ), 'error' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'discount_add_failed' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-discount-add-fail', __( 'There was a problem adding your discount code, please try again.', 'invoicing' ), 'error' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_exists' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-discount-exists', __( 'A discount with that code already exists, please use a different code.', 'invoicing' ), 'error' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'discount_exists' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-discount-exists', __( 'A discount with that code already exists, please use a different code.', 'invoicing' ), 'error' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_updated' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		 add_settings_error( 'wpinv-notices', 'wpinv-discount-updated', __( 'Discount code updated.', 'invoicing' ), 'updated' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'discount_updated' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
+            add_settings_error( 'wpinv-notices', 'wpinv-discount-updated', __( 'Discount code updated.', 'invoicing' ), 'updated' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'discount_update_failed' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-discount-updated-fail', __( 'There was a problem updating your discount code, please try again.', 'invoicing' ), 'error' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'discount_update_failed' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-discount-updated-fail', __( 'There was a problem updating your discount code, please try again.', 'invoicing' ), 'error' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'invoice_deleted' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-deleted', __( 'The invoice has been deleted.', 'invoicing' ), 'updated' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'invoice_deleted' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-deleted', __( 'The invoice has been deleted.', 'invoicing' ), 'updated' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'email_disabled' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-sent-fail', __( 'Email notification is disabled. Please check settings.', 'invoicing' ), 'error' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'email_disabled' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-sent-fail', __( 'Email notification is disabled. Please check settings.', 'invoicing' ), 'error' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'email_sent' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-sent', __( 'The email has been sent to customer.', 'invoicing' ), 'updated' );
+    if ( isset( $_GET['wpinv-message'] ) && 'email_sent' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-sent', __( 'The email has been sent to customer.', 'invoicing' ), 'updated' );
     }
     
     if ( isset( $_GET['wpinv-message'] ) && 'email_fail' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-sent-fail', __( 'Fail to send email to the customer.', 'invoicing' ), 'error' );
+        add_settings_error( 'wpinv-notices', 'wpinv-sent-fail', __( 'Fail to send email to the customer.', 'invoicing' ), 'error' );
     }
 
     if ( isset( $_GET['wpinv-message'] ) && 'invoice-note-deleted' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
         add_settings_error( 'wpinv-notices', 'wpinv-note-deleted', __( 'The invoice note has been deleted.', 'invoicing' ), 'updated' );
     }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'settings-imported' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-settings-imported', __( 'The settings have been imported.', 'invoicing' ), 'updated' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'settings-imported' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-settings-imported', __( 'The settings have been imported.', 'invoicing' ), 'updated' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'note-added' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-note-added', __( 'The invoice note has been added successfully.', 'invoicing' ), 'updated' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'note-added' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-note-added', __( 'The invoice note has been added successfully.', 'invoicing' ), 'updated' );
+    }
 
-	if ( isset( $_GET['wpinv-message'] ) && 'invoice-updated' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
-		add_settings_error( 'wpinv-notices', 'wpinv-updated', __( 'The invoice has been successfully updated.', 'invoicing' ), 'updated' );
-	}
+    if ( isset( $_GET['wpinv-message'] ) && 'invoice-updated' == $_GET['wpinv-message'] && wpinv_current_user_can_manage_invoicing() ) {
+        add_settings_error( 'wpinv-notices', 'wpinv-updated', __( 'The invoice has been successfully updated.', 'invoicing' ), 'updated' );
+    }
     
-	if ( $pagenow == 'post.php' && !empty( $post->post_type ) && $post->post_type == 'wpi_item' && !wpinv_item_is_editable( $post ) ) {
-		$message = apply_filters( 'wpinv_item_non_editable_message', __( 'This item in not editable.', 'invoicing' ), $post->ID );
+    if ( $pagenow == 'post.php' && !empty( $post->post_type ) && $post->post_type == 'wpi_item' && !wpinv_item_is_editable( $post ) ) {
+        $message = apply_filters( 'wpinv_item_non_editable_message', __( 'This item in not editable.', 'invoicing' ), $post->ID );
 
-		if ( !empty( $message ) ) {
-			add_settings_error( 'wpinv-notices', 'wpinv-edit-n', $message, 'updated' );
-		}
-	}
+        if ( !empty( $message ) ) {
+            add_settings_error( 'wpinv-notices', 'wpinv-edit-n', $message, 'updated' );
+        }
+    }
 
-	settings_errors( 'wpinv-notices' );
+    settings_errors( 'wpinv-notices' );
 }
 add_action( 'admin_notices', 'wpinv_admin_messages' );
 
@@ -326,7 +326,7 @@ 
         break;
         case 'id' :
            echo $post->ID;
-           echo '<div class="hidden" id="wpinv_inline-' . $post->ID . '">
+            echo '<div class="hidden" id="wpinv_inline-' . $post->ID . '">
                     <div class="price">' . wpinv_get_item_price( $post->ID ) . '</div>';
                     if ( $wpinv_euvat->allow_vat_rules() ) {
                         echo '<div class="vat_rule">' . $wpinv_euvat->get_item_rule( $post->ID ) . '</div>';

includes/wpinv-user-functions.php

Indentation +4 added lines, -4 removed lines

@@ -159,11 +159,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;
 }
 
 /**

includes/api/class-wpinv-rest-items-controller.php

Indentation +987 added lines, -987 removed lines

@@ -20,91 +20,91 @@ 
 class WPInv_REST_Items_Controller extends WP_REST_Posts_Controller {
 
     /**
-	 * Post type.
-	 *
-	 * @var string
-	 */
-	protected $post_type = 'wpi_item';
+     * Post type.
+     *
+     * @var string
+     */
+    protected $post_type = 'wpi_item';
 	
-	/**
-	 * Cached results of get_item_schema.
-	 *
-	 * @since 1.0.13
-	 * @var array
-	 */
-	protected $schema;
+    /**
+     * Cached results of get_item_schema.
+     *
+     * @since 1.0.13
+     * @var array
+     */
+    protected $schema;
 
     /**
-	 * Constructor.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param string $namespace Api Namespace
-	 */
-	public function __construct( $namespace ) {
+     * Constructor.
+     *
+     * @since 1.0.13
+     *
+     * @param string $namespace Api Namespace
+     */
+    public function __construct( $namespace ) {
         
         // Set api namespace...
-		$this->namespace = $namespace;
+        $this->namespace = $namespace;
 
         // ... and the rest base
         $this->rest_base = 'items';
 		
     }
 	
-	/**
-	 * Registers the routes for the objects of the controller.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @see register_rest_route()
-	 */
-	public function register_routes() {
-
-		parent::register_routes();
-
-		register_rest_route(
-			$this->namespace,
-			'/' . $this->rest_base . '/item-types',
-			array(
-				array(
-					'methods'             => WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'get_item_types' ),
-				),
-			)
-		);
-
-	}
+    /**
+     * Registers the routes for the objects of the controller.
+     *
+     * @since 1.0.13
+     *
+     * @see register_rest_route()
+     */
+    public function register_routes() {
+
+        parent::register_routes();
+
+        register_rest_route(
+            $this->namespace,
+            '/' . $this->rest_base . '/item-types',
+            array(
+                array(
+                    'methods'             => WP_REST_Server::READABLE,
+                    'callback'            => array( $this, 'get_item_types' ),
+                ),
+            )
+        );
+
+    }
 
     /**
-	 * Checks if a given request has access to read items.
+     * Checks if a given request has access to read items.
      * 
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return true|WP_Error True if the request has read access, WP_Error object otherwise.
-	 */
-	public function get_items_permissions_check( $request ) {
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return true|WP_Error True if the request has read access, WP_Error object otherwise.
+     */
+    public function get_items_permissions_check( $request ) {
 	
-		if ( current_user_can( 'manage_options' ) ||  current_user_can( 'manage_invoicing' ) ) {
-			return true;
-		}
+        if ( current_user_can( 'manage_options' ) ||  current_user_can( 'manage_invoicing' ) ) {
+            return true;
+        }
 
-		return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to view invoice items.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
+        return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to view invoice items.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
 
     }
     
     /**
-	 * Retrieves a collection of invoice items.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function get_items( $request ) {
+     * Retrieves a collection of invoice items.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+     */
+    public function get_items( $request ) {
 		
-		// Retrieve the list of registered item query parameters.
+        // Retrieve the list of registered item query parameters.
         $registered = $this->get_collection_params();
         
         $args       = array();
@@ -117,54 +117,54 @@ 
 
         }
 
-		/**
-		 * Filters the wpinv_get_items arguments for items rest requests.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 *
-		 * @param array           $args    Key value array of query var to query value.
-		 * @param WP_REST_Request $request The request used.
-		 */
+        /**
+         * Filters the wpinv_get_items arguments for items rest requests.
+         *
+         *
+         * @since 1.0.13
+         *
+         *
+         * @param array           $args    Key value array of query var to query value.
+         * @param WP_REST_Request $request The request used.
+         */
         $args       = apply_filters( "wpinv_rest_get_items_arguments", $args, $request, $this );
 		
-		// Special args
-		$args[ 'return' ]   = 'objects';
-		$args[ 'paginate' ] = true;
+        // Special args
+        $args[ 'return' ]   = 'objects';
+        $args[ 'paginate' ] = true;
 
         // Run the query.
-		$query = wpinv_get_all_items( $args );
+        $query = wpinv_get_all_items( $args );
 		
-		// Prepare the retrieved items
-		$items = array();
-		foreach( $query->items as $item ) {
-
-			if ( ! $this->check_read_permission( $item ) ) {
-				continue;
-			}
-
-			$data       = $this->prepare_item_for_response( $item, $request );
-			$items[]    = $this->prepare_response_for_collection( $data );
-
-		}
-
-		// Prepare the response.
-		$response = rest_ensure_response( $items );
-		$response->header( 'X-WP-Total', (int) $query->total );
-		$response->header( 'X-WP-TotalPages', (int) $query->max_num_pages );
-
-		/**
-		 * Filters the responses for item requests.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 *
-		 * @param arrWP_REST_Response $response    Response object.
-		 * @param WP_REST_Request     $request The request used.
+        // Prepare the retrieved items
+        $items = array();
+        foreach( $query->items as $item ) {
+
+            if ( ! $this->check_read_permission( $item ) ) {
+                continue;
+            }
+
+            $data       = $this->prepare_item_for_response( $item, $request );
+            $items[]    = $this->prepare_response_for_collection( $data );
+
+        }
+
+        // Prepare the response.
+        $response = rest_ensure_response( $items );
+        $response->header( 'X-WP-Total', (int) $query->total );
+        $response->header( 'X-WP-TotalPages', (int) $query->max_num_pages );
+
+        /**
+         * Filters the responses for item requests.
+         *
+         *
+         * @since 1.0.13
+         *
+         *
+         * @param arrWP_REST_Response $response    Response object.
+         * @param WP_REST_Request     $request The request used.
          * @param array               $args Array of args used to retrieve the items
-		 */
+         */
         $response       = apply_filters( "wpinv_rest_items_response", $response, $request, $args );
 
         return rest_ensure_response( $response );
@@ -172,25 +172,25 @@ 
     }
 
     /**
-	 * Get the post, if the ID is valid.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param int $item_id Supplied ID.
-	 * @return WPInv_Item|WP_Error Item object if ID is valid, WP_Error otherwise.
-	 */
-	protected function get_post( $item_id ) {
+     * Get the post, if the ID is valid.
+     *
+     * @since 1.0.13
+     *
+     * @param int $item_id Supplied ID.
+     * @return WPInv_Item|WP_Error Item object if ID is valid, WP_Error otherwise.
+     */
+    protected function get_post( $item_id ) {
 		
-		$error     = new WP_Error( 'rest_item_invalid_id', __( 'Invalid item ID.', 'invoicing' ), array( 'status' => 404 ) );
+        $error     = new WP_Error( 'rest_item_invalid_id', __( 'Invalid item ID.', 'invoicing' ), array( 'status' => 404 ) );
 
         // Ids start from 1
         if ( (int) $item_id <= 0 ) {
-			return $error;
-		}
+            return $error;
+        }
 
-		$item = wpinv_get_item_by( 'id', (int) $item_id );
-		if ( empty( $item ) ) {
-			return $error;
+        $item = wpinv_get_item_by( 'id', (int) $item_id );
+        if ( empty( $item ) ) {
+            return $error;
         }
 
         return $item;
@@ -198,27 +198,27 @@ 
     }
 
     /**
-	 * Checks if a given request has access to read an invoice item.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return bool|WP_Error True if the request has read access for the invoice item, WP_Error object otherwise.
-	 */
-	public function get_item_permissions_check( $request ) {
+     * Checks if a given request has access to read an invoice item.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return bool|WP_Error True if the request has read access for the invoice item, WP_Error object otherwise.
+     */
+    public function get_item_permissions_check( $request ) {
 
         // Retrieve the item object.
         $item = $this->get_post( $request['id'] );
         
         // Ensure it is valid.
-		if ( is_wp_error( $item ) ) {
-			return $item;
-		}
+        if ( is_wp_error( $item ) ) {
+            return $item;
+        }
 
-		$post_type = get_post_type_object( $this->post_type );
+        $post_type = get_post_type_object( $this->post_type );
 
-		if ( ! current_user_can(  $post_type->cap->read_post, $item->ID  ) ) {
-			return new WP_Error( 
+        if ( ! current_user_can(  $post_type->cap->read_post, $item->ID  ) ) {
+            return new WP_Error( 
                 'rest_cannot_edit', 
                 __( 'Sorry, you are not allowed to view this item.', 'invoicing' ), 
                 array( 
@@ -227,61 +227,61 @@ 
             );
         }
 
-		return $this->check_read_permission( $item );
+        return $this->check_read_permission( $item );
     }
     
     /**
-	 * Checks if an item can be read.
-	 * 
-	 * An item can be read by site admins.
-	 *
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WPInv_Item $item WPInv_Item object.
-	 * @return bool Whether the post can be read.
-	 */
-	public function check_read_permission( $item ) {
-
-		// An item can be read by an admin...
-		if ( current_user_can( 'manage_options' ) ||  current_user_can( 'manage_invoicing' ) ) {
-			return true;
-		}
-
-		return false;
+     * Checks if an item can be read.
+     * 
+     * An item can be read by site admins.
+     *
+     *
+     * @since 1.0.13
+     *
+     * @param WPInv_Item $item WPInv_Item object.
+     * @return bool Whether the post can be read.
+     */
+    public function check_read_permission( $item ) {
+
+        // An item can be read by an admin...
+        if ( current_user_can( 'manage_options' ) ||  current_user_can( 'manage_invoicing' ) ) {
+            return true;
+        }
+
+        return false;
     }
     
     /**
-	 * Retrieves a single invoice item.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function get_item( $request ) {
+     * Retrieves a single invoice item.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+     */
+    public function get_item( $request ) {
 
         // Fetch the item.
         $item = $this->get_post( $request['id'] );
         
         // Abort early if it does not exist
-		if ( is_wp_error( $item ) ) {
-			return $item;
-		}
-
-		// Prepare the response
-		$response = $this->prepare_item_for_response( $item, $request );
-
-		/**
-		 * Filters the responses for single invoice item requests.
-		 *
-		 *
-		 * @since 1.0.13
-		 * @var WP_HTTP_Response
-		 *
-		 * @param WP_HTTP_Response $response Response.
-		 * @param WP_REST_Request  $request The request used.
-		 */
+        if ( is_wp_error( $item ) ) {
+            return $item;
+        }
+
+        // Prepare the response
+        $response = $this->prepare_item_for_response( $item, $request );
+
+        /**
+         * Filters the responses for single invoice item requests.
+         *
+         *
+         * @since 1.0.13
+         * @var WP_HTTP_Response
+         *
+         * @param WP_HTTP_Response $response Response.
+         * @param WP_REST_Request  $request The request used.
+         */
         $response       = apply_filters( "wpinv_rest_get_item_response", $response, $request );
 
         return rest_ensure_response( $response );
@@ -289,26 +289,26 @@ 
     }
     
     /**
-	 * Checks if a given request has access to create an invoice item.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return true|WP_Error True if the request has access to create items, WP_Error object otherwise.
-	 */
-	public function create_item_permissions_check( $request ) {
+     * Checks if a given request has access to create an invoice item.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return true|WP_Error True if the request has access to create items, WP_Error object otherwise.
+     */
+    public function create_item_permissions_check( $request ) {
 	
-		if ( ! empty( $request['id'] ) ) {
-			return new WP_Error( 'rest_item_exists', __( 'Cannot create existing item.', 'invoicing' ), array( 'status' => 400 ) );
-		}
+        if ( ! empty( $request['id'] ) ) {
+            return new WP_Error( 'rest_item_exists', __( 'Cannot create existing item.', 'invoicing' ), array( 'status' => 400 ) );
+        }
 
-		if ( current_user_can( 'manage_options' ) ||  current_user_can( 'manage_invoicing' ) ) {
-			return true;
-		}
+        if ( current_user_can( 'manage_options' ) ||  current_user_can( 'manage_invoicing' ) ) {
+            return true;
+        }
 
-		$post_type = get_post_type_object( $this->post_type );
-		if ( ! current_user_can( $post_type->cap->create_posts ) ) {
-			return new WP_Error( 
+        $post_type = get_post_type_object( $this->post_type );
+        if ( ! current_user_can( $post_type->cap->create_posts ) ) {
+            return new WP_Error( 
                 'rest_cannot_create', 
                 __( 'Sorry, you are not allowed to create invoice items as this user.', 'invoicing' ), 
                 array( 
@@ -317,253 +317,253 @@ 
             );
         }
 
-		return true;
+        return true;
     }
     
     /**
-	 * Creates a single invoice item.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function create_item( $request ) {
-
-		if ( ! empty( $request['id'] ) ) {
-			return new WP_Error( 'rest_item_exists', __( 'Cannot create existing invoice item.', 'invoicing' ), array( 'status' => 400 ) );
-		}
+     * Creates a single invoice item.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+     */
+    public function create_item( $request ) {
+
+        if ( ! empty( $request['id'] ) ) {
+            return new WP_Error( 'rest_item_exists', __( 'Cannot create existing invoice item.', 'invoicing' ), array( 'status' => 400 ) );
+        }
 
-		$request->set_param( 'context', 'edit' );
+        $request->set_param( 'context', 'edit' );
 
-		// Prepare the updated data.
-		$item_data = $this->prepare_item_for_database( $request );
+        // Prepare the updated data.
+        $item_data = $this->prepare_item_for_database( $request );
 
-		if ( is_wp_error( $item_data ) ) {
-			return $item_data;
-		}
+        if ( is_wp_error( $item_data ) ) {
+            return $item_data;
+        }
 
-		// Try creating the item.
+        // Try creating the item.
         $item = wpinv_create_item( $item_data, true );
 
-		if ( is_wp_error( $item ) ) {
+        if ( is_wp_error( $item ) ) {
             return $item;
-		}
-
-		// Prepare the response
-		$response = $this->prepare_item_for_response( $item, $request );
-
-		/**
-		 * Fires after a single invoice item is created or updated via the REST API.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param WPinv_Item   $item  Inserted or updated item object.
-		 * @param WP_REST_Request $request  Request object.
-		 * @param bool            $creating True when creating a post, false when updating.
-		 */
-		do_action( "wpinv_rest_insert_item", $item, $request, true );
-
-		/**
-		 * Filters the responses for creating single item requests.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 *
-		 * @param array           $item_data Invoice properties.
-		 * @param WP_REST_Request $request The request used.
-		 */
+        }
+
+        // Prepare the response
+        $response = $this->prepare_item_for_response( $item, $request );
+
+        /**
+         * Fires after a single invoice item is created or updated via the REST API.
+         *
+         * @since 1.0.13
+         *
+         * @param WPinv_Item   $item  Inserted or updated item object.
+         * @param WP_REST_Request $request  Request object.
+         * @param bool            $creating True when creating a post, false when updating.
+         */
+        do_action( "wpinv_rest_insert_item", $item, $request, true );
+
+        /**
+         * Filters the responses for creating single item requests.
+         *
+         *
+         * @since 1.0.13
+         *
+         *
+         * @param array           $item_data Invoice properties.
+         * @param WP_REST_Request $request The request used.
+         */
         $response       = apply_filters( "wpinv_rest_create_item_response", $response, $request );
 
         return rest_ensure_response( $response );
-	}
-
-	/**
-	 * Checks if a given request has access to update an item.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return true|WP_Error True if the request has access to update the item, WP_Error object otherwise.
-	 */
-	public function update_item_permissions_check( $request ) {
-
-		// Retrieve the item.
-		$item = $this->get_post( $request['id'] );
-		if ( is_wp_error( $item ) ) {
-			return $item;
-		}
-
-		if ( wpinv_current_user_can_manage_invoicing() ) {
-			return true;
-		}
-
-		return new WP_Error( 
-			'rest_cannot_edit', 
-			__( 'Sorry, you are not allowed to update this item.', 'invoicing' ), 
-			array( 
-				'status' => rest_authorization_required_code(),
-			)
-		);
-
-	}
-
-	/**
-	 * Updates a single item.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function update_item( $request ) {
+    }
+
+    /**
+     * Checks if a given request has access to update an item.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return true|WP_Error True if the request has access to update the item, WP_Error object otherwise.
+     */
+    public function update_item_permissions_check( $request ) {
+
+        // Retrieve the item.
+        $item = $this->get_post( $request['id'] );
+        if ( is_wp_error( $item ) ) {
+            return $item;
+        }
+
+        if ( wpinv_current_user_can_manage_invoicing() ) {
+            return true;
+        }
+
+        return new WP_Error( 
+            'rest_cannot_edit', 
+            __( 'Sorry, you are not allowed to update this item.', 'invoicing' ), 
+            array( 
+                'status' => rest_authorization_required_code(),
+            )
+        );
+
+    }
+
+    /**
+     * Updates a single item.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+     */
+    public function update_item( $request ) {
 		
-		// Ensure the item exists.
+        // Ensure the item exists.
         $valid_check = $this->get_post( $request['id'] );
         
         // Abort early if it does not exist
-		if ( is_wp_error( $valid_check ) ) {
-			return $valid_check;
-		}
+        if ( is_wp_error( $valid_check ) ) {
+            return $valid_check;
+        }
 
-		$request->set_param( 'context', 'edit' );
+        $request->set_param( 'context', 'edit' );
 
-		// Prepare the updated data.
-		$data_to_update = $this->prepare_item_for_database( $request );
+        // Prepare the updated data.
+        $data_to_update = $this->prepare_item_for_database( $request );
 
-		if ( is_wp_error( $data_to_update ) ) {
-			return $data_to_update;
-		}
+        if ( is_wp_error( $data_to_update ) ) {
+            return $data_to_update;
+        }
 
-		// Abort if no item data is provided
+        // Abort if no item data is provided
         if( empty( $data_to_update ) ) {
             return new WP_Error( 'missing_data', __( 'An update request cannot be empty.', 'invoicing' ) );
         }
 
-		// Include the item ID
-		$data_to_update['ID'] = $request['id'];
-
-		// Update the item
-		$updated_item = wpinv_update_item( $data_to_update, true );
-
-		// Incase the update operation failed...
-		if ( is_wp_error( $updated_item ) ) {
-			return $updated_item;
-		}
-
-		// Prepare the response
-		$response = $this->prepare_item_for_response( $updated_item, $request );
-
-		/** This action is documented in includes/class-wpinv-rest-item-controller.php */
-		do_action( "wpinv_rest_insert_item", $updated_item, $request, false );
-
-		/**
-		 * Filters the responses for updating single item requests.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 *
-		 * @param array           $data_to_update Item properties.
-		 * @param WP_REST_Request $request The request used.
-		 */
+        // Include the item ID
+        $data_to_update['ID'] = $request['id'];
+
+        // Update the item
+        $updated_item = wpinv_update_item( $data_to_update, true );
+
+        // Incase the update operation failed...
+        if ( is_wp_error( $updated_item ) ) {
+            return $updated_item;
+        }
+
+        // Prepare the response
+        $response = $this->prepare_item_for_response( $updated_item, $request );
+
+        /** This action is documented in includes/class-wpinv-rest-item-controller.php */
+        do_action( "wpinv_rest_insert_item", $updated_item, $request, false );
+
+        /**
+         * Filters the responses for updating single item requests.
+         *
+         *
+         * @since 1.0.13
+         *
+         *
+         * @param array           $data_to_update Item properties.
+         * @param WP_REST_Request $request The request used.
+         */
         $response       = apply_filters( "wpinv_rest_update_item_response", $response,  $data_to_update, $request );
 
         return rest_ensure_response( $response );
-	}
-
-	/**
-	 * Checks if a given request has access to delete an item.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return true|WP_Error True if the request has access to delete the item, WP_Error object otherwise.
-	 */
-	public function delete_item_permissions_check( $request ) {
-
-		// Retrieve the item.
-		$item = $this->get_post( $request['id'] );
-		if ( is_wp_error( $item ) ) {
-			return $item;
-		}
-
-		// 
-
-		// Ensure the current user can delete the item
-		if (! wpinv_can_delete_item( $request['id'] ) ) {
-			return new WP_Error( 
+    }
+
+    /**
+     * Checks if a given request has access to delete an item.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return true|WP_Error True if the request has access to delete the item, WP_Error object otherwise.
+     */
+    public function delete_item_permissions_check( $request ) {
+
+        // Retrieve the item.
+        $item = $this->get_post( $request['id'] );
+        if ( is_wp_error( $item ) ) {
+            return $item;
+        }
+
+        // 
+
+        // Ensure the current user can delete the item
+        if (! wpinv_can_delete_item( $request['id'] ) ) {
+            return new WP_Error( 
                 'rest_cannot_delete', 
                 __( 'Sorry, you are not allowed to delete this item.', 'invoicing' ), 
                 array( 
                     'status' => rest_authorization_required_code(),
                 )
             );
-		}
-
-		return true;
-	}
-
-	/**
-	 * Deletes a single item.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function delete_item( $request ) {
+        }
+
+        return true;
+    }
+
+    /**
+     * Deletes a single item.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+     */
+    public function delete_item( $request ) {
 		
-		// Retrieve the item.
-		$item = $this->get_post( $request['id'] );
-		if ( is_wp_error( $item ) ) {
-			return $item;
-		}
+        // Retrieve the item.
+        $item = $this->get_post( $request['id'] );
+        if ( is_wp_error( $item ) ) {
+            return $item;
+        }
 
-		$request->set_param( 'context', 'edit' );
+        $request->set_param( 'context', 'edit' );
 
-		// Prepare the item id
-		$id    = $item->ID;
+        // Prepare the item id
+        $id    = $item->ID;
 
-		// Prepare the response
-		$response = $this->prepare_item_for_response( $item, $request );
+        // Prepare the response
+        $response = $this->prepare_item_for_response( $item, $request );
 
-		// Check if the user wants to bypass the trash...
-		$force_delete = (bool) $request['force'];
+        // Check if the user wants to bypass the trash...
+        $force_delete = (bool) $request['force'];
 
-		// Try deleting the item.
-		$deleted = wp_delete_post( $id, $force_delete );
+        // Try deleting the item.
+        $deleted = wp_delete_post( $id, $force_delete );
 
-		// Abort early if we can't delete the item.
-		if ( ! $deleted ) {
-			return new WP_Error( 'rest_cannot_delete', __( 'The item cannot be deleted.', 'invoicing' ), array( 'status' => 500 ) );
-		}
+        // Abort early if we can't delete the item.
+        if ( ! $deleted ) {
+            return new WP_Error( 'rest_cannot_delete', __( 'The item cannot be deleted.', 'invoicing' ), array( 'status' => 500 ) );
+        }
 
-		/**
-		 * Fires immediately after a single item is deleted or trashed via the REST API.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param WPInv_Item    $item  The deleted or trashed item.
-		 * @param WP_REST_Request  $request  The request sent to the API.
-		 */
-		do_action( "wpinv_rest_delete_item", $item, $request );
+        /**
+         * Fires immediately after a single item is deleted or trashed via the REST API.
+         *
+         *
+         * @since 1.0.13
+         *
+         * @param WPInv_Item    $item  The deleted or trashed item.
+         * @param WP_REST_Request  $request  The request sent to the API.
+         */
+        do_action( "wpinv_rest_delete_item", $item, $request );
 
-		return $response;
+        return $response;
 
-	}
+    }
     
     
     /**
-	 * Retrieves the query params for the items collection.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @return array Collection parameters.
-	 */
-	public function get_collection_params() {
+     * Retrieves the query params for the items collection.
+     *
+     * @since 1.0.13
+     *
+     * @return array Collection parameters.
+     */
+    public function get_collection_params() {
         
         $query_params               = array(
 
@@ -577,27 +577,27 @@ 
             
             // Item types
             'type'                  => array(
-				'description'       => __( 'Type of items to fetch.', 'invoicing' ),
-				'type'              => 'array',
-				'default'           => wpinv_item_types(),
-				'items'             => array(
+                'description'       => __( 'Type of items to fetch.', 'invoicing' ),
+                'type'              => 'array',
+                'default'           => wpinv_item_types(),
+                'items'             => array(
                     'enum'          => wpinv_item_types(),
                     'type'          => 'string',
                 ),
-			),
+            ),
 			
-			// Number of results per page
+            // Number of results per page
             'limit'                 => array(
-				'description'       => __( 'Number of items to fetch.', 'invoicing' ),
-				'type'              => 'integer',
-				'default'           => (int) get_option( 'posts_per_page' ),
+                'description'       => __( 'Number of items to fetch.', 'invoicing' ),
+                'type'              => 'integer',
+                'default'           => (int) get_option( 'posts_per_page' ),
             ),
 
             // Pagination
             'page'     => array(
-				'description'       => __( 'Current page to fetch.', 'invoicing' ),
-				'type'              => 'integer',
-				'default'           => 1,
+                'description'       => __( 'Current page to fetch.', 'invoicing' ),
+                'type'              => 'integer',
+                'default'           => 1,
             ),
 
             // Exclude certain items
@@ -620,9 +620,9 @@ 
                     'date',
                     'ID',
                     'modified',
-					'title',
-					'relevance',
-					'rand'
+                    'title',
+                    'relevance',
+                    'rand'
                 ),
             ),
 
@@ -632,617 +632,617 @@ 
                 'type'        => 'string',
                 'default'     => 'DESC',
                 'enum'        => array( 'ASC', 'DESC' ),
-			),
+            ),
 			
-			// Search term
+            // Search term
             'search'                => array(
-				'description'       => __( 'Return items that match the search term.', 'invoicing' ),
-				'type'              => 'string',
+                'description'       => __( 'Return items that match the search term.', 'invoicing' ),
+                'type'              => 'string',
             ),
         );
 
-		/**
-		 * Filter collection parameters for the items controller.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param array        $query_params JSON Schema-formatted collection parameters.
-		 */
-		return apply_filters( "wpinv_rest_items_collection_params", $query_params );
+        /**
+         * Filter collection parameters for the items controller.
+         *
+         *
+         * @since 1.0.13
+         *
+         * @param array        $query_params JSON Schema-formatted collection parameters.
+         */
+        return apply_filters( "wpinv_rest_items_collection_params", $query_params );
     }
     
     /**
-	 * Checks if a given post type can be viewed or managed.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param object|string $post_type Post type name or object.
-	 * @return bool Whether the post type is allowed in REST.
-	 */
-	protected function check_is_post_type_allowed( $post_type ) {
-		return true;
-	}
-
-	/**
-	 * Prepares a single item for create or update.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Request object.
-	 * @return array|WP_Error Invoice Properties or WP_Error.
-	 */
-	protected function prepare_item_for_database( $request ) {
-		$prepared_item = new stdClass();
-
-		// Post ID.
-		if ( isset( $request['id'] ) ) {
-			$existing_item = $this->get_post( $request['id'] );
-			if ( is_wp_error( $existing_item ) ) {
-				return $existing_item;
-			}
-
-			$prepared_item->ID 		  = $existing_item->ID;
-		}
-
-		$schema = $this->get_item_schema();
-
-		// item title.
-		if ( ! empty( $schema['properties']['name'] ) && isset( $request['name'] ) ) {
-			$prepared_item->title = sanitize_text_field( $request['name'] );
-		}
-
-		// item summary.
-		if ( ! empty( $schema['properties']['summary'] ) && isset( $request['summary'] ) ) {
-			$prepared_item->excerpt = wp_kses_post( $request['summary'] );
-		}
-
-		// item price.
-		if ( ! empty( $schema['properties']['price'] ) && isset( $request['price'] ) ) {
-			$prepared_item->price = floatval( $request['price'] );
-		}
-
-		// minimum price (for dynamc items).
-		if ( ! empty( $schema['properties']['minimum_price'] ) && isset( $request['minimum_price'] ) ) {
-			$prepared_item->minimum_price = floatval( $request['minimum_price'] );
-		}
-
-		// item status.
-		if ( ! empty( $schema['properties']['status'] ) && isset( $request['status'] ) ) {
-			$prepared_item->status = 'publish' === $request['status'] ? 'publish' : 'pending';
-		}
-
-		// item type.
-		if ( ! empty( $schema['properties']['type'] ) && isset( $request['type'] ) ) {
-			$prepared_item->type = in_array( $request['type'], wpinv_item_types() ) ? trim( strtolower( $request['type'] ) ) : 'custom';
-		}
-
-		// VAT rule.
-		if ( ! empty( $schema['properties']['vat_rule'] ) && isset( $request['vat_rule'] ) ) {
-			$prepared_item->vat_rule = 'digital' === $request['vat_rule'] ? 'digital' : 'physical';
-		}
-
-		// Simple strings.
-		foreach( array( 'custom_id', 'custom_name', 'custom_singular_name' ) as $property ) {
-
-			if ( ! empty( $schema['properties'][$property] ) && isset( $request[$property] ) ) {
-				$prepared_item->$property = sanitize_text_field( $request[$property] );
-			}
-
-		}
-
-		// Simple integers.
-		foreach( array( 'is_recurring', 'recurring_interval', 'recurring_limit', 'free_trial', 'trial_interval', 'dynamic_pricing', 'editable' ) as $property ) {
-
-			if ( ! empty( $schema['properties'][$property] ) && isset( $request[$property] ) ) {
-				$prepared_item->$property = intval( $request[$property] );
-			}
-
-		}
-
-		// Time periods.
-		foreach( array( 'recurring_period',  'trial_period' ) as $property ) {
-
-			if ( ! empty( $schema['properties'][$property] ) && isset( $request[$property] ) ) {
-				$prepared_item->$property = in_array( $request[$property], array( 'D', 'W', 'M', 'Y' ) ) ? trim( strtoupper( $request[$property] ) ) : 'D';
-			}
-
-		}
-
-		$item_data = (array) wp_unslash( $prepared_item );
-
-		/**
-		 * Filters an item before it is inserted via the REST API.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param array        $item_data An array of item data
-		 * @param WP_REST_Request $request       Request object.
-		 */
-		return apply_filters( "wpinv_rest_pre_insert_item", $item_data, $request );
-
-	}
-
-	/**
-	 * Prepares a single item output for response.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WPInv_Item   $item    item object.
-	 * @param WP_REST_Request $request Request object.
-	 * @return WP_REST_Response Response object.
-	 */
-	public function prepare_item_for_response( $item, $request ) {
+     * Checks if a given post type can be viewed or managed.
+     *
+     * @since 1.0.13
+     *
+     * @param object|string $post_type Post type name or object.
+     * @return bool Whether the post type is allowed in REST.
+     */
+    protected function check_is_post_type_allowed( $post_type ) {
+        return true;
+    }
 
-		$GLOBALS['post'] = get_post( $item->get_ID() );
+    /**
+     * Prepares a single item for create or update.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Request object.
+     * @return array|WP_Error Invoice Properties or WP_Error.
+     */
+    protected function prepare_item_for_database( $request ) {
+        $prepared_item = new stdClass();
+
+        // Post ID.
+        if ( isset( $request['id'] ) ) {
+            $existing_item = $this->get_post( $request['id'] );
+            if ( is_wp_error( $existing_item ) ) {
+                return $existing_item;
+            }
 
-		setup_postdata( $item->get_ID() );
+            $prepared_item->ID 		  = $existing_item->ID;
+        }
 
-		// Fetch the fields to include in this response.
-		$fields = $this->get_fields_for_response( $request );
+        $schema = $this->get_item_schema();
 
-		// Base fields for every item.
-		$data = array();
+        // item title.
+        if ( ! empty( $schema['properties']['name'] ) && isset( $request['name'] ) ) {
+            $prepared_item->title = sanitize_text_field( $request['name'] );
+        }
 
-		// Set up ID
-		if ( rest_is_field_included( 'id', $fields ) ) {
-			$data['id'] = $item->get_ID();
-		}
+        // item summary.
+        if ( ! empty( $schema['properties']['summary'] ) && isset( $request['summary'] ) ) {
+            $prepared_item->excerpt = wp_kses_post( $request['summary'] );
+        }
 
+        // item price.
+        if ( ! empty( $schema['properties']['price'] ) && isset( $request['price'] ) ) {
+            $prepared_item->price = floatval( $request['price'] );
+        }
 
-		// Item properties
-		$item_properties = array(
-			'name', 'summary', 'price', 'status', 'type',
-			'vat_rule', 'vat_class',
-			'custom_id', 'custom_name', 'custom_singular_name', 
-			'editable'
-		);
+        // minimum price (for dynamc items).
+        if ( ! empty( $schema['properties']['minimum_price'] ) && isset( $request['minimum_price'] ) ) {
+            $prepared_item->minimum_price = floatval( $request['minimum_price'] );
+        }
+
+        // item status.
+        if ( ! empty( $schema['properties']['status'] ) && isset( $request['status'] ) ) {
+            $prepared_item->status = 'publish' === $request['status'] ? 'publish' : 'pending';
+        }
 
-		foreach( $item_properties as $property ) {
+        // item type.
+        if ( ! empty( $schema['properties']['type'] ) && isset( $request['type'] ) ) {
+            $prepared_item->type = in_array( $request['type'], wpinv_item_types() ) ? trim( strtolower( $request['type'] ) ) : 'custom';
+        }
 
-			if ( rest_is_field_included( $property, $fields ) && method_exists( $item, 'get_' . $property ) ) {
-				$data[$property] = call_user_func( array( $item, 'get_' . $property ) );
-			}
+        // VAT rule.
+        if ( ! empty( $schema['properties']['vat_rule'] ) && isset( $request['vat_rule'] ) ) {
+            $prepared_item->vat_rule = 'digital' === $request['vat_rule'] ? 'digital' : 'physical';
+        }
 
-		}
+        // Simple strings.
+        foreach( array( 'custom_id', 'custom_name', 'custom_singular_name' ) as $property ) {
 
-		// Dynamic pricing.
-		if( $item->supports_dynamic_pricing() ) {
+            if ( ! empty( $schema['properties'][$property] ) && isset( $request[$property] ) ) {
+                $prepared_item->$property = sanitize_text_field( $request[$property] );
+            }
 
-			if( rest_is_field_included( 'dynamic_pricing', $fields ) ) {
-				$data['dynamic_pricing'] = $item->get_is_dynamic_pricing();
-			}
+        }
 
-			if( rest_is_field_included( 'minimum_price', $fields ) ) {
-				$data['minimum_price'] = $item->get_minimum_price();
-			}
-		}
+        // Simple integers.
+        foreach( array( 'is_recurring', 'recurring_interval', 'recurring_limit', 'free_trial', 'trial_interval', 'dynamic_pricing', 'editable' ) as $property ) {
 
-		// Subscriptions.
-		if( rest_is_field_included( 'is_recurring', $fields ) ) {
-			$data['is_recurring'] = $item->get_is_recurring();
-		}
+            if ( ! empty( $schema['properties'][$property] ) && isset( $request[$property] ) ) {
+                $prepared_item->$property = intval( $request[$property] );
+            }
 
-		if( $item->is_recurring() ) {
+        }
 
-			$recurring_fields = array( 'is_recurring', 'recurring_period', 'recurring_interval', 'recurring_limit', 'free_trial' );
-			foreach( $recurring_fields as $field ) {
+        // Time periods.
+        foreach( array( 'recurring_period',  'trial_period' ) as $property ) {
 
-				if ( rest_is_field_included( $field, $fields ) && method_exists( $item, 'get_' . $field ) ) {
-					$data[$field] = call_user_func( array( $item, 'get_' . $field ) );
-				}
+            if ( ! empty( $schema['properties'][$property] ) && isset( $request[$property] ) ) {
+                $prepared_item->$property = in_array( $request[$property], array( 'D', 'W', 'M', 'Y' ) ) ? trim( strtoupper( $request[$property] ) ) : 'D';
+            }
+
+        }
+
+        $item_data = (array) wp_unslash( $prepared_item );
+
+        /**
+         * Filters an item before it is inserted via the REST API.
+         *
+         * @since 1.0.13
+         *
+         * @param array        $item_data An array of item data
+         * @param WP_REST_Request $request       Request object.
+         */
+        return apply_filters( "wpinv_rest_pre_insert_item", $item_data, $request );
+
+    }
+
+    /**
+     * Prepares a single item output for response.
+     *
+     * @since 1.0.13
+     *
+     * @param WPInv_Item   $item    item object.
+     * @param WP_REST_Request $request Request object.
+     * @return WP_REST_Response Response object.
+     */
+    public function prepare_item_for_response( $item, $request ) {
+
+        $GLOBALS['post'] = get_post( $item->get_ID() );
+
+        setup_postdata( $item->get_ID() );
+
+        // Fetch the fields to include in this response.
+        $fields = $this->get_fields_for_response( $request );
+
+        // Base fields for every item.
+        $data = array();
+
+        // Set up ID
+        if ( rest_is_field_included( 'id', $fields ) ) {
+            $data['id'] = $item->get_ID();
+        }
+
+
+        // Item properties
+        $item_properties = array(
+            'name', 'summary', 'price', 'status', 'type',
+            'vat_rule', 'vat_class',
+            'custom_id', 'custom_name', 'custom_singular_name', 
+            'editable'
+        );
+
+        foreach( $item_properties as $property ) {
+
+            if ( rest_is_field_included( $property, $fields ) && method_exists( $item, 'get_' . $property ) ) {
+                $data[$property] = call_user_func( array( $item, 'get_' . $property ) );
+            }
+
+        }
+
+        // Dynamic pricing.
+        if( $item->supports_dynamic_pricing() ) {
+
+            if( rest_is_field_included( 'dynamic_pricing', $fields ) ) {
+                $data['dynamic_pricing'] = $item->get_is_dynamic_pricing();
+            }
+
+            if( rest_is_field_included( 'minimum_price', $fields ) ) {
+                $data['minimum_price'] = $item->get_minimum_price();
+            }
+        }
+
+        // Subscriptions.
+        if( rest_is_field_included( 'is_recurring', $fields ) ) {
+            $data['is_recurring'] = $item->get_is_recurring();
+        }
+
+        if( $item->is_recurring() ) {
+
+            $recurring_fields = array( 'is_recurring', 'recurring_period', 'recurring_interval', 'recurring_limit', 'free_trial' );
+            foreach( $recurring_fields as $field ) {
+
+                if ( rest_is_field_included( $field, $fields ) && method_exists( $item, 'get_' . $field ) ) {
+                    $data[$field] = call_user_func( array( $item, 'get_' . $field ) );
+                }
 	
-			}
+            }
 
-			if( $item->has_free_trial() ) {
+            if( $item->has_free_trial() ) {
 
-				$trial_fields = array( 'trial_period', 'trial_interval' );
-				foreach( $trial_fields as $field ) {
+                $trial_fields = array( 'trial_period', 'trial_interval' );
+                foreach( $trial_fields as $field ) {
 
-					if ( rest_is_field_included( $field, $fields ) && method_exists( $item, 'get_' . $field ) ) {
-						$data[$field] = call_user_func( array( $item, 'get_' . $field ) );
-					}
+                    if ( rest_is_field_included( $field, $fields ) && method_exists( $item, 'get_' . $field ) ) {
+                        $data[$field] = call_user_func( array( $item, 'get_' . $field ) );
+                    }
 	
-				}
-
-			}
-
-		}
-
-		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
-		$data    = $this->add_additional_fields_to_object( $data, $request );
-		$data    = $this->filter_response_by_context( $data, $context );
-
-		// Wrap the data in a response object.
-		$response = rest_ensure_response( $data );
-
-		$links = $this->prepare_links( $item );
-		$response->add_links( $links );
-
-		if ( ! empty( $links['self']['href'] ) ) {
-			$actions = $this->get_available_actions( $item, $request );
-
-			$self = $links['self']['href'];
-
-			foreach ( $actions as $rel ) {
-				$response->add_link( $rel, $self );
-			}
-		}
-
-		/**
-		 * Filters the item data for a response.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param WP_REST_Response $response The response object.
-		 * @param WPInv_Item    $item  The item object.
-		 * @param WP_REST_Request  $request  Request object.
-		 */
-		return apply_filters( "wpinv_rest_prepare_item", $response, $item, $request );
-	}
-
-	/**
-	 * Gets an array of fields to be included on the response.
-	 *
-	 * Included fields are based on item schema and `_fields=` request argument.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return array Fields to be included in the response.
-	 */
-	public function get_fields_for_response( $request ) {
-		$schema     = $this->get_item_schema();
-		$properties = isset( $schema['properties'] ) ? $schema['properties'] : array();
-
-		$additional_fields = $this->get_additional_fields();
-		foreach ( $additional_fields as $field_name => $field_options ) {
-			// For back-compat, include any field with an empty schema
-			// because it won't be present in $this->get_item_schema().
-			if ( is_null( $field_options['schema'] ) ) {
-				$properties[ $field_name ] = $field_options;
-			}
-		}
-
-		// Exclude fields that specify a different context than the request context.
-		$context = $request['context'];
-		if ( $context ) {
-			foreach ( $properties as $name => $options ) {
-				if ( ! empty( $options['context'] ) && ! in_array( $context, $options['context'], true ) ) {
-					unset( $properties[ $name ] );
-				}
-			}
-		}
-
-		$fields = array_keys( $properties );
-
-		if ( ! isset( $request['_fields'] ) ) {
-			return $fields;
-		}
-		$requested_fields = wpinv_parse_list( $request['_fields'] );
-		if ( 0 === count( $requested_fields ) ) {
-			return $fields;
-		}
-		// Trim off outside whitespace from the comma delimited list.
-		$requested_fields = array_map( 'trim', $requested_fields );
-		// Always persist 'id', because it can be needed for add_additional_fields_to_object().
-		if ( in_array( 'id', $fields, true ) ) {
-			$requested_fields[] = 'id';
-		}
-		// Return the list of all requested fields which appear in the schema.
-		return array_reduce(
-			$requested_fields,
-			function( $response_fields, $field ) use ( $fields ) {
-				if ( in_array( $field, $fields, true ) ) {
-					$response_fields[] = $field;
-					return $response_fields;
-				}
-				// Check for nested fields if $field is not a direct match.
-				$nested_fields = explode( '.', $field );
-				// A nested field is included so long as its top-level property is
-				// present in the schema.
-				if ( in_array( $nested_fields[0], $fields, true ) ) {
-					$response_fields[] = $field;
-				}
-				return $response_fields;
-			},
-			array()
-		);
-	}
-
-	/**
-	 * Retrieves the item's schema, conforming to JSON Schema.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @return array Item schema data.
-	 */
-	public function get_item_schema() {
-
-		// Maybe retrieve the schema from cache.
-		if ( $this->schema ) {
-			return $this->add_additional_fields_schema( $this->schema );
-		}
-
-		$schema = array(
-			'$schema'    => 'http://json-schema.org/draft-04/schema#',
-			'title'      => $this->post_type,
-			'type'       => 'object',
-
-			// Base properties for every Item.
-			'properties' 		  => array(
-
-				'id'           => array(
-					'description' => __( 'Unique identifier for the item.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'name'			  => array(
-					'description' => __( 'The name for the item.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'summary'        => array(
-					'description' => __( 'A summary for the item.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'price'        => array(
-					'description' => __( 'The price for the item.', 'invoicing' ),
-					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'status'       => array(
-					'description' => __( 'A named status for the item.', 'invoicing' ),
-					'type'        => 'string',
-					'enum'        => array_keys( get_post_stati( array( 'internal' => false ) ) ),
-					'context'     => array( 'view', 'edit' ),
-				),
-
-				'type'       => array(
-					'description' => __( 'The item type.', 'invoicing' ),
-					'type'        => 'string',
-					'enum'        => wpinv_item_types(),
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'vat_rule'       => array(
-					'description' => __( 'VAT rule applied to the item.', 'invoicing' ),
-					'type'        => 'string',
-					'enum'        => array( 'digital', 'physical' ),
-					'context'     => array( 'view', 'edit' ),
-				),
-
-				'vat_class'       => array(
-					'description' => __( 'VAT class for the item.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit' ),
-					'readonly'    => true,
-				),
-
-				'custom_id'       => array(
-					'description' => __( 'Custom id for the item.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
+                }
+
+            }
+
+        }
+
+        $context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+        $data    = $this->add_additional_fields_to_object( $data, $request );
+        $data    = $this->filter_response_by_context( $data, $context );
+
+        // Wrap the data in a response object.
+        $response = rest_ensure_response( $data );
+
+        $links = $this->prepare_links( $item );
+        $response->add_links( $links );
+
+        if ( ! empty( $links['self']['href'] ) ) {
+            $actions = $this->get_available_actions( $item, $request );
+
+            $self = $links['self']['href'];
+
+            foreach ( $actions as $rel ) {
+                $response->add_link( $rel, $self );
+            }
+        }
+
+        /**
+         * Filters the item data for a response.
+         *
+         * @since 1.0.13
+         *
+         * @param WP_REST_Response $response The response object.
+         * @param WPInv_Item    $item  The item object.
+         * @param WP_REST_Request  $request  Request object.
+         */
+        return apply_filters( "wpinv_rest_prepare_item", $response, $item, $request );
+    }
+
+    /**
+     * Gets an array of fields to be included on the response.
+     *
+     * Included fields are based on item schema and `_fields=` request argument.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return array Fields to be included in the response.
+     */
+    public function get_fields_for_response( $request ) {
+        $schema     = $this->get_item_schema();
+        $properties = isset( $schema['properties'] ) ? $schema['properties'] : array();
+
+        $additional_fields = $this->get_additional_fields();
+        foreach ( $additional_fields as $field_name => $field_options ) {
+            // For back-compat, include any field with an empty schema
+            // because it won't be present in $this->get_item_schema().
+            if ( is_null( $field_options['schema'] ) ) {
+                $properties[ $field_name ] = $field_options;
+            }
+        }
+
+        // Exclude fields that specify a different context than the request context.
+        $context = $request['context'];
+        if ( $context ) {
+            foreach ( $properties as $name => $options ) {
+                if ( ! empty( $options['context'] ) && ! in_array( $context, $options['context'], true ) ) {
+                    unset( $properties[ $name ] );
+                }
+            }
+        }
+
+        $fields = array_keys( $properties );
+
+        if ( ! isset( $request['_fields'] ) ) {
+            return $fields;
+        }
+        $requested_fields = wpinv_parse_list( $request['_fields'] );
+        if ( 0 === count( $requested_fields ) ) {
+            return $fields;
+        }
+        // Trim off outside whitespace from the comma delimited list.
+        $requested_fields = array_map( 'trim', $requested_fields );
+        // Always persist 'id', because it can be needed for add_additional_fields_to_object().
+        if ( in_array( 'id', $fields, true ) ) {
+            $requested_fields[] = 'id';
+        }
+        // Return the list of all requested fields which appear in the schema.
+        return array_reduce(
+            $requested_fields,
+            function( $response_fields, $field ) use ( $fields ) {
+                if ( in_array( $field, $fields, true ) ) {
+                    $response_fields[] = $field;
+                    return $response_fields;
+                }
+                // Check for nested fields if $field is not a direct match.
+                $nested_fields = explode( '.', $field );
+                // A nested field is included so long as its top-level property is
+                // present in the schema.
+                if ( in_array( $nested_fields[0], $fields, true ) ) {
+                    $response_fields[] = $field;
+                }
+                return $response_fields;
+            },
+            array()
+        );
+    }
+
+    /**
+     * Retrieves the item's schema, conforming to JSON Schema.
+     *
+     * @since 1.0.13
+     *
+     * @return array Item schema data.
+     */
+    public function get_item_schema() {
+
+        // Maybe retrieve the schema from cache.
+        if ( $this->schema ) {
+            return $this->add_additional_fields_schema( $this->schema );
+        }
+
+        $schema = array(
+            '$schema'    => 'http://json-schema.org/draft-04/schema#',
+            'title'      => $this->post_type,
+            'type'       => 'object',
+
+            // Base properties for every Item.
+            'properties' 		  => array(
+
+                'id'           => array(
+                    'description' => __( 'Unique identifier for the item.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'name'			  => array(
+                    'description' => __( 'The name for the item.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'summary'        => array(
+                    'description' => __( 'A summary for the item.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'price'        => array(
+                    'description' => __( 'The price for the item.', 'invoicing' ),
+                    'type'        => 'number',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'status'       => array(
+                    'description' => __( 'A named status for the item.', 'invoicing' ),
+                    'type'        => 'string',
+                    'enum'        => array_keys( get_post_stati( array( 'internal' => false ) ) ),
+                    'context'     => array( 'view', 'edit' ),
+                ),
+
+                'type'       => array(
+                    'description' => __( 'The item type.', 'invoicing' ),
+                    'type'        => 'string',
+                    'enum'        => wpinv_item_types(),
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'vat_rule'       => array(
+                    'description' => __( 'VAT rule applied to the item.', 'invoicing' ),
+                    'type'        => 'string',
+                    'enum'        => array( 'digital', 'physical' ),
+                    'context'     => array( 'view', 'edit' ),
+                ),
+
+                'vat_class'       => array(
+                    'description' => __( 'VAT class for the item.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit' ),
+                    'readonly'    => true,
+                ),
+
+                'custom_id'       => array(
+                    'description' => __( 'Custom id for the item.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
 				
-				'custom_name'       => array(
-					'description' => __( 'Custom name for the item.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'custom_singular_name'       => array(
-					'description' => __( 'Custom singular name for the item.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'dynamic_pricing'        => array(
-					'description' => __( 'Whether the item allows a user to set their own price.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'minimum_price'        => array(
-					'description' => __( 'For dynamic prices, this is the minimum price that a user can set.', 'invoicing' ),
-					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'is_recurring'        => array(
-					'description' => __( 'Whether the item is a subscription item.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'recurring_period'        => array(
-					'description' => __( 'The recurring period for a recurring item.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'enum'        => array( 'D', 'W', 'M', 'Y' ),
-				),
-
-				'recurring_interval'        => array(
-					'description' => __( 'The recurring interval for a subscription item.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'recurring_limit'        => array(
-					'description' => __( 'The maximum number of renewals for a subscription item.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'free_trial'        => array(
-					'description' => __( 'Whether the item has a free trial period.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'trial_period'        => array(
-					'description' => __( 'The trial period of a recurring item.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'enum'        => array( 'D', 'W', 'M', 'Y' ),
-				),
-
-				'trial_interval'        => array(
-					'description' => __( 'The trial interval for a subscription item.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'editable'        => array(
-					'description' => __( 'Whether or not the item is editable.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view', 'edit' ),
-				),
-
-			),
-		);
-
-		// Add helpful links to the item schem.
-		$schema['links'] = $this->get_schema_links();
-
-		/**
-		 * Filters the item schema for the REST API.
-		 *
-		 * Enables adding extra properties to items.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param array   $schema    The item schema.
-		 */
+                'custom_name'       => array(
+                    'description' => __( 'Custom name for the item.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'custom_singular_name'       => array(
+                    'description' => __( 'Custom singular name for the item.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'dynamic_pricing'        => array(
+                    'description' => __( 'Whether the item allows a user to set their own price.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'minimum_price'        => array(
+                    'description' => __( 'For dynamic prices, this is the minimum price that a user can set.', 'invoicing' ),
+                    'type'        => 'number',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'is_recurring'        => array(
+                    'description' => __( 'Whether the item is a subscription item.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'recurring_period'        => array(
+                    'description' => __( 'The recurring period for a recurring item.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'enum'        => array( 'D', 'W', 'M', 'Y' ),
+                ),
+
+                'recurring_interval'        => array(
+                    'description' => __( 'The recurring interval for a subscription item.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'recurring_limit'        => array(
+                    'description' => __( 'The maximum number of renewals for a subscription item.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'free_trial'        => array(
+                    'description' => __( 'Whether the item has a free trial period.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'trial_period'        => array(
+                    'description' => __( 'The trial period of a recurring item.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'enum'        => array( 'D', 'W', 'M', 'Y' ),
+                ),
+
+                'trial_interval'        => array(
+                    'description' => __( 'The trial interval for a subscription item.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'editable'        => array(
+                    'description' => __( 'Whether or not the item is editable.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view', 'edit' ),
+                ),
+
+            ),
+        );
+
+        // Add helpful links to the item schem.
+        $schema['links'] = $this->get_schema_links();
+
+        /**
+         * Filters the item schema for the REST API.
+         *
+         * Enables adding extra properties to items.
+         *
+         * @since 1.0.13
+         *
+         * @param array   $schema    The item schema.
+         */
         $schema = apply_filters( "wpinv_rest_item_schema", $schema );
 
-		//  Cache the item schema.
-		$this->schema = $schema;
+        //  Cache the item schema.
+        $this->schema = $schema;
 		
-		return $this->add_additional_fields_schema( $this->schema );
-	}
-
-	/**
-	 * Retrieve Link Description Objects that should be added to the Schema for the invoices collection.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @return array
-	 */
-	protected function get_schema_links() {
-
-		$href = rest_url( "{$this->namespace}/{$this->rest_base}/{id}" );
-
-		$links = array();
-
-		$links[] = array(
-			'rel'          => 'https://api.w.org/action-publish',
-			'title'        => __( 'The current user can publish this item.' ),
-			'href'         => $href,
-			'targetSchema' => array(
-				'type'       => 'object',
-				'properties' => array(
-					'status' => array(
-						'type' => 'string',
-						'enum' => array( 'publish', 'future' ),
-					),
-				),
-			),
-		);
-
-		return $links;
-	}
-
-	/**
-	 * Prepares links for the request.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WPInv_Item $item Item Object.
-	 * @return array Links for the given item.
-	 */
-	protected function prepare_links( $item ) {
-
-		// Prepare the base REST API endpoint for items.
-		$base = sprintf( '%s/%s', $this->namespace, $this->rest_base );
-
-		// Entity meta.
-		$links = array(
-			'self'       => array(
-				'href' => rest_url( trailingslashit( $base ) . $item->ID ),
-			),
-			'collection' => array(
-				'href' => rest_url( $base ),
-			),
-		);
-
-		/**
-		 * Filters the returned item links for the REST API.
-		 *
-		 * Enables adding extra links to item API responses.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param array   $links    Rest links.
-		 */
-		return apply_filters( "wpinv_rest_item_links", $links );
-
-	}
-
-	/**
-	 * Get the link relations available for the post and current user.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WPInv_Item   $item    Item object.
-	 * @param WP_REST_Request $request Request object.
-	 * @return array List of link relations.
-	 */
-	protected function get_available_actions( $item, $request ) {
-
-		if ( 'edit' !== $request['context'] ) {
-			return array();
-		}
-
-		$rels = array();
-
-		// Retrieve the post type object.
-		$post_type = get_post_type_object( $item->post_type );
-
-		// Mark item as published.
-		if ( current_user_can( $post_type->cap->publish_posts ) ) {
-			$rels[] = 'https://api.w.org/action-publish';
-		}
-
-		/**
-		 * Filters the available item link relations for the REST API.
-		 *
-		 * Enables adding extra link relation for the current user and request to item responses.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param array   $rels    Available link relations.
-		 */
-		return apply_filters( "wpinv_rest_item_link_relations", $rels );
-	}
-
-	/**
-	 * Handles rest requests for item types.
-	 *
-	 * @since 1.0.13
-	 * 
-	 * 
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function get_item_types() {
-		return rest_ensure_response( wpinv_get_item_types() );
-	}
+        return $this->add_additional_fields_schema( $this->schema );
+    }
+
+    /**
+     * Retrieve Link Description Objects that should be added to the Schema for the invoices collection.
+     *
+     * @since 1.0.13
+     *
+     * @return array
+     */
+    protected function get_schema_links() {
+
+        $href = rest_url( "{$this->namespace}/{$this->rest_base}/{id}" );
+
+        $links = array();
+
+        $links[] = array(
+            'rel'          => 'https://api.w.org/action-publish',
+            'title'        => __( 'The current user can publish this item.' ),
+            'href'         => $href,
+            'targetSchema' => array(
+                'type'       => 'object',
+                'properties' => array(
+                    'status' => array(
+                        'type' => 'string',
+                        'enum' => array( 'publish', 'future' ),
+                    ),
+                ),
+            ),
+        );
+
+        return $links;
+    }
+
+    /**
+     * Prepares links for the request.
+     *
+     * @since 1.0.13
+     *
+     * @param WPInv_Item $item Item Object.
+     * @return array Links for the given item.
+     */
+    protected function prepare_links( $item ) {
+
+        // Prepare the base REST API endpoint for items.
+        $base = sprintf( '%s/%s', $this->namespace, $this->rest_base );
+
+        // Entity meta.
+        $links = array(
+            'self'       => array(
+                'href' => rest_url( trailingslashit( $base ) . $item->ID ),
+            ),
+            'collection' => array(
+                'href' => rest_url( $base ),
+            ),
+        );
+
+        /**
+         * Filters the returned item links for the REST API.
+         *
+         * Enables adding extra links to item API responses.
+         *
+         * @since 1.0.13
+         *
+         * @param array   $links    Rest links.
+         */
+        return apply_filters( "wpinv_rest_item_links", $links );
+
+    }
+
+    /**
+     * Get the link relations available for the post and current user.
+     *
+     * @since 1.0.13
+     *
+     * @param WPInv_Item   $item    Item object.
+     * @param WP_REST_Request $request Request object.
+     * @return array List of link relations.
+     */
+    protected function get_available_actions( $item, $request ) {
+
+        if ( 'edit' !== $request['context'] ) {
+            return array();
+        }
+
+        $rels = array();
+
+        // Retrieve the post type object.
+        $post_type = get_post_type_object( $item->post_type );
+
+        // Mark item as published.
+        if ( current_user_can( $post_type->cap->publish_posts ) ) {
+            $rels[] = 'https://api.w.org/action-publish';
+        }
+
+        /**
+         * Filters the available item link relations for the REST API.
+         *
+         * Enables adding extra link relation for the current user and request to item responses.
+         *
+         * @since 1.0.13
+         *
+         * @param array   $rels    Available link relations.
+         */
+        return apply_filters( "wpinv_rest_item_link_relations", $rels );
+    }
+
+    /**
+     * Handles rest requests for item types.
+     *
+     * @since 1.0.13
+     * 
+     * 
+     * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+     */
+    public function get_item_types() {
+        return rest_ensure_response( wpinv_get_item_types() );
+    }
 
     
 }
\ No newline at end of file

includes/gateways/paypal.php

Indentation +255 added lines, -255 removed lines

@@ -219,262 +219,262 @@ 
 add_filter( 'wpinv_paypal_args', 'wpinv_get_paypal_recurring_args', 10, 3 );
 
 function wpinv_process_paypal_ipn() {
-	// Check the request method is POST
-	if ( isset( $_SERVER['REQUEST_METHOD'] ) && $_SERVER['REQUEST_METHOD'] != 'POST' ) {
-		return;
-	}
-
-	// Set initial post data to empty string
-	$post_data = '';
-
-	// Fallback just in case post_max_size is lower than needed
-	if ( ini_get( 'allow_url_fopen' ) ) {
-		$post_data = file_get_contents( 'php://input' );
-	} else {
-		// If allow_url_fopen is not enabled, then make sure that post_max_size is large enough
-		ini_set( 'post_max_size', '12M' );
-	}
-	// Start the encoded data collection with notification command
-	$encoded_data = 'cmd=_notify-validate';
-
-	// Get current arg separator
-	$arg_separator = wpinv_get_php_arg_separator_output();
-
-	// Verify there is a post_data
-	if ( $post_data || strlen( $post_data ) > 0 ) {
-		// Append the data
-		$encoded_data .= $arg_separator.$post_data;
-	} else {
-		// Check if POST is empty
-		if ( empty( $_POST ) ) {
-			// Nothing to do
-			return;
-		} else {
-			// Loop through each POST
-			foreach ( $_POST as $key => $value ) {
-				// Encode the value and append the data
-				$encoded_data .= $arg_separator."$key=" . urlencode( $value );
-			}
-		}
-	}
-
-	// Convert collected post data to an array
-	wp_parse_str( $encoded_data, $encoded_data_array );
-
-	foreach ( $encoded_data_array as $key => $value ) {
-		if ( false !== strpos( $key, 'amp;' ) ) {
-			$new_key = str_replace( '&', '&', $key );
-			$new_key = str_replace( 'amp;', '&' , $new_key );
-
-			unset( $encoded_data_array[ $key ] );
-			$encoded_data_array[ $new_key ] = $value;
-		}
-	}
-
-	// Get the PayPal redirect uri
-	$paypal_redirect = wpinv_get_paypal_redirect( true );
-
-	if ( !wpinv_get_option( 'disable_paypal_verification', false ) ) {
-		// Validate the IPN
-
-		$remote_post_vars      = array(
-			'method'           => 'POST',
-			'timeout'          => 45,
-			'redirection'      => 5,
-			'httpversion'      => '1.1',
-			'blocking'         => true,
-			'headers'          => array(
-				'host'         => 'www.paypal.com',
-				'connection'   => 'close',
-				'content-type' => 'application/x-www-form-urlencoded',
-				'post'         => '/cgi-bin/webscr HTTP/1.1',
-
-			),
-			'sslverify'        => false,
-			'body'             => $encoded_data_array
-		);
-
-		// Get response
-		$api_response = wp_remote_post( wpinv_get_paypal_redirect(), $remote_post_vars );
-
-		if ( is_wp_error( $api_response ) ) {
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
-			return; // Something went wrong
-		}
-
-		if ( $api_response['body'] !== 'VERIFIED' && wpinv_get_option( 'disable_paypal_verification', false ) ) {
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
-			return; // Response not okay
-		}
-	}
-
-	// Check if $post_data_array has been populated
-	if ( !is_array( $encoded_data_array ) && !empty( $encoded_data_array ) )
-		return;
-
-	$defaults = array(
-		'txn_type'       => '',
-		'payment_status' => ''
-	);
-
-	$encoded_data_array = wp_parse_args( $encoded_data_array, $defaults );
-
-	$invoice_id = isset( $encoded_data_array['custom'] ) ? absint( $encoded_data_array['custom'] ) : 0;
+    // Check the request method is POST
+    if ( isset( $_SERVER['REQUEST_METHOD'] ) && $_SERVER['REQUEST_METHOD'] != 'POST' ) {
+        return;
+    }
+
+    // Set initial post data to empty string
+    $post_data = '';
+
+    // Fallback just in case post_max_size is lower than needed
+    if ( ini_get( 'allow_url_fopen' ) ) {
+        $post_data = file_get_contents( 'php://input' );
+    } else {
+        // If allow_url_fopen is not enabled, then make sure that post_max_size is large enough
+        ini_set( 'post_max_size', '12M' );
+    }
+    // Start the encoded data collection with notification command
+    $encoded_data = 'cmd=_notify-validate';
+
+    // Get current arg separator
+    $arg_separator = wpinv_get_php_arg_separator_output();
+
+    // Verify there is a post_data
+    if ( $post_data || strlen( $post_data ) > 0 ) {
+        // Append the data
+        $encoded_data .= $arg_separator.$post_data;
+    } else {
+        // Check if POST is empty
+        if ( empty( $_POST ) ) {
+            // Nothing to do
+            return;
+        } else {
+            // Loop through each POST
+            foreach ( $_POST as $key => $value ) {
+                // Encode the value and append the data
+                $encoded_data .= $arg_separator."$key=" . urlencode( $value );
+            }
+        }
+    }
+
+    // Convert collected post data to an array
+    wp_parse_str( $encoded_data, $encoded_data_array );
+
+    foreach ( $encoded_data_array as $key => $value ) {
+        if ( false !== strpos( $key, 'amp;' ) ) {
+            $new_key = str_replace( '&', '&', $key );
+            $new_key = str_replace( 'amp;', '&' , $new_key );
+
+            unset( $encoded_data_array[ $key ] );
+            $encoded_data_array[ $new_key ] = $value;
+        }
+    }
+
+    // Get the PayPal redirect uri
+    $paypal_redirect = wpinv_get_paypal_redirect( true );
+
+    if ( !wpinv_get_option( 'disable_paypal_verification', false ) ) {
+        // Validate the IPN
+
+        $remote_post_vars      = array(
+            'method'           => 'POST',
+            'timeout'          => 45,
+            'redirection'      => 5,
+            'httpversion'      => '1.1',
+            'blocking'         => true,
+            'headers'          => array(
+                'host'         => 'www.paypal.com',
+                'connection'   => 'close',
+                'content-type' => 'application/x-www-form-urlencoded',
+                'post'         => '/cgi-bin/webscr HTTP/1.1',
+
+            ),
+            'sslverify'        => false,
+            'body'             => $encoded_data_array
+        );
+
+        // Get response
+        $api_response = wp_remote_post( wpinv_get_paypal_redirect(), $remote_post_vars );
+
+        if ( is_wp_error( $api_response ) ) {
+            wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
+            return; // Something went wrong
+        }
+
+        if ( $api_response['body'] !== 'VERIFIED' && wpinv_get_option( 'disable_paypal_verification', false ) ) {
+            wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
+            return; // Response not okay
+        }
+    }
+
+    // Check if $post_data_array has been populated
+    if ( !is_array( $encoded_data_array ) && !empty( $encoded_data_array ) )
+        return;
+
+    $defaults = array(
+        'txn_type'       => '',
+        'payment_status' => ''
+    );
+
+    $encoded_data_array = wp_parse_args( $encoded_data_array, $defaults );
+
+    $invoice_id = isset( $encoded_data_array['custom'] ) ? absint( $encoded_data_array['custom'] ) : 0;
     
-	wpinv_error_log( $encoded_data_array['txn_type'], 'PayPal txn_type', __FILE__, __LINE__ );
-	wpinv_error_log( $encoded_data_array, 'PayPal IPN response', __FILE__, __LINE__ );
-
-	if ( has_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'] ) ) {
-		// Allow PayPal IPN types to be processed separately
-		do_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'], $encoded_data_array, $invoice_id );
-	} else {
-		// Fallback to web accept just in case the txn_type isn't present
-		do_action( 'wpinv_paypal_web_accept', $encoded_data_array, $invoice_id );
-	}
-	exit;
+    wpinv_error_log( $encoded_data_array['txn_type'], 'PayPal txn_type', __FILE__, __LINE__ );
+    wpinv_error_log( $encoded_data_array, 'PayPal IPN response', __FILE__, __LINE__ );
+
+    if ( has_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'] ) ) {
+        // Allow PayPal IPN types to be processed separately
+        do_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'], $encoded_data_array, $invoice_id );
+    } else {
+        // Fallback to web accept just in case the txn_type isn't present
+        do_action( 'wpinv_paypal_web_accept', $encoded_data_array, $invoice_id );
+    }
+    exit;
 }
 add_action( 'wpinv_verify_paypal_ipn', 'wpinv_process_paypal_ipn' );
 
 function wpinv_process_paypal_web_accept_and_cart( $data, $invoice_id ) {
-	if ( $data['txn_type'] != 'web_accept' && $data['txn_type'] != 'cart' && $data['payment_status'] != 'Refunded' ) {
-		return;
-	}
-
-	if( empty( $invoice_id ) ) {
-		return;
-	}
-
-	// Collect payment details
-	$purchase_key   = isset( $data['invoice'] ) ? $data['invoice'] : $data['item_number'];
-	$paypal_amount  = $data['mc_gross'];
-	$payment_status = strtolower( $data['payment_status'] );
-	$currency_code  = strtolower( $data['mc_currency'] );
-	$business_email = isset( $data['business'] ) && is_email( $data['business'] ) ? trim( $data['business'] ) : trim( $data['receiver_email'] );
-	$payment_meta   = wpinv_get_invoice_meta( $invoice_id );
-
-	if ( wpinv_get_payment_gateway( $invoice_id ) != 'paypal' ) {
-		return; // this isn't a PayPal standard IPN
-	}
-
-	// Verify payment recipient
-	if ( strcasecmp( $business_email, trim( wpinv_get_option( 'paypal_email', false ) ) ) != 0 ) {
-		wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid business email in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-		wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-		wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid PayPal business email.', 'invoicing' ), '', '', true );
-		return;
-	}
-
-	// Verify payment currency
-	if ( $currency_code != strtolower( $payment_meta['currency'] ) ) {
-		wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid currency in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-		wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-		wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid currency in PayPal IPN.', 'invoicing' ), '', '', true );
-		return;
-	}
-
-	if ( !wpinv_get_payment_user_email( $invoice_id ) ) {
-		// This runs when a Buy Now purchase was made. It bypasses checkout so no personal info is collected until PayPal
-		// No email associated with purchase, so store from PayPal
-		wpinv_update_invoice_meta( $invoice_id, '_wpinv_email', $data['payer_email'] );
-
-		// Setup and store the customer's details
-		$user_info = array(
-			'user_id'    => '-1',
-			'email'      => sanitize_text_field( $data['payer_email'] ),
-			'first_name' => sanitize_text_field( $data['first_name'] ),
-			'last_name'  => sanitize_text_field( $data['last_name'] ),
-			'discount'   => '',
-		);
-		$user_info['address'] = ! empty( $data['address_street']       ) ? sanitize_text_field( $data['address_street'] )       : false;
-		$user_info['city']    = ! empty( $data['address_city']         ) ? sanitize_text_field( $data['address_city'] )         : false;
-		$user_info['state']   = ! empty( $data['address_state']        ) ? sanitize_text_field( $data['address_state'] )        : false;
-		$user_info['country'] = ! empty( $data['address_country_code'] ) ? sanitize_text_field( $data['address_country_code'] ) : false;
-		$user_info['zip']     = ! empty( $data['address_zip']          ) ? sanitize_text_field( $data['address_zip'] )          : false;
-
-		$payment_meta['user_info'] = $user_info;
-		wpinv_update_invoice_meta( $invoice_id, '_wpinv_payment_meta', $payment_meta );
-	}
-
-	if ( $payment_status == 'refunded' || $payment_status == 'reversed' ) {
-		// Process a refund
-		wpinv_process_paypal_refund( $data, $invoice_id );
-	} else {
-		if ( get_post_status( $invoice_id ) == 'publish' ) {
-			return; // Only paid payments once
-		}
-
-		// Retrieve the total purchase amount (before PayPal)
-		$payment_amount = wpinv_payment_total( $invoice_id );
-
-		if ( number_format( (float) $paypal_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
-			// The prices don't match
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid payment amount in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-			wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-			wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid amount in PayPal IPN.', 'invoicing' ), '', '', true );
-			return;
-		}
-		if ( $purchase_key != wpinv_get_payment_key( $invoice_id ) ) {
-			// Purchase keys don't match
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid purchase key in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-			wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-			wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid purchase key in PayPal IPN.', 'invoicing' ), '', '', true );
-			return;
-		}
-
-		if ( 'complete' == $payment_status || 'completed' == $payment_status || 'processed' == $payment_status || wpinv_is_test_mode( 'paypal' ) ) {
-			wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $data['txn_id'] ), '', '', true );
-			wpinv_set_payment_transaction_id( $invoice_id, $data['txn_id'] );
-			wpinv_update_payment_status( $invoice_id, 'publish' );
-		} else if ( 'pending' == $payment_status && isset( $data['pending_reason'] ) ) {
-			// Look for possible pending reasons, such as an echeck
-			$note = '';
-
-			switch( strtolower( $data['pending_reason'] ) ) {
-				case 'echeck' :
-					$note = __( 'Payment made via eCheck and will clear automatically in 5-8 days', 'invoicing' );
-					break;
+    if ( $data['txn_type'] != 'web_accept' && $data['txn_type'] != 'cart' && $data['payment_status'] != 'Refunded' ) {
+        return;
+    }
+
+    if( empty( $invoice_id ) ) {
+        return;
+    }
+
+    // Collect payment details
+    $purchase_key   = isset( $data['invoice'] ) ? $data['invoice'] : $data['item_number'];
+    $paypal_amount  = $data['mc_gross'];
+    $payment_status = strtolower( $data['payment_status'] );
+    $currency_code  = strtolower( $data['mc_currency'] );
+    $business_email = isset( $data['business'] ) && is_email( $data['business'] ) ? trim( $data['business'] ) : trim( $data['receiver_email'] );
+    $payment_meta   = wpinv_get_invoice_meta( $invoice_id );
+
+    if ( wpinv_get_payment_gateway( $invoice_id ) != 'paypal' ) {
+        return; // this isn't a PayPal standard IPN
+    }
+
+    // Verify payment recipient
+    if ( strcasecmp( $business_email, trim( wpinv_get_option( 'paypal_email', false ) ) ) != 0 ) {
+        wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid business email in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
+        wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
+        wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid PayPal business email.', 'invoicing' ), '', '', true );
+        return;
+    }
+
+    // Verify payment currency
+    if ( $currency_code != strtolower( $payment_meta['currency'] ) ) {
+        wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid currency in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
+        wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
+        wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid currency in PayPal IPN.', 'invoicing' ), '', '', true );
+        return;
+    }
+
+    if ( !wpinv_get_payment_user_email( $invoice_id ) ) {
+        // This runs when a Buy Now purchase was made. It bypasses checkout so no personal info is collected until PayPal
+        // No email associated with purchase, so store from PayPal
+        wpinv_update_invoice_meta( $invoice_id, '_wpinv_email', $data['payer_email'] );
+
+        // Setup and store the customer's details
+        $user_info = array(
+            'user_id'    => '-1',
+            'email'      => sanitize_text_field( $data['payer_email'] ),
+            'first_name' => sanitize_text_field( $data['first_name'] ),
+            'last_name'  => sanitize_text_field( $data['last_name'] ),
+            'discount'   => '',
+        );
+        $user_info['address'] = ! empty( $data['address_street']       ) ? sanitize_text_field( $data['address_street'] )       : false;
+        $user_info['city']    = ! empty( $data['address_city']         ) ? sanitize_text_field( $data['address_city'] )         : false;
+        $user_info['state']   = ! empty( $data['address_state']        ) ? sanitize_text_field( $data['address_state'] )        : false;
+        $user_info['country'] = ! empty( $data['address_country_code'] ) ? sanitize_text_field( $data['address_country_code'] ) : false;
+        $user_info['zip']     = ! empty( $data['address_zip']          ) ? sanitize_text_field( $data['address_zip'] )          : false;
+
+        $payment_meta['user_info'] = $user_info;
+        wpinv_update_invoice_meta( $invoice_id, '_wpinv_payment_meta', $payment_meta );
+    }
+
+    if ( $payment_status == 'refunded' || $payment_status == 'reversed' ) {
+        // Process a refund
+        wpinv_process_paypal_refund( $data, $invoice_id );
+    } else {
+        if ( get_post_status( $invoice_id ) == 'publish' ) {
+            return; // Only paid payments once
+        }
+
+        // Retrieve the total purchase amount (before PayPal)
+        $payment_amount = wpinv_payment_total( $invoice_id );
+
+        if ( number_format( (float) $paypal_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
+            // The prices don't match
+            wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid payment amount in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
+            wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
+            wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid amount in PayPal IPN.', 'invoicing' ), '', '', true );
+            return;
+        }
+        if ( $purchase_key != wpinv_get_payment_key( $invoice_id ) ) {
+            // Purchase keys don't match
+            wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid purchase key in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
+            wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
+            wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid purchase key in PayPal IPN.', 'invoicing' ), '', '', true );
+            return;
+        }
+
+        if ( 'complete' == $payment_status || 'completed' == $payment_status || 'processed' == $payment_status || wpinv_is_test_mode( 'paypal' ) ) {
+            wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $data['txn_id'] ), '', '', true );
+            wpinv_set_payment_transaction_id( $invoice_id, $data['txn_id'] );
+            wpinv_update_payment_status( $invoice_id, 'publish' );
+        } else if ( 'pending' == $payment_status && isset( $data['pending_reason'] ) ) {
+            // Look for possible pending reasons, such as an echeck
+            $note = '';
+
+            switch( strtolower( $data['pending_reason'] ) ) {
+                case 'echeck' :
+                    $note = __( 'Payment made via eCheck and will clear automatically in 5-8 days', 'invoicing' );
+                    break;
 				
                 case 'address' :
-					$note = __( 'Payment requires a confirmed customer address and must be accepted manually through PayPal', 'invoicing' );
-					break;
+                    $note = __( 'Payment requires a confirmed customer address and must be accepted manually through PayPal', 'invoicing' );
+                    break;
 				
                 case 'intl' :
-					$note = __( 'Payment must be accepted manually through PayPal due to international account regulations', 'invoicing' );
-					break;
+                    $note = __( 'Payment must be accepted manually through PayPal due to international account regulations', 'invoicing' );
+                    break;
 				
                 case 'multi-currency' :
-					$note = __( 'Payment received in non-shop currency and must be accepted manually through PayPal', 'invoicing' );
-					break;
+                    $note = __( 'Payment received in non-shop currency and must be accepted manually through PayPal', 'invoicing' );
+                    break;
 				
                 case 'paymentreview' :
                 case 'regulatory_review' :
-					$note = __( 'Payment is being reviewed by PayPal staff as high-risk or in possible violation of government regulations', 'invoicing' );
-					break;
+                    $note = __( 'Payment is being reviewed by PayPal staff as high-risk or in possible violation of government regulations', 'invoicing' );
+                    break;
 				
                 case 'unilateral' :
-					$note = __( 'Payment was sent to non-confirmed or non-registered email address.', 'invoicing' );
-					break;
+                    $note = __( 'Payment was sent to non-confirmed or non-registered email address.', 'invoicing' );
+                    break;
 				
                 case 'upgrade' :
-					$note = __( 'PayPal account must be upgraded before this payment can be accepted', 'invoicing' );
-					break;
+                    $note = __( 'PayPal account must be upgraded before this payment can be accepted', 'invoicing' );
+                    break;
 				
                 case 'verify' :
-					$note = __( 'PayPal account is not verified. Verify account in order to accept this payment', 'invoicing' );
-					break;
-
-				case 'other' :
-					$note = __( 'Payment is pending for unknown reasons. Contact PayPal support for assistance', 'invoicing' );
-					break;
-			}
-
-			if ( ! empty( $note ) ) {
-				wpinv_insert_payment_note( $invoice_id, $note, '', '', true );
-			}
-		} else {
-			wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal IPN has been received with invalid payment status: %s', 'invoicing' ), $payment_status ), '', '', true );
-		}
-	}
+                    $note = __( 'PayPal account is not verified. Verify account in order to accept this payment', 'invoicing' );
+                    break;
+
+                case 'other' :
+                    $note = __( 'Payment is pending for unknown reasons. Contact PayPal support for assistance', 'invoicing' );
+                    break;
+            }
+
+            if ( ! empty( $note ) ) {
+                wpinv_insert_payment_note( $invoice_id, $note, '', '', true );
+            }
+        } else {
+            wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal IPN has been received with invalid payment status: %s', 'invoicing' ), $payment_status ), '', '', true );
+        }
+    }
 }
 add_action( 'wpinv_paypal_web_accept', 'wpinv_process_paypal_web_accept_and_cart', 10, 2 );
 
@@ -668,34 +668,34 @@ 
 }
 
 function wpinv_process_paypal_refund( $data, $invoice_id = 0 ) {
-	// Collect payment details
+    // Collect payment details
 
-	if( empty( $invoice_id ) ) {
-		return;
-	}
+    if( empty( $invoice_id ) ) {
+        return;
+    }
 
-	if ( get_post_status( $invoice_id ) == 'wpi-refunded' ) {
-		return; // Only refund payments once
-	}
+    if ( get_post_status( $invoice_id ) == 'wpi-refunded' ) {
+        return; // Only refund payments once
+    }
 
-	$payment_amount = wpinv_payment_total( $invoice_id );
-	$refund_amount  = $data['mc_gross'] * -1;
+    $payment_amount = wpinv_payment_total( $invoice_id );
+    $refund_amount  = $data['mc_gross'] * -1;
 
-	do_action( 'wpinv_paypal_refund_request', $data, $invoice_id );
+    do_action( 'wpinv_paypal_refund_request', $data, $invoice_id );
 
-	if ( number_format( (float) $refund_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
-		wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal partial refund of %s processed for transaction #%s for reason: %s', 'invoicing' ), (float)$refund_amount . ' '. $data['mc_currency'], $data['parent_txn_id'], $data['reason_code'] ), '', '', true );
+    if ( number_format( (float) $refund_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
+        wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal partial refund of %s processed for transaction #%s for reason: %s', 'invoicing' ), (float)$refund_amount . ' '. $data['mc_currency'], $data['parent_txn_id'], $data['reason_code'] ), '', '', true );
 
-		do_action( 'wpinv_paypal_invoice_partially_refunded', $data, $invoice_id, $refund_amount );
+        do_action( 'wpinv_paypal_invoice_partially_refunded', $data, $invoice_id, $refund_amount );
 
-		return; // This is a partial refund
-	}
+        return; // This is a partial refund
+    }
 
-	wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Payment #%s Refunded for reason: %s', 'invoicing' ), $data['parent_txn_id'], $data['reason_code'] ), '', '', true );
-	wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Refund Transaction ID: %s', 'invoicing' ), $data['txn_id'] ), '', '', true );
-	wpinv_update_payment_status( $invoice_id, 'wpi-refunded' );
+    wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Payment #%s Refunded for reason: %s', 'invoicing' ), $data['parent_txn_id'], $data['reason_code'] ), '', '', true );
+    wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Refund Transaction ID: %s', 'invoicing' ), $data['txn_id'] ), '', '', true );
+    wpinv_update_payment_status( $invoice_id, 'wpi-refunded' );
 
-	do_action( 'wpinv_paypal_invoice_fully_refunded', $data, $invoice_id );
+    do_action( 'wpinv_paypal_invoice_fully_refunded', $data, $invoice_id );
 }
 
 function wpinv_get_paypal_redirect( $ssl_check = false ) {

includes/api/class-wpinv-rest-discounts-controller.php

Indentation +970 added lines, -970 removed lines

@@ -20,91 +20,91 @@ 
 class WPInv_REST_Discounts_Controller extends WP_REST_Posts_Controller {
 
     /**
-	 * Post type.
-	 *
-	 * @var string
-	 */
-	protected $post_type = 'wpi_discount';
+     * Post type.
+     *
+     * @var string
+     */
+    protected $post_type = 'wpi_discount';
 	
-	/**
-	 * Cached results of get_item_schema.
-	 *
-	 * @since 1.0.13
-	 * @var array
-	 */
-	protected $schema;
+    /**
+     * Cached results of get_item_schema.
+     *
+     * @since 1.0.13
+     * @var array
+     */
+    protected $schema;
 
     /**
-	 * Constructor.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param string $namespace Api Namespace
-	 */
-	public function __construct( $namespace ) {
+     * Constructor.
+     *
+     * @since 1.0.13
+     *
+     * @param string $namespace Api Namespace
+     */
+    public function __construct( $namespace ) {
         
         // Set api namespace...
-		$this->namespace = $namespace;
+        $this->namespace = $namespace;
 
         // ... and the rest base
         $this->rest_base = 'discounts';
 		
     }
 	
-	/**
-	 * Registers the routes for the objects of the controller.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @see register_rest_route()
-	 */
-	public function register_routes() {
-
-		parent::register_routes();
-
-		register_rest_route(
-			$this->namespace,
-			'/' . $this->rest_base . '/discount-types',
-			array(
-				array(
-					'methods'             => WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'get_discount_types' ),
-				),
-			)
-		);
-
-	}
+    /**
+     * Registers the routes for the objects of the controller.
+     *
+     * @since 1.0.13
+     *
+     * @see register_rest_route()
+     */
+    public function register_routes() {
+
+        parent::register_routes();
+
+        register_rest_route(
+            $this->namespace,
+            '/' . $this->rest_base . '/discount-types',
+            array(
+                array(
+                    'methods'             => WP_REST_Server::READABLE,
+                    'callback'            => array( $this, 'get_discount_types' ),
+                ),
+            )
+        );
+
+    }
 
     /**
-	 * Checks if a given request has access to read discounts.
+     * Checks if a given request has access to read discounts.
      * 
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return true|WP_Error True if the request has read access, WP_Error object otherwise.
-	 */
-	public function get_items_permissions_check( $request ) {
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return true|WP_Error True if the request has read access, WP_Error object otherwise.
+     */
+    public function get_items_permissions_check( $request ) {
 	
-		if ( wpinv_current_user_can_manage_invoicing() ) {
-			return true;
-		}
+        if ( wpinv_current_user_can_manage_invoicing() ) {
+            return true;
+        }
 
-		return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to view invoice discounts.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
+        return new WP_Error( 'rest_forbidden_context', __( 'Sorry, you are not allowed to view invoice discounts.', 'invoicing' ), array( 'status' => rest_authorization_required_code() ) );
 
     }
     
     /**
-	 * Retrieves a collection of discounts.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function get_items( $request ) {
+     * Retrieves a collection of discounts.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+     */
+    public function get_items( $request ) {
 		
-		// Retrieve the list of registered item query parameters.
+        // Retrieve the list of registered item query parameters.
         $registered = $this->get_collection_params();
         
         $args       = array();
@@ -115,52 +115,52 @@ 
                 $args[ $key ] = $request[ $key];
             }
 
-		} 
-
-		/**
-		 * Filters the wpinv_get_all_discounts arguments for discounts rest requests.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 *
-		 * @param array           $args    Key value array of query var to query value.
-		 * @param WP_REST_Request $request The request used.
-		 */
+        } 
+
+        /**
+         * Filters the wpinv_get_all_discounts arguments for discounts rest requests.
+         *
+         *
+         * @since 1.0.13
+         *
+         *
+         * @param array           $args    Key value array of query var to query value.
+         * @param WP_REST_Request $request The request used.
+         */
         $args       = apply_filters( "wpinv_rest_get_discounts_arguments", $args, $request, $this );
 		
-		// Special args
-		$args[ 'return' ]   = 'objects';
-		$args[ 'paginate' ] = true;
+        // Special args
+        $args[ 'return' ]   = 'objects';
+        $args[ 'paginate' ] = true;
 
         // Run the query.
-		$query = wpinv_get_all_discounts( $args );
+        $query = wpinv_get_all_discounts( $args );
 		
-		// Prepare the retrieved discounts
-		$discounts = array();
-		foreach( $query->discounts as $discount ) {
-
-			$data       = $this->prepare_item_for_response( $discount, $request );
-			$discounts[]    = $this->prepare_response_for_collection( $data );
-
-		}
-
-		// Prepare the response.
-		$response = rest_ensure_response( $discounts );
-		$response->header( 'X-WP-Total', (int) $query->total );
-		$response->header( 'X-WP-TotalPages', (int) $query->max_num_pages );
-
-		/**
-		 * Filters the responses for discount requests.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 *
-		 * @param arrWP_REST_Response $response    Response object.
-		 * @param WP_REST_Request     $request The request used.
+        // Prepare the retrieved discounts
+        $discounts = array();
+        foreach( $query->discounts as $discount ) {
+
+            $data       = $this->prepare_item_for_response( $discount, $request );
+            $discounts[]    = $this->prepare_response_for_collection( $data );
+
+        }
+
+        // Prepare the response.
+        $response = rest_ensure_response( $discounts );
+        $response->header( 'X-WP-Total', (int) $query->total );
+        $response->header( 'X-WP-TotalPages', (int) $query->max_num_pages );
+
+        /**
+         * Filters the responses for discount requests.
+         *
+         *
+         * @since 1.0.13
+         *
+         *
+         * @param arrWP_REST_Response $response    Response object.
+         * @param WP_REST_Request     $request The request used.
          * @param array               $args Array of args used to retrieve the discounts
-		 */
+         */
         $response       = apply_filters( "wpinv_rest_discounts_response", $response, $request, $args );
 
         return rest_ensure_response( $response );
@@ -168,25 +168,25 @@ 
     }
 
     /**
-	 * Get the post, if the ID is valid.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param int $discount_id Supplied ID.
-	 * @return WP_Post|WP_Error Post object if ID is valid, WP_Error otherwise.
-	 */
-	protected function get_post( $discount_id ) {
+     * Get the post, if the ID is valid.
+     *
+     * @since 1.0.13
+     *
+     * @param int $discount_id Supplied ID.
+     * @return WP_Post|WP_Error Post object if ID is valid, WP_Error otherwise.
+     */
+    protected function get_post( $discount_id ) {
 		
-		$error     = new WP_Error( 'rest_item_invalid_id', __( 'Invalid discount ID.', 'invoicing' ), array( 'status' => 404 ) );
+        $error     = new WP_Error( 'rest_item_invalid_id', __( 'Invalid discount ID.', 'invoicing' ), array( 'status' => 404 ) );
 
         // Ids start from 1
         if ( (int) $discount_id <= 0 ) {
-			return $error;
-		}
+            return $error;
+        }
 
-		$discount = wpinv_get_discount( (int) $discount_id );
-		if ( empty( $discount ) ) {
-			return $error;
+        $discount = wpinv_get_discount( (int) $discount_id );
+        if ( empty( $discount ) ) {
+            return $error;
         }
 
         return $discount;
@@ -194,25 +194,25 @@ 
     }
 
     /**
-	 * Checks if a given request has access to read a discount.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return bool|WP_Error True if the request has read access for the invoice item, WP_Error object otherwise.
-	 */
-	public function get_item_permissions_check( $request ) {
+     * Checks if a given request has access to read a discount.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return bool|WP_Error True if the request has read access for the invoice item, WP_Error object otherwise.
+     */
+    public function get_item_permissions_check( $request ) {
 
         // Retrieve the discount object.
         $discount = $this->get_post( $request['id'] );
         
         // Ensure it is valid.
-		if ( is_wp_error( $discount ) ) {
-			return $discount;
-		}
+        if ( is_wp_error( $discount ) ) {
+            return $discount;
+        }
 
-		if ( ! wpinv_current_user_can_manage_invoicing() ) {
-			return new WP_Error(
+        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+            return new WP_Error(
                 'rest_cannot_view', 
                 __( 'Sorry, you are not allowed to view this discount.', 'invoicing' ), 
                 array( 
@@ -221,40 +221,40 @@ 
             );
         }
 
-		return true;
+        return true;
     }
     
     /**
-	 * Retrieves a single invoice item.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function get_item( $request ) {
+     * Retrieves a single invoice item.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+     */
+    public function get_item( $request ) {
 
         // Fetch the discount.
         $discount = $this->get_post( $request['id'] );
         
         // Abort early if it does not exist
-		if ( is_wp_error( $discount ) ) {
-			return $discount;
-		}
-
-		// Prepare the response
-		$response = $this->prepare_item_for_response( $discount, $request );
-
-		/**
-		 * Filters the responses for single discount requests.
-		 *
-		 *
-		 * @since 1.0.13
-		 * @var WP_HTTP_Response
-		 *
-		 * @param WP_HTTP_Response $response Response.
-		 * @param WP_REST_Request  $request The request used.
-		 */
+        if ( is_wp_error( $discount ) ) {
+            return $discount;
+        }
+
+        // Prepare the response
+        $response = $this->prepare_item_for_response( $discount, $request );
+
+        /**
+         * Filters the responses for single discount requests.
+         *
+         *
+         * @since 1.0.13
+         * @var WP_HTTP_Response
+         *
+         * @param WP_HTTP_Response $response Response.
+         * @param WP_REST_Request  $request The request used.
+         */
         $response       = apply_filters( "wpinv_rest_get_discount_response", $response, $request );
 
         return rest_ensure_response( $response );
@@ -262,26 +262,26 @@ 
     }
     
     /**
-	 * Checks if a given request has access to create an invoice item.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return true|WP_Error True if the request has access to create items, WP_Error object otherwise.
-	 */
-	public function create_item_permissions_check( $request ) {
+     * Checks if a given request has access to create an invoice item.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return true|WP_Error True if the request has access to create items, WP_Error object otherwise.
+     */
+    public function create_item_permissions_check( $request ) {
 	
-		if ( ! empty( $request['id'] ) ) {
-			return new WP_Error( 'rest_item_exists', __( 'Cannot create existing item.', 'invoicing' ), array( 'status' => 400 ) );
-		}
+        if ( ! empty( $request['id'] ) ) {
+            return new WP_Error( 'rest_item_exists', __( 'Cannot create existing item.', 'invoicing' ), array( 'status' => 400 ) );
+        }
 
-		if ( wpinv_current_user_can_manage_invoicing() ) {
-			return true;
-		}
+        if ( wpinv_current_user_can_manage_invoicing() ) {
+            return true;
+        }
 
-		$post_type = get_post_type_object( $this->post_type );
-		if ( ! current_user_can( $post_type->cap->create_posts ) ) {
-			return new WP_Error( 
+        $post_type = get_post_type_object( $this->post_type );
+        if ( ! current_user_can( $post_type->cap->create_posts ) ) {
+            return new WP_Error( 
                 'rest_cannot_create', 
                 __( 'Sorry, you are not allowed to create discounts as this user.', 'invoicing' ), 
                 array( 
@@ -290,261 +290,261 @@ 
             );
         }
 
-		return true;
+        return true;
     }
     
     /**
-	 * Creates a single discount.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function create_item( $request ) {
-
-		if ( ! empty( $request['id'] ) ) {
-			return new WP_Error( 'rest_item_exists', __( 'Cannot create existing discount.', 'invoicing' ), array( 'status' => 400 ) );
-		}
+     * Creates a single discount.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+     */
+    public function create_item( $request ) {
+
+        if ( ! empty( $request['id'] ) ) {
+            return new WP_Error( 'rest_item_exists', __( 'Cannot create existing discount.', 'invoicing' ), array( 'status' => 400 ) );
+        }
 
-		$request->set_param( 'context', 'edit' );
+        $request->set_param( 'context', 'edit' );
 
-		// Prepare the updated data.
-		$discount_data = $this->prepare_item_for_database( $request );
+        // Prepare the updated data.
+        $discount_data = $this->prepare_item_for_database( $request );
 
-		if ( is_wp_error( $discount_data ) ) {
-			return $discount_data;
-		}
+        if ( is_wp_error( $discount_data ) ) {
+            return $discount_data;
+        }
 
-		$discount_data['post_type'] = $this->post_type;
+        $discount_data['post_type'] = $this->post_type;
 
-		// Try creating the discount.
+        // Try creating the discount.
         $discount = wp_insert_post( $discount_data, true );
 
-		if ( is_wp_error( $discount ) ) {
+        if ( is_wp_error( $discount ) ) {
             return $discount;
-		}
-
-		// Prepare the response
-		$response = $this->prepare_item_for_response( $discount, $request );
-
-		/**
-		 * Fires after a single discount is created or updated via the REST API.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param WP_Post   $discount  Inserted or updated discount object.
-		 * @param WP_REST_Request $request  Request object.
-		 * @param bool            $creating True when creating a post, false when updating.
-		 */
-		do_action( "wpinv_rest_insert_discount", $discount, $request, true );
-
-		/**
-		 * Filters the responses for creating single item requests.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 *
-		 * @param array           $response Invoice properties.
-		 * @param WP_REST_Request $request The request used.
-		 */
+        }
+
+        // Prepare the response
+        $response = $this->prepare_item_for_response( $discount, $request );
+
+        /**
+         * Fires after a single discount is created or updated via the REST API.
+         *
+         * @since 1.0.13
+         *
+         * @param WP_Post   $discount  Inserted or updated discount object.
+         * @param WP_REST_Request $request  Request object.
+         * @param bool            $creating True when creating a post, false when updating.
+         */
+        do_action( "wpinv_rest_insert_discount", $discount, $request, true );
+
+        /**
+         * Filters the responses for creating single item requests.
+         *
+         *
+         * @since 1.0.13
+         *
+         *
+         * @param array           $response Invoice properties.
+         * @param WP_REST_Request $request The request used.
+         */
         $response       = apply_filters( "wpinv_rest_create_discount_response", $response, $request );
 
         return rest_ensure_response( $response );
-	}
-
-	/**
-	 * Checks if a given request has access to update a discount.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return true|WP_Error True if the request has access to update the item, WP_Error object otherwise.
-	 */
-	public function update_item_permissions_check( $request ) {
-
-		// Retrieve the item.
-		$item = $this->get_post( $request['id'] );
-		if ( is_wp_error( $item ) ) {
-			return $item;
-		}
-
-		if ( wpinv_current_user_can_manage_invoicing() ) {
-			return true;
-		}
-
-		return new WP_Error( 
-			'rest_cannot_edit', 
-			__( 'Sorry, you are not allowed to update this discount.', 'invoicing' ), 
-			array( 
-				'status' => rest_authorization_required_code(),
-			)
-		);
-
-	}
-
-	/**
-	 * Updates a single discount.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function update_item( $request ) {
+    }
+
+    /**
+     * Checks if a given request has access to update a discount.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return true|WP_Error True if the request has access to update the item, WP_Error object otherwise.
+     */
+    public function update_item_permissions_check( $request ) {
+
+        // Retrieve the item.
+        $item = $this->get_post( $request['id'] );
+        if ( is_wp_error( $item ) ) {
+            return $item;
+        }
+
+        if ( wpinv_current_user_can_manage_invoicing() ) {
+            return true;
+        }
+
+        return new WP_Error( 
+            'rest_cannot_edit', 
+            __( 'Sorry, you are not allowed to update this discount.', 'invoicing' ), 
+            array( 
+                'status' => rest_authorization_required_code(),
+            )
+        );
+
+    }
+
+    /**
+     * Updates a single discount.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+     */
+    public function update_item( $request ) {
 		
-		// Ensure the item exists.
+        // Ensure the item exists.
         $valid_check = $this->get_post( $request['id'] );
         
         // Abort early if it does not exist
-		if ( is_wp_error( $valid_check ) ) {
-			return $valid_check;
-		}
+        if ( is_wp_error( $valid_check ) ) {
+            return $valid_check;
+        }
 
-		$request->set_param( 'context', 'edit' );
+        $request->set_param( 'context', 'edit' );
 
-		// Prepare the updated data.
-		$data_to_update = $this->prepare_item_for_database( $request );
+        // Prepare the updated data.
+        $data_to_update = $this->prepare_item_for_database( $request );
 
-		if ( is_wp_error( $data_to_update ) ) {
-			return $data_to_update;
-		}
+        if ( is_wp_error( $data_to_update ) ) {
+            return $data_to_update;
+        }
 
-		if( empty( $data_to_update['meta_input'] ) ) {
-			unset( $data_to_update['meta_input'] );
-		}
+        if( empty( $data_to_update['meta_input'] ) ) {
+            unset( $data_to_update['meta_input'] );
+        }
 
-		// Abort if no item data is provided
+        // Abort if no item data is provided
         if( empty( $data_to_update ) ) {
             return new WP_Error( 'missing_data', __( 'An update request cannot be empty.', 'invoicing' ) );
-		}
+        }
 		
-		// post_status
-		if( ! empty( $data_to_update['post_status'] ) ) {
-			wpinv_update_discount_status( $request['id'], $data_to_update['post_status'] );
-			unset( $data_to_update['post_status'] );
-		}
+        // post_status
+        if( ! empty( $data_to_update['post_status'] ) ) {
+            wpinv_update_discount_status( $request['id'], $data_to_update['post_status'] );
+            unset( $data_to_update['post_status'] );
+        }
 
-		// Update the item
-		if( ! empty( $data_to_update ) ) {
+        // Update the item
+        if( ! empty( $data_to_update ) ) {
 
-			// Include the item ID
-			$data_to_update['ID'] = $request['id'];
+            // Include the item ID
+            $data_to_update['ID'] = $request['id'];
 
-			$updated = wp_update_post( $data_to_update, true );
+            $updated = wp_update_post( $data_to_update, true );
 
-			// Incase the update operation failed...
-			if ( is_wp_error( $updated ) ) {
-				return $updated;
-			}
+            // Incase the update operation failed...
+            if ( is_wp_error( $updated ) ) {
+                return $updated;
+            }
 
-		}
+        }
 
-		$updated_discount = get_post( $request['id'] );
+        $updated_discount = get_post( $request['id'] );
 
-		// Prepare the response
-		$response = $this->prepare_item_for_response( $updated_discount, $request );
+        // Prepare the response
+        $response = $this->prepare_item_for_response( $updated_discount, $request );
 
-		/** This action is documented in includes/class-wpinv-rest-item-controller.php */
-		do_action( "wpinv_rest_insert_discount", $updated_discount, $request, false );
+        /** This action is documented in includes/class-wpinv-rest-item-controller.php */
+        do_action( "wpinv_rest_insert_discount", $updated_discount, $request, false );
 
-		/**
-		 * Filters the responses for updating single discount requests.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 *
-		 * @param array           $data_to_update Discount properties.
-		 * @param WP_REST_Request $request The request used.
-		 */
+        /**
+         * Filters the responses for updating single discount requests.
+         *
+         *
+         * @since 1.0.13
+         *
+         *
+         * @param array           $data_to_update Discount properties.
+         * @param WP_REST_Request $request The request used.
+         */
         $response       = apply_filters( "wpinv_rest_update_discount_response", $response,  $data_to_update, $request );
 
         return rest_ensure_response( $response );
-	}
-
-	/**
-	 * Checks if a given request has access to delete a discount.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return true|WP_Error True if the request has access to delete the discount, WP_Error object otherwise.
-	 */
-	public function delete_item_permissions_check( $request ) {
-
-		// Retrieve the discount.
-		$discount = $this->get_post( $request['id'] );
-		if ( is_wp_error( $discount ) ) {
-			return $discount;
-		} 
-
-		// Ensure the current user can delete the discount
-		if (! wpinv_current_user_can_manage_invoicing() ) {
-			return new WP_Error( 
+    }
+
+    /**
+     * Checks if a given request has access to delete a discount.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return true|WP_Error True if the request has access to delete the discount, WP_Error object otherwise.
+     */
+    public function delete_item_permissions_check( $request ) {
+
+        // Retrieve the discount.
+        $discount = $this->get_post( $request['id'] );
+        if ( is_wp_error( $discount ) ) {
+            return $discount;
+        } 
+
+        // Ensure the current user can delete the discount
+        if (! wpinv_current_user_can_manage_invoicing() ) {
+            return new WP_Error( 
                 'rest_cannot_delete', 
                 __( 'Sorry, you are not allowed to delete this discount.', 'invoicing' ), 
                 array( 
                     'status' => rest_authorization_required_code(),
                 )
             );
-		}
-
-		return true;
-	}
-
-	/**
-	 * Deletes a single discount.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function delete_item( $request ) {
+        }
+
+        return true;
+    }
+
+    /**
+     * Deletes a single discount.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+     */
+    public function delete_item( $request ) {
 		
-		// Retrieve the discount.
-		$discount = $this->get_post( $request['id'] );
-		if ( is_wp_error( $discount ) ) {
-			return $discount;
-		}
+        // Retrieve the discount.
+        $discount = $this->get_post( $request['id'] );
+        if ( is_wp_error( $discount ) ) {
+            return $discount;
+        }
 
-		$request->set_param( 'context', 'edit' );
+        $request->set_param( 'context', 'edit' );
 
-		// Prepare the discount id
-		$id    = $discount->ID;
+        // Prepare the discount id
+        $id    = $discount->ID;
 
-		// Prepare the response
-		$response = $this->prepare_item_for_response( $discount, $request );
+        // Prepare the response
+        $response = $this->prepare_item_for_response( $discount, $request );
 
-		// Delete the discount...
-		wpinv_remove_discount( $id );
+        // Delete the discount...
+        wpinv_remove_discount( $id );
 
-		/**
-		 * Fires immediately after a single discount is deleted via the REST API.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param WP_POST    $discount  The deleted discount.
-		 * @param WP_REST_Request  $request  The request sent to the API.
-		 */
-		do_action( "wpinv_rest_delete_discount", $discount, $request );
+        /**
+         * Fires immediately after a single discount is deleted via the REST API.
+         *
+         *
+         * @since 1.0.13
+         *
+         * @param WP_POST    $discount  The deleted discount.
+         * @param WP_REST_Request  $request  The request sent to the API.
+         */
+        do_action( "wpinv_rest_delete_discount", $discount, $request );
 
-		return $response;
+        return $response;
 
-	}
+    }
     
     
     /**
-	 * Retrieves the query params for the discount collection.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @return array Collection parameters.
-	 */
-	public function get_collection_params() {
+     * Retrieves the query params for the discount collection.
+     *
+     * @since 1.0.13
+     *
+     * @return array Collection parameters.
+     */
+    public function get_collection_params() {
         
         $query_params               = array(
 
@@ -558,27 +558,27 @@ 
             
             // Discount types
             'type'                  => array(
-				'description'       => __( 'Type of discounts to fetch.', 'invoicing' ),
-				'type'              => 'array',
-				'default'           => array_keys( wpinv_get_discount_types() ),
-				'items'             => array(
+                'description'       => __( 'Type of discounts to fetch.', 'invoicing' ),
+                'type'              => 'array',
+                'default'           => array_keys( wpinv_get_discount_types() ),
+                'items'             => array(
                     'enum'          => array_keys( wpinv_get_discount_types() ),
                     'type'          => 'string',
                 ),
-			),
+            ),
 			
-			// Number of results per page
+            // Number of results per page
             'limit'                 => array(
-				'description'       => __( 'Number of discounts to fetch.', 'invoicing' ),
-				'type'              => 'integer',
-				'default'           => (int) get_option( 'posts_per_page' ),
+                'description'       => __( 'Number of discounts to fetch.', 'invoicing' ),
+                'type'              => 'integer',
+                'default'           => (int) get_option( 'posts_per_page' ),
             ),
 
             // Pagination
             'page'     => array(
-				'description'       => __( 'Current page to fetch.', 'invoicing' ),
-				'type'              => 'integer',
-				'default'           => 1,
+                'description'       => __( 'Current page to fetch.', 'invoicing' ),
+                'type'              => 'integer',
+                'default'           => 1,
             ),
 
             // Exclude certain items
@@ -601,9 +601,9 @@ 
                     'date',
                     'ID',
                     'modified',
-					'title',
-					'relevance',
-					'rand'
+                    'title',
+                    'relevance',
+                    'rand'
                 ),
             ),
 
@@ -613,598 +613,598 @@ 
                 'type'        => 'string',
                 'default'     => 'DESC',
                 'enum'        => array( 'ASC', 'DESC' ),
-			),
+            ),
 			
-			// Search term
+            // Search term
             'search'                => array(
-				'description'       => __( 'Return discounts that match the search term.', 'invoicing' ),
-				'type'              => 'string',
+                'description'       => __( 'Return discounts that match the search term.', 'invoicing' ),
+                'type'              => 'string',
             ),
         );
 
-		/**
-		 * Filter collection parameters for the discounts controller.
-		 *
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param array        $query_params JSON Schema-formatted collection parameters.
-		 */
-		return apply_filters( "wpinv_rest_discounts_collection_params", $query_params );
+        /**
+         * Filter collection parameters for the discounts controller.
+         *
+         *
+         * @since 1.0.13
+         *
+         * @param array        $query_params JSON Schema-formatted collection parameters.
+         */
+        return apply_filters( "wpinv_rest_discounts_collection_params", $query_params );
     }
     
     /**
-	 * Checks if a given post type can be viewed or managed.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param object|string $post_type Post type name or object.
-	 * @return bool Whether the post type is allowed in REST.
-	 */
-	protected function check_is_post_type_allowed( $post_type ) {
-		return true;
-	}
-
-	/**
-	 * Prepares a single item for create or update.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Request object.
-	 * @return array|WP_Error Discount Properties or WP_Error.
-	 */
-	protected function prepare_item_for_database( $request ) {
-		$prepared_item 		 = new stdClass();
-		$prepared_item->meta_input = array();
-
-		// Post ID.
-		if ( isset( $request['id'] ) ) {
-			$existing_item = $this->get_post( $request['id'] );
-			if ( is_wp_error( $existing_item ) ) {
-				return $existing_item;
-			}
-
-			$prepared_item->ID 		  = $existing_item->ID;
-		}
-
-		$schema = $this->get_item_schema();
-
-		// item title.
-		if ( ! empty( $schema['properties']['title'] ) && isset( $request['title'] ) ) {
-			$prepared_item->post_title = sanitize_text_field( $request['title'] );
-		}
-
-		// item status.
-		if ( ! empty( $schema['properties']['status'] ) && isset( $request['status'] ) && in_array( $request['status'], array_keys( get_post_stati( array( 'internal' => false ) ) ) ) ) {
-			$prepared_item->post_status = sanitize_text_field( $request['status'] );
-		}
-
-		// Code.
-		if ( ! empty( $schema['properties']['code'] ) && isset( $request['code'] ) ) {
-			$prepared_item->meta_input['_wpi_discount_code'] = trim( $request['code'] );
-		}
-
-		// Type.
-		if ( ! empty( $schema['properties']['type'] ) && isset( $request['type'] )  && in_array( $request['type'], array_keys( wpinv_get_discount_types() ) ) ) {
-			$prepared_item->meta_input['_wpi_discount_type'] = trim( $request['type'] );
-		}
-
-		// Amount.
-		if ( ! empty( $schema['properties']['amount'] ) && isset( $request['amount'] ) ) {
-			$prepared_item->meta_input['_wpi_discount_amount'] = floatval( $request['amount'] );
-		}
-
-		// Items.
-		if ( ! empty( $schema['properties']['items'] ) && isset( $request['items'] ) ) {
-			$prepared_item->meta_input['_wpi_discount_items'] = wpinv_parse_list( $request['items'] );
-		}
-
-		// Excluded Items.
-		if ( ! empty( $schema['properties']['exclude_items'] ) && isset( $request['exclude_items'] ) ) {
-			$prepared_item->meta_input['_wpi_discount_excluded_items'] = wpinv_parse_list( $request['exclude_items'] );
-		}
-
-		// Start date.
-		if ( ! empty( $schema['properties']['start_date'] ) && isset( $request['start_date'] ) ) {
-			$prepared_item->meta_input['_wpi_discount_start'] = trim( $request['start_date'] );
-		}
-
-		// End date.
-		if ( ! empty( $schema['properties']['end_date'] ) && isset( $request['end_date'] ) ) {
-			$prepared_item->meta_input['_wpi_discount_expiration'] = trim( $request['end_date'] );
-		}
-
-		// Minimum amount.
-		if ( ! empty( $schema['properties']['minimum_amount'] ) && isset( $request['minimum_amount'] ) ) {
-			$prepared_item->meta_input['_wpi_discount_min_total'] = floatval( $request['minimum_amount'] );
-		}
-
-		// Maximum amount.
-		if ( ! empty( $schema['properties']['maximum_amount'] ) && isset( $request['maximum_amount'] ) ) {
-			$prepared_item->meta_input['_wpi_discount_max_total'] = floatval( $request['maximum_amount'] );
-		}
-
-		// Recurring.
-		if ( ! empty( $schema['properties']['recurring'] ) && isset( $request['recurring'] ) ) {
-			$prepared_item->meta_input['_wpi_discount_is_recurring'] = empty( (int) $request['recurring'] ) ? 0 : 1;
-		}
-
-		// Maximum uses.
-		if ( ! empty( $schema['properties']['max_uses'] ) && isset( $request['max_uses'] ) ) {
-			$prepared_item->meta_input['_wpi_discount_max_uses'] = intval( $request['max_uses'] );
-		}
-
-		// Single use.
-		if ( ! empty( $schema['properties']['single_use'] ) && isset( $request['single_use'] ) ) {
-			$prepared_item->meta_input['_wpi_discount_is_single_use'] = empty( (int) $request['single_use'] ) ? 0 : 1;
-		}
-
-		$discount_data = (array) wp_unslash( $prepared_item );
-
-		/**
-		 * Filters an item before it is inserted via the REST API.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param array        $discount_data An array of discount data
-		 * @param WP_REST_Request $request       Request object.
-		 */
-		return apply_filters( "wpinv_rest_pre_insert_discount", $discount_data, $request );
-
-	}
-
-	/**
-	 * Prepares a single discount output for response.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_Post   $discount    WP_Post object.
-	 * @param WP_REST_Request $request Request object.
-	 * @return WP_REST_Response Response object.
-	 */
-	public function prepare_item_for_response( $discount, $request ) {
-
-		$GLOBALS['post'] = get_post( $discount->ID );
-
-		setup_postdata( $discount->ID );
-
-		// Fetch the fields to include in this response.
-		$fields = $this->get_fields_for_response( $request );
-
-		// Base fields for every discount.
-		$data = array();
-
-		// Set up ID.
-		if ( rest_is_field_included( 'id', $fields ) ) {
-			$data['id'] = $discount->ID;
-		}
-
-		// Title.
-		if ( rest_is_field_included( 'title', $fields ) ) {
-			$data['title'] = get_the_title( $discount->ID );
-		}
-
-		// Code.
-		if ( rest_is_field_included( 'code', $fields ) ) {
-			$data['code'] = wpinv_get_discount_code( $discount->ID );
-		}
-
-		// Type.
-		if ( rest_is_field_included( 'type', $fields ) ) {
-			$data['type'] = wpinv_get_discount_type( $discount->ID );
-		}
-
-		// Amount.
-		if ( rest_is_field_included( 'amount', $fields ) ) {
-			$data['amount'] = wpinv_get_discount_amount( $discount->ID );
-		}
-
-		// Status.
-		if ( rest_is_field_included( 'status', $fields ) ) {
-			$data['status'] = get_post_status( $discount->ID );
-		}
-
-		// Items.
-		if ( rest_is_field_included( 'items', $fields ) ) {
-			$data['items'] = wpinv_get_discount_item_reqs( $discount->ID );
-		}
-
-		// Excluded Items.
-		if ( rest_is_field_included( 'exclude_items', $fields ) ) {
-			$data['exclude_items'] = wpinv_get_discount_excluded_items( $discount->ID );
-		}
-
-		// Start date.
-		if ( rest_is_field_included( 'start_date', $fields ) ) {
-			$data['start_date'] = wpinv_get_discount_start_date( $discount->ID );
-		}
-
-		// End date.
-		if ( rest_is_field_included( 'end_date', $fields ) ) {
-			$data['end_date'] = wpinv_get_discount_expiration( $discount->ID );
-		}
-
-		// Minimum amount.
-		if ( rest_is_field_included( 'minimum_amount', $fields ) ) {
-			$data['minimum_amount'] = wpinv_get_discount_min_total( $discount->ID );
-		}
-
-		// Maximum amount.
-		if ( rest_is_field_included( 'maximum_amount', $fields ) ) {
-			$data['maximum_amount'] = wpinv_get_discount_max_total( $discount->ID );
-		}
-
-		// Recurring.
-		if ( rest_is_field_included( 'recurring', $fields ) ) {
-			$data['recurring'] = wpinv_discount_is_recurring( $discount->ID );
-		}
-
-		// Maximum uses.
-		if ( rest_is_field_included( 'max_uses', $fields ) ) {
-			$data['max_uses'] = wpinv_get_discount_max_uses( $discount->ID );
-		}
-
-		// Single use.
-		if ( rest_is_field_included( 'single_use', $fields ) ) {
-			$data['single_use'] = wpinv_discount_is_single_use( $discount->ID );
-		}
-
-		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
-		$data    = $this->add_additional_fields_to_object( $data, $request );
-		$data    = $this->filter_response_by_context( $data, $context );
-
-		// Wrap the data in a response object.
-		$response = rest_ensure_response( $data );
-
-		$links = $this->prepare_links( $discount );
-		$response->add_links( $links );
-
-		if ( ! empty( $links['self']['href'] ) ) {
-			$actions = $this->get_available_actions( $discount, $request );
-
-			$self = $links['self']['href'];
-
-			foreach ( $actions as $rel ) {
-				$response->add_link( $rel, $self );
-			}
-		}
-
-		/**
-		 * Filters the discount data for a response.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param WP_REST_Response $response The response object.
-		 * @param WP_Post    $discount  The discount post object.
-		 * @param WP_REST_Request  $request  Request object.
-		 */
-		return apply_filters( "wpinv_rest_prepare_discount", $response, $discount, $request );
-	}
-
-	/**
-	 * Gets an array of fields to be included on the response.
-	 *
-	 * Included fields are based on item schema and `_fields=` request argument.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 * @return array Fields to be included in the response.
-	 */
-	public function get_fields_for_response( $request ) {
-		$schema     = $this->get_item_schema();
-		$properties = isset( $schema['properties'] ) ? $schema['properties'] : array();
-
-		$additional_fields = $this->get_additional_fields();
-		foreach ( $additional_fields as $field_name => $field_options ) {
-			// For back-compat, include any field with an empty schema
-			// because it won't be present in $this->get_item_schema().
-			if ( is_null( $field_options['schema'] ) ) {
-				$properties[ $field_name ] = $field_options;
-			}
-		}
-
-		// Exclude fields that specify a different context than the request context.
-		$context = $request['context'];
-		if ( $context ) {
-			foreach ( $properties as $name => $options ) {
-				if ( ! empty( $options['context'] ) && ! in_array( $context, $options['context'], true ) ) {
-					unset( $properties[ $name ] );
-				}
-			}
-		}
-
-		$fields = array_keys( $properties );
-
-		if ( ! isset( $request['_fields'] ) ) {
-			return $fields;
-		}
-		$requested_fields = wpinv_parse_list( $request['_fields'] );
-		if ( 0 === count( $requested_fields ) ) {
-			return $fields;
-		}
-		// Trim off outside whitespace from the comma delimited list.
-		$requested_fields = array_map( 'trim', $requested_fields );
-		// Always persist 'id', because it can be needed for add_additional_fields_to_object().
-		if ( in_array( 'id', $fields, true ) ) {
-			$requested_fields[] = 'id';
-		}
-		// Return the list of all requested fields which appear in the schema.
-		return array_reduce(
-			$requested_fields,
-			function( $response_fields, $field ) use ( $fields ) {
-				if ( in_array( $field, $fields, true ) ) {
-					$response_fields[] = $field;
-					return $response_fields;
-				}
-				// Check for nested fields if $field is not a direct match.
-				$nested_fields = explode( '.', $field );
-				// A nested field is included so long as its top-level property is
-				// present in the schema.
-				if ( in_array( $nested_fields[0], $fields, true ) ) {
-					$response_fields[] = $field;
-				}
-				return $response_fields;
-			},
-			array()
-		);
-	}
-
-	/**
-	 * Retrieves the discount's schema, conforming to JSON Schema.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @return array Discount schema data.
-	 */
-	public function get_item_schema() {
-
-		// Maybe retrieve the schema from cache.
-		if (  empty( $this->schema ) ) {
-			return $this->add_additional_fields_schema( $this->schema );
-		}
-
-		$schema = array(
-			'$schema'    => 'http://json-schema.org/draft-04/schema#',
-			'title'      => $this->post_type,
-			'type'       => 'object',
-
-			// Base properties for every Item.
-			'properties' 		  => array(
-
-				'id'           => array(
-					'description' => __( 'Unique identifier for the discount.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'readonly'    => true,
-				),
-
-				'title'			  => array(
-					'description' => __( 'The title for the discount.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit' ),
-				),
-
-				'code'        => array(
-					'description' => __( 'The discount code.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'required'	  => true,
-				),
-
-				'type'        => array(
-					'description' => __( 'The type of discount.', 'invoicing' ),
-					'type'        => 'string',
-					'enum'        => array_keys( wpinv_get_discount_types() ),
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'default'	  => 'percentage',
-				),
-
-				'amount'        => array(
-					'description' => __( 'The discount value.', 'invoicing' ),
-					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
-					'required'	  => true,
-				),
-
-				'status'       => array(
-					'description' => __( 'A named status for the discount.', 'invoicing' ),
-					'type'        => 'string',
-					'enum'        => array_keys( get_post_stati( array( 'internal' => false ) ) ),
-					'context'     => array( 'view', 'edit' ),
-				),
-
-				'items'       => array(
-					'description' => __( 'Items which need to be in the cart to use this discount or, for "Item Discounts", which items are discounted. If left blank, this discount will be used on any item.', 'invoicing' ),
-					'type'        => 'array',
-					'context'     => array( 'view', 'edit' ),
-				),
-
-				'exclude_items'   => array(
-					'description' => __( 'Items which are NOT allowed to use this discount.', 'invoicing' ),
-					'type'        => 'array',
-					'context'     => array( 'view', 'edit' ),
-				),
-
-				'start_date'       => array(
-					'description' => __( 'The start date for the discount in the format of yyyy-mm-dd hh:mm:ss  . If provided, the discount can only be used after or on this date.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit' ),
-				),
-
-				'end_date'        => array(
-					'description' => __( 'The expiration date for the discount.', 'invoicing' ),
-					'type'        => 'string',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
+     * Checks if a given post type can be viewed or managed.
+     *
+     * @since 1.0.13
+     *
+     * @param object|string $post_type Post type name or object.
+     * @return bool Whether the post type is allowed in REST.
+     */
+    protected function check_is_post_type_allowed( $post_type ) {
+        return true;
+    }
+
+    /**
+     * Prepares a single item for create or update.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Request object.
+     * @return array|WP_Error Discount Properties or WP_Error.
+     */
+    protected function prepare_item_for_database( $request ) {
+        $prepared_item 		 = new stdClass();
+        $prepared_item->meta_input = array();
+
+        // Post ID.
+        if ( isset( $request['id'] ) ) {
+            $existing_item = $this->get_post( $request['id'] );
+            if ( is_wp_error( $existing_item ) ) {
+                return $existing_item;
+            }
+
+            $prepared_item->ID 		  = $existing_item->ID;
+        }
+
+        $schema = $this->get_item_schema();
+
+        // item title.
+        if ( ! empty( $schema['properties']['title'] ) && isset( $request['title'] ) ) {
+            $prepared_item->post_title = sanitize_text_field( $request['title'] );
+        }
+
+        // item status.
+        if ( ! empty( $schema['properties']['status'] ) && isset( $request['status'] ) && in_array( $request['status'], array_keys( get_post_stati( array( 'internal' => false ) ) ) ) ) {
+            $prepared_item->post_status = sanitize_text_field( $request['status'] );
+        }
+
+        // Code.
+        if ( ! empty( $schema['properties']['code'] ) && isset( $request['code'] ) ) {
+            $prepared_item->meta_input['_wpi_discount_code'] = trim( $request['code'] );
+        }
+
+        // Type.
+        if ( ! empty( $schema['properties']['type'] ) && isset( $request['type'] )  && in_array( $request['type'], array_keys( wpinv_get_discount_types() ) ) ) {
+            $prepared_item->meta_input['_wpi_discount_type'] = trim( $request['type'] );
+        }
+
+        // Amount.
+        if ( ! empty( $schema['properties']['amount'] ) && isset( $request['amount'] ) ) {
+            $prepared_item->meta_input['_wpi_discount_amount'] = floatval( $request['amount'] );
+        }
+
+        // Items.
+        if ( ! empty( $schema['properties']['items'] ) && isset( $request['items'] ) ) {
+            $prepared_item->meta_input['_wpi_discount_items'] = wpinv_parse_list( $request['items'] );
+        }
+
+        // Excluded Items.
+        if ( ! empty( $schema['properties']['exclude_items'] ) && isset( $request['exclude_items'] ) ) {
+            $prepared_item->meta_input['_wpi_discount_excluded_items'] = wpinv_parse_list( $request['exclude_items'] );
+        }
+
+        // Start date.
+        if ( ! empty( $schema['properties']['start_date'] ) && isset( $request['start_date'] ) ) {
+            $prepared_item->meta_input['_wpi_discount_start'] = trim( $request['start_date'] );
+        }
+
+        // End date.
+        if ( ! empty( $schema['properties']['end_date'] ) && isset( $request['end_date'] ) ) {
+            $prepared_item->meta_input['_wpi_discount_expiration'] = trim( $request['end_date'] );
+        }
+
+        // Minimum amount.
+        if ( ! empty( $schema['properties']['minimum_amount'] ) && isset( $request['minimum_amount'] ) ) {
+            $prepared_item->meta_input['_wpi_discount_min_total'] = floatval( $request['minimum_amount'] );
+        }
+
+        // Maximum amount.
+        if ( ! empty( $schema['properties']['maximum_amount'] ) && isset( $request['maximum_amount'] ) ) {
+            $prepared_item->meta_input['_wpi_discount_max_total'] = floatval( $request['maximum_amount'] );
+        }
+
+        // Recurring.
+        if ( ! empty( $schema['properties']['recurring'] ) && isset( $request['recurring'] ) ) {
+            $prepared_item->meta_input['_wpi_discount_is_recurring'] = empty( (int) $request['recurring'] ) ? 0 : 1;
+        }
+
+        // Maximum uses.
+        if ( ! empty( $schema['properties']['max_uses'] ) && isset( $request['max_uses'] ) ) {
+            $prepared_item->meta_input['_wpi_discount_max_uses'] = intval( $request['max_uses'] );
+        }
+
+        // Single use.
+        if ( ! empty( $schema['properties']['single_use'] ) && isset( $request['single_use'] ) ) {
+            $prepared_item->meta_input['_wpi_discount_is_single_use'] = empty( (int) $request['single_use'] ) ? 0 : 1;
+        }
+
+        $discount_data = (array) wp_unslash( $prepared_item );
+
+        /**
+         * Filters an item before it is inserted via the REST API.
+         *
+         * @since 1.0.13
+         *
+         * @param array        $discount_data An array of discount data
+         * @param WP_REST_Request $request       Request object.
+         */
+        return apply_filters( "wpinv_rest_pre_insert_discount", $discount_data, $request );
+
+    }
+
+    /**
+     * Prepares a single discount output for response.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_Post   $discount    WP_Post object.
+     * @param WP_REST_Request $request Request object.
+     * @return WP_REST_Response Response object.
+     */
+    public function prepare_item_for_response( $discount, $request ) {
+
+        $GLOBALS['post'] = get_post( $discount->ID );
+
+        setup_postdata( $discount->ID );
+
+        // Fetch the fields to include in this response.
+        $fields = $this->get_fields_for_response( $request );
+
+        // Base fields for every discount.
+        $data = array();
+
+        // Set up ID.
+        if ( rest_is_field_included( 'id', $fields ) ) {
+            $data['id'] = $discount->ID;
+        }
+
+        // Title.
+        if ( rest_is_field_included( 'title', $fields ) ) {
+            $data['title'] = get_the_title( $discount->ID );
+        }
+
+        // Code.
+        if ( rest_is_field_included( 'code', $fields ) ) {
+            $data['code'] = wpinv_get_discount_code( $discount->ID );
+        }
+
+        // Type.
+        if ( rest_is_field_included( 'type', $fields ) ) {
+            $data['type'] = wpinv_get_discount_type( $discount->ID );
+        }
+
+        // Amount.
+        if ( rest_is_field_included( 'amount', $fields ) ) {
+            $data['amount'] = wpinv_get_discount_amount( $discount->ID );
+        }
+
+        // Status.
+        if ( rest_is_field_included( 'status', $fields ) ) {
+            $data['status'] = get_post_status( $discount->ID );
+        }
+
+        // Items.
+        if ( rest_is_field_included( 'items', $fields ) ) {
+            $data['items'] = wpinv_get_discount_item_reqs( $discount->ID );
+        }
+
+        // Excluded Items.
+        if ( rest_is_field_included( 'exclude_items', $fields ) ) {
+            $data['exclude_items'] = wpinv_get_discount_excluded_items( $discount->ID );
+        }
+
+        // Start date.
+        if ( rest_is_field_included( 'start_date', $fields ) ) {
+            $data['start_date'] = wpinv_get_discount_start_date( $discount->ID );
+        }
+
+        // End date.
+        if ( rest_is_field_included( 'end_date', $fields ) ) {
+            $data['end_date'] = wpinv_get_discount_expiration( $discount->ID );
+        }
+
+        // Minimum amount.
+        if ( rest_is_field_included( 'minimum_amount', $fields ) ) {
+            $data['minimum_amount'] = wpinv_get_discount_min_total( $discount->ID );
+        }
+
+        // Maximum amount.
+        if ( rest_is_field_included( 'maximum_amount', $fields ) ) {
+            $data['maximum_amount'] = wpinv_get_discount_max_total( $discount->ID );
+        }
+
+        // Recurring.
+        if ( rest_is_field_included( 'recurring', $fields ) ) {
+            $data['recurring'] = wpinv_discount_is_recurring( $discount->ID );
+        }
+
+        // Maximum uses.
+        if ( rest_is_field_included( 'max_uses', $fields ) ) {
+            $data['max_uses'] = wpinv_get_discount_max_uses( $discount->ID );
+        }
+
+        // Single use.
+        if ( rest_is_field_included( 'single_use', $fields ) ) {
+            $data['single_use'] = wpinv_discount_is_single_use( $discount->ID );
+        }
+
+        $context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+        $data    = $this->add_additional_fields_to_object( $data, $request );
+        $data    = $this->filter_response_by_context( $data, $context );
+
+        // Wrap the data in a response object.
+        $response = rest_ensure_response( $data );
+
+        $links = $this->prepare_links( $discount );
+        $response->add_links( $links );
+
+        if ( ! empty( $links['self']['href'] ) ) {
+            $actions = $this->get_available_actions( $discount, $request );
+
+            $self = $links['self']['href'];
+
+            foreach ( $actions as $rel ) {
+                $response->add_link( $rel, $self );
+            }
+        }
+
+        /**
+         * Filters the discount data for a response.
+         *
+         * @since 1.0.13
+         *
+         * @param WP_REST_Response $response The response object.
+         * @param WP_Post    $discount  The discount post object.
+         * @param WP_REST_Request  $request  Request object.
+         */
+        return apply_filters( "wpinv_rest_prepare_discount", $response, $discount, $request );
+    }
+
+    /**
+     * Gets an array of fields to be included on the response.
+     *
+     * Included fields are based on item schema and `_fields=` request argument.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_REST_Request $request Full details about the request.
+     * @return array Fields to be included in the response.
+     */
+    public function get_fields_for_response( $request ) {
+        $schema     = $this->get_item_schema();
+        $properties = isset( $schema['properties'] ) ? $schema['properties'] : array();
+
+        $additional_fields = $this->get_additional_fields();
+        foreach ( $additional_fields as $field_name => $field_options ) {
+            // For back-compat, include any field with an empty schema
+            // because it won't be present in $this->get_item_schema().
+            if ( is_null( $field_options['schema'] ) ) {
+                $properties[ $field_name ] = $field_options;
+            }
+        }
+
+        // Exclude fields that specify a different context than the request context.
+        $context = $request['context'];
+        if ( $context ) {
+            foreach ( $properties as $name => $options ) {
+                if ( ! empty( $options['context'] ) && ! in_array( $context, $options['context'], true ) ) {
+                    unset( $properties[ $name ] );
+                }
+            }
+        }
+
+        $fields = array_keys( $properties );
+
+        if ( ! isset( $request['_fields'] ) ) {
+            return $fields;
+        }
+        $requested_fields = wpinv_parse_list( $request['_fields'] );
+        if ( 0 === count( $requested_fields ) ) {
+            return $fields;
+        }
+        // Trim off outside whitespace from the comma delimited list.
+        $requested_fields = array_map( 'trim', $requested_fields );
+        // Always persist 'id', because it can be needed for add_additional_fields_to_object().
+        if ( in_array( 'id', $fields, true ) ) {
+            $requested_fields[] = 'id';
+        }
+        // Return the list of all requested fields which appear in the schema.
+        return array_reduce(
+            $requested_fields,
+            function( $response_fields, $field ) use ( $fields ) {
+                if ( in_array( $field, $fields, true ) ) {
+                    $response_fields[] = $field;
+                    return $response_fields;
+                }
+                // Check for nested fields if $field is not a direct match.
+                $nested_fields = explode( '.', $field );
+                // A nested field is included so long as its top-level property is
+                // present in the schema.
+                if ( in_array( $nested_fields[0], $fields, true ) ) {
+                    $response_fields[] = $field;
+                }
+                return $response_fields;
+            },
+            array()
+        );
+    }
+
+    /**
+     * Retrieves the discount's schema, conforming to JSON Schema.
+     *
+     * @since 1.0.13
+     *
+     * @return array Discount schema data.
+     */
+    public function get_item_schema() {
+
+        // Maybe retrieve the schema from cache.
+        if (  empty( $this->schema ) ) {
+            return $this->add_additional_fields_schema( $this->schema );
+        }
+
+        $schema = array(
+            '$schema'    => 'http://json-schema.org/draft-04/schema#',
+            'title'      => $this->post_type,
+            'type'       => 'object',
+
+            // Base properties for every Item.
+            'properties' 		  => array(
+
+                'id'           => array(
+                    'description' => __( 'Unique identifier for the discount.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'readonly'    => true,
+                ),
+
+                'title'			  => array(
+                    'description' => __( 'The title for the discount.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit' ),
+                ),
+
+                'code'        => array(
+                    'description' => __( 'The discount code.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'required'	  => true,
+                ),
+
+                'type'        => array(
+                    'description' => __( 'The type of discount.', 'invoicing' ),
+                    'type'        => 'string',
+                    'enum'        => array_keys( wpinv_get_discount_types() ),
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'default'	  => 'percentage',
+                ),
+
+                'amount'        => array(
+                    'description' => __( 'The discount value.', 'invoicing' ),
+                    'type'        => 'number',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                    'required'	  => true,
+                ),
+
+                'status'       => array(
+                    'description' => __( 'A named status for the discount.', 'invoicing' ),
+                    'type'        => 'string',
+                    'enum'        => array_keys( get_post_stati( array( 'internal' => false ) ) ),
+                    'context'     => array( 'view', 'edit' ),
+                ),
+
+                'items'       => array(
+                    'description' => __( 'Items which need to be in the cart to use this discount or, for "Item Discounts", which items are discounted. If left blank, this discount will be used on any item.', 'invoicing' ),
+                    'type'        => 'array',
+                    'context'     => array( 'view', 'edit' ),
+                ),
+
+                'exclude_items'   => array(
+                    'description' => __( 'Items which are NOT allowed to use this discount.', 'invoicing' ),
+                    'type'        => 'array',
+                    'context'     => array( 'view', 'edit' ),
+                ),
+
+                'start_date'       => array(
+                    'description' => __( 'The start date for the discount in the format of yyyy-mm-dd hh:mm:ss  . If provided, the discount can only be used after or on this date.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit' ),
+                ),
+
+                'end_date'        => array(
+                    'description' => __( 'The expiration date for the discount.', 'invoicing' ),
+                    'type'        => 'string',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
 				
-				'minimum_amount'       => array(
-					'description' => __( 'Minimum amount needed to use this invoice.', 'invoicing' ),
-					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'maximum_amount'       => array(
-					'description' => __( 'Maximum amount needed to use this invoice.', 'invoicing' ),
-					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'recurring'       => array(
-					'description' => __( 'Whether the discount is applied to all recurring payments or only the first recurring payment.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'max_uses'        => array(
-					'description' => __( 'The maximum number of times this discount code can be used.', 'invoicing' ),
-					'type'        => 'number',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				),
-
-				'single_use'       => array(
-					'description' => __( 'Whether or not this discount can only be used once per user.', 'invoicing' ),
-					'type'        => 'integer',
-					'context'     => array( 'view', 'edit', 'embed' ),
-				)
-
-			),
-		);
-
-		// Add helpful links to the discount schem.
-		$schema['links'] = $this->get_schema_links();
-
-		/**
-		 * Filters the discount schema for the REST API.
-		 *
-		 * Enables adding extra properties to discounts.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param array   $schema    The discount schema.
-		 */
+                'minimum_amount'       => array(
+                    'description' => __( 'Minimum amount needed to use this invoice.', 'invoicing' ),
+                    'type'        => 'number',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'maximum_amount'       => array(
+                    'description' => __( 'Maximum amount needed to use this invoice.', 'invoicing' ),
+                    'type'        => 'number',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'recurring'       => array(
+                    'description' => __( 'Whether the discount is applied to all recurring payments or only the first recurring payment.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'max_uses'        => array(
+                    'description' => __( 'The maximum number of times this discount code can be used.', 'invoicing' ),
+                    'type'        => 'number',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                ),
+
+                'single_use'       => array(
+                    'description' => __( 'Whether or not this discount can only be used once per user.', 'invoicing' ),
+                    'type'        => 'integer',
+                    'context'     => array( 'view', 'edit', 'embed' ),
+                )
+
+            ),
+        );
+
+        // Add helpful links to the discount schem.
+        $schema['links'] = $this->get_schema_links();
+
+        /**
+         * Filters the discount schema for the REST API.
+         *
+         * Enables adding extra properties to discounts.
+         *
+         * @since 1.0.13
+         *
+         * @param array   $schema    The discount schema.
+         */
         $schema = apply_filters( "wpinv_rest_discount_schema", $schema );
 
-		//  Cache the discount schema.
-		$this->schema = $schema;
+        //  Cache the discount schema.
+        $this->schema = $schema;
 		
-		return $this->add_additional_fields_schema( $this->schema );
-	}
-
-	/**
-	 * Retrieve Link Description Objects that should be added to the Schema for the discounts collection.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @return array
-	 */
-	protected function get_schema_links() {
-
-		$href = rest_url( "{$this->namespace}/{$this->rest_base}/{id}" );
-
-		$links = array();
-
-		$links[] = array(
-			'rel'          => 'https://api.w.org/action-publish',
-			'title'        => __( 'The current user can publish this discount.', 'invoicing' ),
-			'href'         => $href,
-			'targetSchema' => array(
-				'type'       => 'object',
-				'properties' => array(
-					'status' => array(
-						'type' => 'string',
-						'enum' => array( 'publish', 'future' ),
-					),
-				),
-			),
-		);
-
-		return $links;
-	}
-
-	/**
-	 * Prepares links for the request.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_Post $discount Post Object.
-	 * @return array Links for the given discount.
-	 */
-	protected function prepare_links( $discount ) {
-
-		// Prepare the base REST API endpoint for discounts.
-		$base = sprintf( '%s/%s', $this->namespace, $this->rest_base );
-
-		// Entity meta.
-		$links = array(
-			'self'       => array(
-				'href' => rest_url( trailingslashit( $base ) . $discount->ID ),
-			),
-			'collection' => array(
-				'href' => rest_url( $base ),
-			),
-		);
-
-		/**
-		 * Filters the returned discount links for the REST API.
-		 *
-		 * Enables adding extra links to discount API responses.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param array   $links    Rest links.
-		 */
-		return apply_filters( "wpinv_rest_discount_links", $links );
-
-	}
-
-	/**
-	 * Get the link relations available for the post and current user.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param WP_Post   $discount    WP_Post object.
-	 * @param WP_REST_Request $request Request object.
-	 * @return array List of link relations.
-	 */
-	protected function get_available_actions( $discount, $request ) {
-
-		if ( 'edit' !== $request['context'] ) {
-			return array();
-		}
-
-		$rels = array();
-
-		// Retrieve the post type object.
-		$post_type = get_post_type_object( $discount->post_type );
-
-		// Mark discount as published.
-		if ( current_user_can( $post_type->cap->publish_posts ) ) {
-			$rels[] = 'https://api.w.org/action-publish';
-		}
-
-		/**
-		 * Filters the available discount link relations for the REST API.
-		 *
-		 * Enables adding extra link relation for the current user and request to discount responses.
-		 *
-		 * @since 1.0.13
-		 *
-		 * @param array   $rels    Available link relations.
-		 */
-		return apply_filters( "wpinv_rest_discount_link_relations", $rels );
-	}
-
-	/**
-	 * Handles rest requests for discount types.
-	 *
-	 * @since 1.0.13
-	 * 
-	 * 
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function get_discount_types() {
-		return rest_ensure_response( wpinv_get_discount_types() );
-	}
+        return $this->add_additional_fields_schema( $this->schema );
+    }
+
+    /**
+     * Retrieve Link Description Objects that should be added to the Schema for the discounts collection.
+     *
+     * @since 1.0.13
+     *
+     * @return array
+     */
+    protected function get_schema_links() {
+
+        $href = rest_url( "{$this->namespace}/{$this->rest_base}/{id}" );
+
+        $links = array();
+
+        $links[] = array(
+            'rel'          => 'https://api.w.org/action-publish',
+            'title'        => __( 'The current user can publish this discount.', 'invoicing' ),
+            'href'         => $href,
+            'targetSchema' => array(
+                'type'       => 'object',
+                'properties' => array(
+                    'status' => array(
+                        'type' => 'string',
+                        'enum' => array( 'publish', 'future' ),
+                    ),
+                ),
+            ),
+        );
+
+        return $links;
+    }
+
+    /**
+     * Prepares links for the request.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_Post $discount Post Object.
+     * @return array Links for the given discount.
+     */
+    protected function prepare_links( $discount ) {
+
+        // Prepare the base REST API endpoint for discounts.
+        $base = sprintf( '%s/%s', $this->namespace, $this->rest_base );
+
+        // Entity meta.
+        $links = array(
+            'self'       => array(
+                'href' => rest_url( trailingslashit( $base ) . $discount->ID ),
+            ),
+            'collection' => array(
+                'href' => rest_url( $base ),
+            ),
+        );
+
+        /**
+         * Filters the returned discount links for the REST API.
+         *
+         * Enables adding extra links to discount API responses.
+         *
+         * @since 1.0.13
+         *
+         * @param array   $links    Rest links.
+         */
+        return apply_filters( "wpinv_rest_discount_links", $links );
+
+    }
+
+    /**
+     * Get the link relations available for the post and current user.
+     *
+     * @since 1.0.13
+     *
+     * @param WP_Post   $discount    WP_Post object.
+     * @param WP_REST_Request $request Request object.
+     * @return array List of link relations.
+     */
+    protected function get_available_actions( $discount, $request ) {
+
+        if ( 'edit' !== $request['context'] ) {
+            return array();
+        }
+
+        $rels = array();
+
+        // Retrieve the post type object.
+        $post_type = get_post_type_object( $discount->post_type );
+
+        // Mark discount as published.
+        if ( current_user_can( $post_type->cap->publish_posts ) ) {
+            $rels[] = 'https://api.w.org/action-publish';
+        }
+
+        /**
+         * Filters the available discount link relations for the REST API.
+         *
+         * Enables adding extra link relation for the current user and request to discount responses.
+         *
+         * @since 1.0.13
+         *
+         * @param array   $rels    Available link relations.
+         */
+        return apply_filters( "wpinv_rest_discount_link_relations", $rels );
+    }
+
+    /**
+     * Handles rest requests for discount types.
+     *
+     * @since 1.0.13
+     * 
+     * 
+     * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+     */
+    public function get_discount_types() {
+        return rest_ensure_response( wpinv_get_discount_types() );
+    }
     
 }
\ No newline at end of file

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

Indentation +1661 added lines, -1661 removed lines

@@ -1,243 +1,243 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 if ( ! class_exists( 'WP_Super_Duper' ) ) {
 
 
-	/**
-	 * A Class to be able to create a Widget, Shortcode or Block to be able to output content for WordPress.
-	 *
-	 * Should not be called direct but extended instead.
-	 *
-	 * Class WP_Super_Duper
-	 * @since 1.0.16 change log moved to file change-log.txt - CHANGED
-	 * @ver 1.0.16
-	 */
-	class WP_Super_Duper extends WP_Widget {
-
-		public $version = "1.0.16";
-		public $font_awesome_icon_version = "5.11.2";
-		public $block_code;
-		public $options;
-		public $base_id;
-		public $arguments = array();
-		public $instance = array();
-		private $class_name;
-
-		/**
-		 * The relative url to the current folder.
-		 *
-		 * @var string
-		 */
-		public $url = '';
-
-		/**
-		 * Take the array options and use them to build.
-		 */
-		public function __construct( $options ) {
-			global $sd_widgets;
-
-			$sd_widgets[ $options['base_id'] ] = array(
-				'name'       => $options['name'],
-				'class_name' => $options['class_name']
-			);
-			$this->base_id                     = $options['base_id'];
-			// lets filter the options before we do anything
-			$options       = apply_filters( "wp_super_duper_options", $options );
-			$options       = apply_filters( "wp_super_duper_options_{$this->base_id}", $options );
-			$options       = $this->add_name_from_key( $options );
-			$this->options = $options;
-
-			$this->base_id   = $options['base_id'];
-			$this->arguments = isset( $options['arguments'] ) ? $options['arguments'] : array();
-
-			// init parent
-			parent::__construct( $options['base_id'], $options['name'], $options['widget_ops'] );
-
-			if ( isset( $options['class_name'] ) ) {
-				// register widget
-				$this->class_name = $options['class_name'];
-
-				// register shortcode
-				$this->register_shortcode();
-
-				// Fusion Builder (avada) support
-				if( function_exists('fusion_builder_map') ){ $this->register_fusion_element(); }
-
-				// register block
-				add_action( 'admin_enqueue_scripts', array( $this, 'register_block' ) );
-			}
-
-			// add the CSS and JS we need ONCE
-			global $sd_widget_scripts;
-
-			if ( ! $sd_widget_scripts ) {
-				wp_add_inline_script( 'admin-widgets', $this->widget_js() );
-				wp_add_inline_script( 'customize-controls', $this->widget_js() );
-				wp_add_inline_style( 'widgets', $this->widget_css() );
-
-				$sd_widget_scripts = true;
-
-				// add shortcode insert button once
-				add_action( 'media_buttons', array( $this, 'shortcode_insert_button' ) );
-				// generatepress theme sections compatibility
-				if ( function_exists( 'generate_sections_sections_metabox' ) ) {
-					add_action( 'generate_sections_metabox', array( $this, 'shortcode_insert_button_script' ) );
-				}
-				if ( $this->is_preview() ) {
-					add_action( 'wp_footer', array( $this, 'shortcode_insert_button_script' ) );
-					// this makes the insert button work for elementor
-					add_action( 'elementor/editor/after_enqueue_scripts', array(
-						$this,
-						'shortcode_insert_button_script'
-					) ); // for elementor
-				}
-				// this makes the insert button work for cornerstone
-				add_action('wp_print_footer_scripts',array( __CLASS__, 'maybe_cornerstone_builder' ));
-
-				add_action( 'wp_ajax_super_duper_get_widget_settings', array( __CLASS__, 'get_widget_settings' ) );
-				add_action( 'wp_ajax_super_duper_get_picker', array( __CLASS__, 'get_picker' ) );
-
-				// add generator text to admin head
-				add_action( 'admin_head', array( $this, 'generator' ) );
-			}
-
-			do_action( 'wp_super_duper_widget_init', $options, $this );
-		}
-
-		public function register_fusion_element(){
-
-			$options = $this->options;
-
-			if($this->base_id){
-
-				$params = $this->get_fusion_params();
-
-				$args = array(
-					'name'            => $options['name'],
-					'shortcode'       => $this->base_id,
-					'icon'            => $options['block-icon'] ? $options['block-icon'] : 'far fa-square',
-					'allow_generator' => true,
-				);
-
-				if(!empty($params)){
-					$args['params'] = $params;
-				}
-
-				fusion_builder_map($args);
-			}
-
-		}
-
-		public function get_fusion_params(){
-			$params = array();
-			$arguments = $this->get_arguments();
-
-			if(!empty($arguments)){
-				foreach($arguments as $key => $val){
-					$param = array();
-					// type
-					$param['type'] = str_replace(
-						array(
-							"text",
-							"number",
-							"email",
-							"color",
-							"checkbox"
-						),
-						array(
-							"textfield",
-							"textfield",
-							"textfield",
-							"colorpicker",
-							"select",
-
-						),
-						$val['type']);
-
-					// heading
-					$param['heading'] = $val['title'];
-
-					// description
-					$param['description'] = isset($val['desc']) ? $val['desc'] : '';
-
-					// param_name
-					$param['param_name'] = $key;
-
-					// Default 
-					$param['default'] = isset($val['default']) ? $val['default'] : '';
-
-					// Group
-					if(isset($val['group'])){
-						$param['group'] = $val['group'];
-					}
-
-					// value
-					if($val['type'] == 'checkbox'){
-						if(isset($val['default']) && $val['default'] == '0'){
-							unset($param['default']);
-						}
-						$param['value'] = array(''=>__("No"),'1'=>__("Yes"));
-					}elseif($param['type'] == 'select'){
-						$param['value'] = isset($val['options']) ? $val['options'] : array();
-					}else{
-						$param['value'] = isset($val['default']) ? $val['default'] : '';
-					}
-
-					// setup the param
-					$params[] = $param;
-
-				}
-			}
-
-
-			return $params;
-		}
-
-		/**
-		 * Maybe insert the shortcode inserter button in the footer if we are in the cornerstone builder
-		 */
-		public static function maybe_cornerstone_builder(){
-			if(did_action('cornerstone_before_boot_app')){
-				self::shortcode_insert_button_script();
-			}
-		}
-
-		/**
-		 * A function to ge the shortcode builder picker html.
-		 *
-		 * @param string $editor_id
-		 *
-		 * @return string
-		 */
-		public static function get_picker( $editor_id = '' ) {
-
-			ob_start();
-			if ( isset( $_POST['editor_id'] ) ) {
-				$editor_id = esc_attr( $_POST['editor_id'] );
-			} elseif ( isset( $_REQUEST['et_fb'] ) ) {
-				$editor_id = 'main_content_content_vb_tiny_mce';
-			}
-
-			global $sd_widgets;
-			?>
+    /**
+     * A Class to be able to create a Widget, Shortcode or Block to be able to output content for WordPress.
+     *
+     * Should not be called direct but extended instead.
+     *
+     * Class WP_Super_Duper
+     * @since 1.0.16 change log moved to file change-log.txt - CHANGED
+     * @ver 1.0.16
+     */
+    class WP_Super_Duper extends WP_Widget {
+
+        public $version = "1.0.16";
+        public $font_awesome_icon_version = "5.11.2";
+        public $block_code;
+        public $options;
+        public $base_id;
+        public $arguments = array();
+        public $instance = array();
+        private $class_name;
+
+        /**
+         * The relative url to the current folder.
+         *
+         * @var string
+         */
+        public $url = '';
+
+        /**
+         * Take the array options and use them to build.
+         */
+        public function __construct( $options ) {
+            global $sd_widgets;
+
+            $sd_widgets[ $options['base_id'] ] = array(
+                'name'       => $options['name'],
+                'class_name' => $options['class_name']
+            );
+            $this->base_id                     = $options['base_id'];
+            // lets filter the options before we do anything
+            $options       = apply_filters( "wp_super_duper_options", $options );
+            $options       = apply_filters( "wp_super_duper_options_{$this->base_id}", $options );
+            $options       = $this->add_name_from_key( $options );
+            $this->options = $options;
+
+            $this->base_id   = $options['base_id'];
+            $this->arguments = isset( $options['arguments'] ) ? $options['arguments'] : array();
+
+            // init parent
+            parent::__construct( $options['base_id'], $options['name'], $options['widget_ops'] );
+
+            if ( isset( $options['class_name'] ) ) {
+                // register widget
+                $this->class_name = $options['class_name'];
+
+                // register shortcode
+                $this->register_shortcode();
+
+                // Fusion Builder (avada) support
+                if( function_exists('fusion_builder_map') ){ $this->register_fusion_element(); }
+
+                // register block
+                add_action( 'admin_enqueue_scripts', array( $this, 'register_block' ) );
+            }
+
+            // add the CSS and JS we need ONCE
+            global $sd_widget_scripts;
+
+            if ( ! $sd_widget_scripts ) {
+                wp_add_inline_script( 'admin-widgets', $this->widget_js() );
+                wp_add_inline_script( 'customize-controls', $this->widget_js() );
+                wp_add_inline_style( 'widgets', $this->widget_css() );
+
+                $sd_widget_scripts = true;
+
+                // add shortcode insert button once
+                add_action( 'media_buttons', array( $this, 'shortcode_insert_button' ) );
+                // generatepress theme sections compatibility
+                if ( function_exists( 'generate_sections_sections_metabox' ) ) {
+                    add_action( 'generate_sections_metabox', array( $this, 'shortcode_insert_button_script' ) );
+                }
+                if ( $this->is_preview() ) {
+                    add_action( 'wp_footer', array( $this, 'shortcode_insert_button_script' ) );
+                    // this makes the insert button work for elementor
+                    add_action( 'elementor/editor/after_enqueue_scripts', array(
+                        $this,
+                        'shortcode_insert_button_script'
+                    ) ); // for elementor
+                }
+                // this makes the insert button work for cornerstone
+                add_action('wp_print_footer_scripts',array( __CLASS__, 'maybe_cornerstone_builder' ));
+
+                add_action( 'wp_ajax_super_duper_get_widget_settings', array( __CLASS__, 'get_widget_settings' ) );
+                add_action( 'wp_ajax_super_duper_get_picker', array( __CLASS__, 'get_picker' ) );
+
+                // add generator text to admin head
+                add_action( 'admin_head', array( $this, 'generator' ) );
+            }
+
+            do_action( 'wp_super_duper_widget_init', $options, $this );
+        }
+
+        public function register_fusion_element(){
+
+            $options = $this->options;
+
+            if($this->base_id){
+
+                $params = $this->get_fusion_params();
+
+                $args = array(
+                    'name'            => $options['name'],
+                    'shortcode'       => $this->base_id,
+                    'icon'            => $options['block-icon'] ? $options['block-icon'] : 'far fa-square',
+                    'allow_generator' => true,
+                );
+
+                if(!empty($params)){
+                    $args['params'] = $params;
+                }
+
+                fusion_builder_map($args);
+            }
+
+        }
+
+        public function get_fusion_params(){
+            $params = array();
+            $arguments = $this->get_arguments();
+
+            if(!empty($arguments)){
+                foreach($arguments as $key => $val){
+                    $param = array();
+                    // type
+                    $param['type'] = str_replace(
+                        array(
+                            "text",
+                            "number",
+                            "email",
+                            "color",
+                            "checkbox"
+                        ),
+                        array(
+                            "textfield",
+                            "textfield",
+                            "textfield",
+                            "colorpicker",
+                            "select",
+
+                        ),
+                        $val['type']);
+
+                    // heading
+                    $param['heading'] = $val['title'];
+
+                    // description
+                    $param['description'] = isset($val['desc']) ? $val['desc'] : '';
+
+                    // param_name
+                    $param['param_name'] = $key;
+
+                    // Default 
+                    $param['default'] = isset($val['default']) ? $val['default'] : '';
+
+                    // Group
+                    if(isset($val['group'])){
+                        $param['group'] = $val['group'];
+                    }
+
+                    // value
+                    if($val['type'] == 'checkbox'){
+                        if(isset($val['default']) && $val['default'] == '0'){
+                            unset($param['default']);
+                        }
+                        $param['value'] = array(''=>__("No"),'1'=>__("Yes"));
+                    }elseif($param['type'] == 'select'){
+                        $param['value'] = isset($val['options']) ? $val['options'] : array();
+                    }else{
+                        $param['value'] = isset($val['default']) ? $val['default'] : '';
+                    }
+
+                    // setup the param
+                    $params[] = $param;
+
+                }
+            }
+
+
+            return $params;
+        }
+
+        /**
+         * Maybe insert the shortcode inserter button in the footer if we are in the cornerstone builder
+         */
+        public static function maybe_cornerstone_builder(){
+            if(did_action('cornerstone_before_boot_app')){
+                self::shortcode_insert_button_script();
+            }
+        }
+
+        /**
+         * A function to ge the shortcode builder picker html.
+         *
+         * @param string $editor_id
+         *
+         * @return string
+         */
+        public static function get_picker( $editor_id = '' ) {
+
+            ob_start();
+            if ( isset( $_POST['editor_id'] ) ) {
+                $editor_id = esc_attr( $_POST['editor_id'] );
+            } elseif ( isset( $_REQUEST['et_fb'] ) ) {
+                $editor_id = 'main_content_content_vb_tiny_mce';
+            }
+
+            global $sd_widgets;
+            ?>
 
 			<div class="sd-shortcode-left-wrap">
 				<?php
-				ksort( $sd_widgets );
-				//				print_r($sd_widgets);exit;
-				if ( ! empty( $sd_widgets ) ) {
-					echo '<select class="widefat" onchange="sd_get_shortcode_options(this);">';
-					echo "<option>" . __( 'Select shortcode' ) . "</option>";
-					foreach ( $sd_widgets as $shortcode => $class ) {
-						echo "<option value='" . esc_attr( $shortcode ) . "'>" . esc_attr( $shortcode ) . " (" . esc_attr( $class['name'] ) . ")</option>";
-					}
-					echo "</select>";
-
-				}
-				?>
+                ksort( $sd_widgets );
+                //				print_r($sd_widgets);exit;
+                if ( ! empty( $sd_widgets ) ) {
+                    echo '<select class="widefat" onchange="sd_get_shortcode_options(this);">';
+                    echo "<option>" . __( 'Select shortcode' ) . "</option>";
+                    foreach ( $sd_widgets as $shortcode => $class ) {
+                        echo "<option value='" . esc_attr( $shortcode ) . "'>" . esc_attr( $shortcode ) . " (" . esc_attr( $class['name'] ) . ")</option>";
+                    }
+                    echo "</select>";
+
+                }
+                ?>
 				<div class="sd-shortcode-settings"></div>
 
 			</div>
@@ -248,8 +248,8 @@ 
 					<?php if ( $editor_id != '' ) { ?>
 						<button class="button sd-insert-shortcode-button"
 						        onclick="sd_insert_shortcode(<?php if ( ! empty( $editor_id ) ) {
-							        echo "'" . $editor_id . "'";
-						        } ?>)"><?php _e( 'Insert shortcode' ); ?></button>
+                                    echo "'" . $editor_id . "'";
+                                } ?>)"><?php _e( 'Insert shortcode' ); ?></button>
 					<?php } ?>
 					<button class="button"
 					        onclick="sd_copy_to_clipboard()"><?php _e( 'Copy shortcode' ); ?></button>
@@ -257,134 +257,134 @@ 
 			</div>
 			<?php
 
-			$html = ob_get_clean();
-
-			if ( wp_doing_ajax() ) {
-				echo $html;
-				$should_die = true;
-
-				// some builder get the editor via ajax so we should not die on those ocasions
-				$dont_die = array(
-					'parent_tag',// WP Bakery
-					'avia_request' // enfold
-				);
-
-				foreach ( $dont_die as $request ) {
-					if ( isset( $_REQUEST[ $request ] ) ) {
-						$should_die = false;
-					}
-				}
-
-				if ( $should_die ) {
-					wp_die();
-				}
-
-			} else {
-				return $html;
-			}
-
-			return '';
-
-		}
-
-		/**
-		 * Output the version in the admin header.
-		 */
-		public function generator() {
-			echo '<meta name="generator" content="WP Super Duper v' . $this->version . '" />';
-		}
-
-		/**
-		 * Get widget settings.
-		 *
-		 * @since 1.0.0
-		 */
-		public static function get_widget_settings() {
-			global $sd_widgets;
-
-			$shortcode = isset( $_REQUEST['shortcode'] ) && $_REQUEST['shortcode'] ? sanitize_title_with_dashes( $_REQUEST['shortcode'] ) : '';
-			if ( ! $shortcode ) {
-				wp_die();
-			}
-			$widget_args = isset( $sd_widgets[ $shortcode ] ) ? $sd_widgets[ $shortcode ] : '';
-			if ( ! $widget_args ) {
-				wp_die();
-			}
-			$class_name = isset( $widget_args['class_name'] ) && $widget_args['class_name'] ? $widget_args['class_name'] : '';
-			if ( ! $class_name ) {
-				wp_die();
-			}
-
-			// invoke an instance method
-			$widget = new $class_name;
-
-			ob_start();
-			$widget->form( array() );
-			$form = ob_get_clean();
-			echo "<form id='$shortcode'>" . $form . "<div class=\"widget-control-save\"></div></form>";
-			echo "<style>" . $widget->widget_css() . "</style>";
-			echo "<script>" . $widget->widget_js() . "</script>";
-			?>
+            $html = ob_get_clean();
+
+            if ( wp_doing_ajax() ) {
+                echo $html;
+                $should_die = true;
+
+                // some builder get the editor via ajax so we should not die on those ocasions
+                $dont_die = array(
+                    'parent_tag',// WP Bakery
+                    'avia_request' // enfold
+                );
+
+                foreach ( $dont_die as $request ) {
+                    if ( isset( $_REQUEST[ $request ] ) ) {
+                        $should_die = false;
+                    }
+                }
+
+                if ( $should_die ) {
+                    wp_die();
+                }
+
+            } else {
+                return $html;
+            }
+
+            return '';
+
+        }
+
+        /**
+         * Output the version in the admin header.
+         */
+        public function generator() {
+            echo '<meta name="generator" content="WP Super Duper v' . $this->version . '" />';
+        }
+
+        /**
+         * Get widget settings.
+         *
+         * @since 1.0.0
+         */
+        public static function get_widget_settings() {
+            global $sd_widgets;
+
+            $shortcode = isset( $_REQUEST['shortcode'] ) && $_REQUEST['shortcode'] ? sanitize_title_with_dashes( $_REQUEST['shortcode'] ) : '';
+            if ( ! $shortcode ) {
+                wp_die();
+            }
+            $widget_args = isset( $sd_widgets[ $shortcode ] ) ? $sd_widgets[ $shortcode ] : '';
+            if ( ! $widget_args ) {
+                wp_die();
+            }
+            $class_name = isset( $widget_args['class_name'] ) && $widget_args['class_name'] ? $widget_args['class_name'] : '';
+            if ( ! $class_name ) {
+                wp_die();
+            }
+
+            // invoke an instance method
+            $widget = new $class_name;
+
+            ob_start();
+            $widget->form( array() );
+            $form = ob_get_clean();
+            echo "<form id='$shortcode'>" . $form . "<div class=\"widget-control-save\"></div></form>";
+            echo "<style>" . $widget->widget_css() . "</style>";
+            echo "<script>" . $widget->widget_js() . "</script>";
+            ?>
 			<?php
-			wp_die();
-		}
-
-		/**
-		 * Insert shortcode builder button to classic editor (not inside Gutenberg, not needed).
-		 *
-		 * @since 1.0.0
-		 *
-		 * @param string $editor_id Optional. Shortcode editor id. Default null.
-		 * @param string $insert_shortcode_function Optional. Insert shotcode function. Default null.
-		 */
-		public static function shortcode_insert_button( $editor_id = '', $insert_shortcode_function = '' ) {
-			global $sd_widgets, $shortcode_insert_button_once;
-			if ( $shortcode_insert_button_once ) {
-				return;
-			}
-			add_thickbox();
-
-
-			/**
-			 * Cornerstone makes us play dirty tricks :/
-			 * All media_buttons are removed via JS unless they are two specific id's so we wrap our content in this ID so it is not removed.
-			 */
-			if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
-				echo '<span id="insert-media-button">';
-			}
-
-			echo self::shortcode_button( 'this', 'true' );
-
-			// see opening note
-			if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
-				echo '</span>'; // end #insert-media-button
-			}
-
-			// Add separate script for generatepress theme sections
-			if ( function_exists( 'generate_sections_sections_metabox' ) && did_action( 'generate_sections_metabox' ) ) {
-			} else {
-				self::shortcode_insert_button_script( $editor_id, $insert_shortcode_function );
-			}
-
-			$shortcode_insert_button_once = true;
-		}
-
-		/**
-		 * Gets the shortcode insert button html.
-		 *
-		 * @param string $id
-		 * @param string $search_for_id
-		 *
-		 * @return mixed
-		 */
-		public static function shortcode_button( $id = '', $search_for_id = '' ) {
-			ob_start();
-			?>
+            wp_die();
+        }
+
+        /**
+         * Insert shortcode builder button to classic editor (not inside Gutenberg, not needed).
+         *
+         * @since 1.0.0
+         *
+         * @param string $editor_id Optional. Shortcode editor id. Default null.
+         * @param string $insert_shortcode_function Optional. Insert shotcode function. Default null.
+         */
+        public static function shortcode_insert_button( $editor_id = '', $insert_shortcode_function = '' ) {
+            global $sd_widgets, $shortcode_insert_button_once;
+            if ( $shortcode_insert_button_once ) {
+                return;
+            }
+            add_thickbox();
+
+
+            /**
+             * Cornerstone makes us play dirty tricks :/
+             * All media_buttons are removed via JS unless they are two specific id's so we wrap our content in this ID so it is not removed.
+             */
+            if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
+                echo '<span id="insert-media-button">';
+            }
+
+            echo self::shortcode_button( 'this', 'true' );
+
+            // see opening note
+            if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
+                echo '</span>'; // end #insert-media-button
+            }
+
+            // Add separate script for generatepress theme sections
+            if ( function_exists( 'generate_sections_sections_metabox' ) && did_action( 'generate_sections_metabox' ) ) {
+            } else {
+                self::shortcode_insert_button_script( $editor_id, $insert_shortcode_function );
+            }
+
+            $shortcode_insert_button_once = true;
+        }
+
+        /**
+         * Gets the shortcode insert button html.
+         *
+         * @param string $id
+         * @param string $search_for_id
+         *
+         * @return mixed
+         */
+        public static function shortcode_button( $id = '', $search_for_id = '' ) {
+            ob_start();
+            ?>
 			<span class="sd-lable-shortcode-inserter">
 				<a onclick="sd_ajax_get_picker(<?php echo $id;
-				if ( $search_for_id ) {
-					echo "," . $search_for_id;
-				} ?>);" href="#TB_inline?width=100%&height=550&inlineId=super-duper-content-ajaxed"
+                if ( $search_for_id ) {
+                    echo "," . $search_for_id;
+                } ?>);" href="#TB_inline?width=100%&height=550&inlineId=super-duper-content-ajaxed"
 				   class="thickbox button super-duper-content-open" title="Add Shortcode">
 					<span style="vertical-align: middle;line-height: 18px;font-size: 20px;"
 					      class="dashicons dashicons-screenoptions"></span>
@@ -395,21 +395,21 @@ 
 			</span>
 
 			<?php
-			$html = ob_get_clean();
-
-			// remove line breaks so we can use it in js
-			return preg_replace( "/\r|\n/", "", trim( $html ) );
-		}
-
-		/**
-		 * Makes SD work with the siteOrigin page builder.
-		 *
-		 * @since 1.0.6
-		 * @return mixed
-		 */
-		public static function siteorigin_js() {
-			ob_start();
-			?>
+            $html = ob_get_clean();
+
+            // remove line breaks so we can use it in js
+            return preg_replace( "/\r|\n/", "", trim( $html ) );
+        }
+
+        /**
+         * Makes SD work with the siteOrigin page builder.
+         *
+         * @since 1.0.6
+         * @return mixed
+         */
+        public static function siteorigin_js() {
+            ob_start();
+            ?>
 			<script>
 				/**
 				 * Check a form to see what items shoudl be shown or hidden.
@@ -487,28 +487,28 @@ 
 				});
 			</script>
 			<?php
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', $output );
-		}
-
-		/**
-		 * Output the JS and CSS for the shortcode insert button.
-		 *
-		 * @since 1.0.6
-		 *
-		 * @param string $editor_id
-		 * @param string $insert_shortcode_function
-		 */
-		public static function shortcode_insert_button_script( $editor_id = '', $insert_shortcode_function = '' ) {
-			?>
+            return str_replace( array(
+                '<script>',
+                '</script>'
+            ), '', $output );
+        }
+
+        /**
+         * Output the JS and CSS for the shortcode insert button.
+         *
+         * @since 1.0.6
+         *
+         * @param string $editor_id
+         * @param string $insert_shortcode_function
+         */
+        public static function shortcode_insert_button_script( $editor_id = '', $insert_shortcode_function = '' ) {
+            ?>
 			<style>
 				.sd-shortcode-left-wrap {
 					float: left;
@@ -632,35 +632,35 @@ 
 				<?php } ?>
 			</style>
 			<?php
-			if ( class_exists( 'SiteOrigin_Panels' ) ) {
-				echo "<script>" . self::siteorigin_js() . "</script>";
-			}
-			?>
+            if ( class_exists( 'SiteOrigin_Panels' ) ) {
+                echo "<script>" . self::siteorigin_js() . "</script>";
+            }
+            ?>
 			<script>
 				<?php
-				if(! empty( $insert_shortcode_function )){
-					echo $insert_shortcode_function;
-				}else{
-
-				/**
-				 * Function for super duper insert shortcode.
-				 *
-				 * @since 1.0.0
-				 */
-				?>
+                if(! empty( $insert_shortcode_function )){
+                    echo $insert_shortcode_function;
+                }else{
+
+                /**
+                 * Function for super duper insert shortcode.
+                 *
+                 * @since 1.0.0
+                 */
+                ?>
 				function sd_insert_shortcode($editor_id) {
 					$shortcode = jQuery('#TB_ajaxContent #sd-shortcode-output').val();
 					if ($shortcode) {
 						if (!$editor_id) {
 							<?php
-							if ( isset( $_REQUEST['et_fb'] ) ) {
-								echo '$editor_id = "#main_content_content_vb_tiny_mce";';
-							} elseif ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) {
-								echo '$editor_id = "#elementor-controls .wp-editor-container textarea";';
-							} else {
-								echo '$editor_id = "#wp-content-editor-container textarea";';
-							}
-							?>
+                            if ( isset( $_REQUEST['et_fb'] ) ) {
+                                echo '$editor_id = "#main_content_content_vb_tiny_mce";';
+                            } elseif ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) {
+                                echo '$editor_id = "#elementor-controls .wp-editor-container textarea";';
+                            } else {
+                                echo '$editor_id = "#wp-content-editor-container textarea";';
+                            }
+                            ?>
 						} else {
 							$editor_id = '#' + $editor_id;
 						}
@@ -986,16 +986,16 @@ 
 
 			</script>
 			<?php
-		}
-
-		/**
-		 * Gets some CSS for the widgets screen.
-		 *
-		 * @return mixed
-		 */
-		public function widget_css() {
-			ob_start();
-			?>
+        }
+
+        /**
+         * Gets some CSS for the widgets screen.
+         *
+         * @return mixed
+         */
+        public function widget_css() {
+            ob_start();
+            ?>
 			<style>
 				.sd-advanced-setting {
 					display: none;
@@ -1030,26 +1030,26 @@ 
 				}
 			</style>
 			<?php
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<style>',
-				'</style>'
-			), '', $output );
-		}
-
-		/**
-		 * Gets some JS for the widgets screen.
-		 *
-		 * @return mixed
-		 */
-		public function widget_js() {
-			ob_start();
-			?>
+            return str_replace( array(
+                '<style>',
+                '</style>'
+            ), '', $output );
+        }
+
+        /**
+         * Gets some JS for the widgets screen.
+         *
+         * @return mixed
+         */
+        public function widget_js() {
+            ob_start();
+            ?>
 			<script>
 
 				/**
@@ -1204,397 +1204,397 @@ 
 				<?php do_action( 'wp_super_duper_widget_js', $this ); ?>
 			</script>
 			<?php
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', $output );
-		}
-
-
-		/**
-		 * Set the name from the argument key.
-		 *
-		 * @param $options
-		 *
-		 * @return mixed
-		 */
-		private function add_name_from_key( $options, $arguments = false ) {
-			if ( ! empty( $options['arguments'] ) ) {
-				foreach ( $options['arguments'] as $key => $val ) {
-					$options['arguments'][ $key ]['name'] = $key;
-				}
-			} elseif ( $arguments && is_array( $options ) && ! empty( $options ) ) {
-				foreach ( $options as $key => $val ) {
-					$options[ $key ]['name'] = $key;
-				}
-			}
-
-			return $options;
-		}
-
-		/**
-		 * Register the parent shortcode.
-		 *
-		 * @since 1.0.0
-		 */
-		public function register_shortcode() {
-			add_shortcode( $this->base_id, array( $this, 'shortcode_output' ) );
-			add_action( 'wp_ajax_super_duper_output_shortcode', array( __CLASS__, 'render_shortcode' ) );
-		}
-
-		/**
-		 * Render the shortcode via ajax so we can return it to Gutenberg.
-		 *
-		 * @since 1.0.0
-		 */
-		public static function render_shortcode() {
-
-			check_ajax_referer( 'super_duper_output_shortcode', '_ajax_nonce', true );
-			if ( ! current_user_can( 'manage_options' ) ) {
-				wp_die();
-			}
-
-			// we might need the $post value here so lets set it.
-			if ( isset( $_POST['post_id'] ) && $_POST['post_id'] ) {
-				$post_obj = get_post( absint( $_POST['post_id'] ) );
-				if ( ! empty( $post_obj ) && empty( $post ) ) {
-					global $post;
-					$post = $post_obj;
-				}
-			}
-
-			if ( isset( $_POST['shortcode'] ) && $_POST['shortcode'] ) {
-				$shortcode_name   = sanitize_title_with_dashes( $_POST['shortcode'] );
-				$attributes_array = isset( $_POST['attributes'] ) && $_POST['attributes'] ? $_POST['attributes'] : array();
-				$attributes       = '';
-				if ( ! empty( $attributes_array ) ) {
-					foreach ( $attributes_array as $key => $value ) {
-						$attributes .= " " . sanitize_title_with_dashes( $key ) . "='" . wp_slash( $value ) . "' ";
-					}
-				}
-
-				$shortcode = "[" . $shortcode_name . " " . $attributes . "]";
-
-				echo do_shortcode( $shortcode );
-
-			}
-			wp_die();
-		}
-
-		/**
-		 * Output the shortcode.
-		 *
-		 * @param array $args
-		 * @param string $content
-		 *
-		 * @return string
-		 */
-		public function shortcode_output( $args = array(), $content = '' ) {
-			$args = self::argument_values( $args );
-
-			// add extra argument so we know its a output to gutenberg
-			//$args
-			$args = $this->string_to_bool( $args );
-
-			// if we have a enclosed shortcode we add it to the special `html` argument
-			if(!empty($content)){
-				$args['html'] = $content;
-			}
-
-			$class = isset( $this->options['widget_ops']['classname'] ) ? esc_attr( $this->options['widget_ops']['classname'] ) : '';
-
-			$class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
-			$class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
-
-			$attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
-			$attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this ); //@todo this does not seem right @kiran?
-
-			$shortcode_args = array();
-			$output         = '';
-			$no_wrap        = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
-			if( isset( $args['no_wrap'] ) && $args['no_wrap'] ){ $no_wrap = true; }
-			$main_content   = $this->output( $args, $shortcode_args, $content );
-			if ( $main_content && ! $no_wrap ) {
-				// wrap the shortcode in a div with the same class as the widget
-				$output .= '<div class="' . $class . '" ' . $attrs . '>';
-				if ( ! empty( $args['title'] ) ) {
-					// if its a shortcode and there is a title try to grab the title wrappers
-					$shortcode_args = array( 'before_title' => '', 'after_title' => '' );
-					if ( empty( $instance ) ) {
-						global $wp_registered_sidebars;
-						if ( ! empty( $wp_registered_sidebars ) ) {
-							foreach ( $wp_registered_sidebars as $sidebar ) {
-								if ( ! empty( $sidebar['before_title'] ) ) {
-									$shortcode_args['before_title'] = $sidebar['before_title'];
-									$shortcode_args['after_title']  = $sidebar['after_title'];
-									break;
-								}
-							}
-						}
-					}
-					$output .= $this->output_title( $shortcode_args, $args );
-				}
-				$output .= $main_content;
-				$output .= '</div>';
-			} elseif ( $main_content && $no_wrap ) {
-				$output .= $main_content;
-			}
-
-			// if preview show a placeholder if empty
-			if ( $this->is_preview() && $output == '' ) {
-				$output = $this->preview_placeholder_text( "[{" . $this->base_id . "}]" );
-			}
-
-			return apply_filters( 'wp_super_duper_widget_output', $output, $args, $shortcode_args, $this );
-		}
-
-		/**
-		 * Placeholder text to show if output is empty and we are on a preview/builder page.
-		 *
-		 * @param string $name
-		 *
-		 * @return string
-		 */
-		public function preview_placeholder_text( $name = '' ) {
-			return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . sprintf( __( 'Placeholder for: %s' ), $name ) . "</div>";
-		}
-
-		/**
-		 * Sometimes booleans values can be turned to strings, so we fix that.
-		 *
-		 * @param $options
-		 *
-		 * @return mixed
-		 */
-		public function string_to_bool( $options ) {
-			// convert bool strings to booleans
-			foreach ( $options as $key => $val ) {
-				if ( $val == 'false' ) {
-					$options[ $key ] = false;
-				} elseif ( $val == 'true' ) {
-					$options[ $key ] = true;
-				}
-			}
-
-			return $options;
-		}
-
-		/**
-		 * Get the argument values that are also filterable.
-		 *
-		 * @param $instance
-		 *
-		 * @since 1.0.12 Don't set checkbox default value if the value is empty.
-		 *
-		 * @return array
-		 */
-		public function argument_values( $instance ) {
-			$argument_values = array();
-
-			// set widget instance
-			$this->instance = $instance;
-
-			if ( empty( $this->arguments ) ) {
-				$this->arguments = $this->get_arguments();
-			}
-
-			if ( ! empty( $this->arguments ) ) {
-				foreach ( $this->arguments as $key => $args ) {
-					// set the input name from the key
-					$args['name'] = $key;
-					//
-					$argument_values[ $key ] = isset( $instance[ $key ] ) ? $instance[ $key ] : '';
-					if($args['type']=='checkbox' && $argument_values[ $key ] == ''){
-						// don't set default for an empty checkbox
-					}
-					elseif ( $argument_values[ $key ] == '' && isset( $args['default'] ) ) {
-						$argument_values[ $key ] = $args['default'];
-					}
-				}
-			}
-
-			return $argument_values;
-		}
-
-		/**
-		 * Set arguments in super duper.
-		 *
-		 * @since 1.0.0
-		 *
-		 * @return array Set arguments.
-		 */
-		public function set_arguments() {
-			return $this->arguments;
-		}
-
-		/**
-		 * Get arguments in super duper.
-		 *
-		 * @since 1.0.0
-		 *
-		 * @return array Get arguments.
-		 */
-		public function get_arguments() {
-			if ( empty( $this->arguments ) ) {
-				$this->arguments = $this->set_arguments();
-			}
-
-			$this->arguments = apply_filters( 'wp_super_duper_arguments', $this->arguments, $this->options, $this->instance );
-			$this->arguments = $this->add_name_from_key( $this->arguments, true );
-
-			return $this->arguments;
-		}
-
-		/**
-		 * This is the main output class for all 3 items, widget, shortcode and block, it is extended in the calling class.
-		 *
-		 * @param array $args
-		 * @param array $widget_args
-		 * @param string $content
-		 */
-		public function output( $args = array(), $widget_args = array(), $content = '' ) {
-
-		}
-
-		/**
-		 * Add the dynamic block code inline when the wp-block in enqueued.
-		 */
-		public function register_block() {
-			wp_add_inline_script( 'wp-blocks', $this->block() );
-			if ( class_exists( 'SiteOrigin_Panels' ) ) {
-
-				wp_add_inline_script( 'wp-blocks', $this->siteorigin_js() );
-
-			}
-		}
-
-		/**
-		 * Check if we need to show advanced options.
-		 *
-		 * @return bool
-		 */
-		public function block_show_advanced() {
-
-			$show      = false;
-			$arguments = $this->arguments;
-
-			if ( empty( $arguments ) ) {
-				$arguments = $this->get_arguments();
-			}
-
-			if ( ! empty( $arguments ) ) {
-				foreach ( $arguments as $argument ) {
-					if ( isset( $argument['advanced'] ) && $argument['advanced'] ) {
-						$show = true;
-						break; // no need to continue if we know we have it
-					}
-				}
-			}
-
-			return $show;
-		}
-
-		/**
-		 * Get the url path to the current folder.
-		 *
-		 * @return string
-		 */
-		public function get_url() {
-
-			$url = $this->url;
-
-			if(!$url){
-				// check if we are inside a plugin
-				$file_dir = str_replace("/includes","", dirname( __FILE__ ));
-
-				$dir_parts = explode("/wp-content/",$file_dir);
-				$url_parts = explode("/wp-content/",plugins_url());
-
-				if(!empty($url_parts[0]) && !empty($dir_parts[1])){
-					$url = trailingslashit( $url_parts[0]."/wp-content/".$dir_parts[1] );
-					$this->url = $url;
-				}
-			}
-
-
-			return $url;
-		}
-
-		/**
-		 * Generate the block icon.
-		 *
-		 * Enables the use of Font Awesome icons.
-		 *
-		 * @note xlink:href is actually deprecated but href is not supported by all so we use both.
-		 * @param $icon
-		 * @since 1.1.0
-		 * @return string
-		 */
-		public function get_block_icon($icon){
-
-			// check if we have a Font Awesome icon
-			$fa_type = '';
-			if(substr( $icon, 0, 7 ) === "fas fa-"){
-				$fa_type = 'solid';
-			}elseif(substr( $icon, 0, 7 ) === "far fa-"){
-				$fa_type = 'regular';
-			}elseif(substr( $icon, 0, 7 ) === "fab fa-"){
-				$fa_type = 'brands';
-			}else{
-				$icon = "'".$icon."'";
-			}
-
-			// set the icon if we found one
-			if($fa_type){
-				$fa_icon = str_replace(array("fas fa-","far fa-","fab fa-"),"",$icon);
-				$icon  = "el('svg',{width: 20, height: 20, viewBox: '0 0 20 20'},el('use', {'xlink:href': '".$this->get_url()."icons/".$fa_type.".svg#".$fa_icon."','href': '".$this->get_url()."icons/".$fa_type.".svg#".$fa_icon."'}))";
-			}
-
-			return $icon;
-		}
-
-		public function group_arguments($arguments){
+            return str_replace( array(
+                '<script>',
+                '</script>'
+            ), '', $output );
+        }
+
+
+        /**
+         * Set the name from the argument key.
+         *
+         * @param $options
+         *
+         * @return mixed
+         */
+        private function add_name_from_key( $options, $arguments = false ) {
+            if ( ! empty( $options['arguments'] ) ) {
+                foreach ( $options['arguments'] as $key => $val ) {
+                    $options['arguments'][ $key ]['name'] = $key;
+                }
+            } elseif ( $arguments && is_array( $options ) && ! empty( $options ) ) {
+                foreach ( $options as $key => $val ) {
+                    $options[ $key ]['name'] = $key;
+                }
+            }
+
+            return $options;
+        }
+
+        /**
+         * Register the parent shortcode.
+         *
+         * @since 1.0.0
+         */
+        public function register_shortcode() {
+            add_shortcode( $this->base_id, array( $this, 'shortcode_output' ) );
+            add_action( 'wp_ajax_super_duper_output_shortcode', array( __CLASS__, 'render_shortcode' ) );
+        }
+
+        /**
+         * Render the shortcode via ajax so we can return it to Gutenberg.
+         *
+         * @since 1.0.0
+         */
+        public static function render_shortcode() {
+
+            check_ajax_referer( 'super_duper_output_shortcode', '_ajax_nonce', true );
+            if ( ! current_user_can( 'manage_options' ) ) {
+                wp_die();
+            }
+
+            // we might need the $post value here so lets set it.
+            if ( isset( $_POST['post_id'] ) && $_POST['post_id'] ) {
+                $post_obj = get_post( absint( $_POST['post_id'] ) );
+                if ( ! empty( $post_obj ) && empty( $post ) ) {
+                    global $post;
+                    $post = $post_obj;
+                }
+            }
+
+            if ( isset( $_POST['shortcode'] ) && $_POST['shortcode'] ) {
+                $shortcode_name   = sanitize_title_with_dashes( $_POST['shortcode'] );
+                $attributes_array = isset( $_POST['attributes'] ) && $_POST['attributes'] ? $_POST['attributes'] : array();
+                $attributes       = '';
+                if ( ! empty( $attributes_array ) ) {
+                    foreach ( $attributes_array as $key => $value ) {
+                        $attributes .= " " . sanitize_title_with_dashes( $key ) . "='" . wp_slash( $value ) . "' ";
+                    }
+                }
+
+                $shortcode = "[" . $shortcode_name . " " . $attributes . "]";
+
+                echo do_shortcode( $shortcode );
+
+            }
+            wp_die();
+        }
+
+        /**
+         * Output the shortcode.
+         *
+         * @param array $args
+         * @param string $content
+         *
+         * @return string
+         */
+        public function shortcode_output( $args = array(), $content = '' ) {
+            $args = self::argument_values( $args );
+
+            // add extra argument so we know its a output to gutenberg
+            //$args
+            $args = $this->string_to_bool( $args );
+
+            // if we have a enclosed shortcode we add it to the special `html` argument
+            if(!empty($content)){
+                $args['html'] = $content;
+            }
+
+            $class = isset( $this->options['widget_ops']['classname'] ) ? esc_attr( $this->options['widget_ops']['classname'] ) : '';
+
+            $class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
+            $class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
+
+            $attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
+            $attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this ); //@todo this does not seem right @kiran?
+
+            $shortcode_args = array();
+            $output         = '';
+            $no_wrap        = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
+            if( isset( $args['no_wrap'] ) && $args['no_wrap'] ){ $no_wrap = true; }
+            $main_content   = $this->output( $args, $shortcode_args, $content );
+            if ( $main_content && ! $no_wrap ) {
+                // wrap the shortcode in a div with the same class as the widget
+                $output .= '<div class="' . $class . '" ' . $attrs . '>';
+                if ( ! empty( $args['title'] ) ) {
+                    // if its a shortcode and there is a title try to grab the title wrappers
+                    $shortcode_args = array( 'before_title' => '', 'after_title' => '' );
+                    if ( empty( $instance ) ) {
+                        global $wp_registered_sidebars;
+                        if ( ! empty( $wp_registered_sidebars ) ) {
+                            foreach ( $wp_registered_sidebars as $sidebar ) {
+                                if ( ! empty( $sidebar['before_title'] ) ) {
+                                    $shortcode_args['before_title'] = $sidebar['before_title'];
+                                    $shortcode_args['after_title']  = $sidebar['after_title'];
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    $output .= $this->output_title( $shortcode_args, $args );
+                }
+                $output .= $main_content;
+                $output .= '</div>';
+            } elseif ( $main_content && $no_wrap ) {
+                $output .= $main_content;
+            }
+
+            // if preview show a placeholder if empty
+            if ( $this->is_preview() && $output == '' ) {
+                $output = $this->preview_placeholder_text( "[{" . $this->base_id . "}]" );
+            }
+
+            return apply_filters( 'wp_super_duper_widget_output', $output, $args, $shortcode_args, $this );
+        }
+
+        /**
+         * Placeholder text to show if output is empty and we are on a preview/builder page.
+         *
+         * @param string $name
+         *
+         * @return string
+         */
+        public function preview_placeholder_text( $name = '' ) {
+            return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . sprintf( __( 'Placeholder for: %s' ), $name ) . "</div>";
+        }
+
+        /**
+         * Sometimes booleans values can be turned to strings, so we fix that.
+         *
+         * @param $options
+         *
+         * @return mixed
+         */
+        public function string_to_bool( $options ) {
+            // convert bool strings to booleans
+            foreach ( $options as $key => $val ) {
+                if ( $val == 'false' ) {
+                    $options[ $key ] = false;
+                } elseif ( $val == 'true' ) {
+                    $options[ $key ] = true;
+                }
+            }
+
+            return $options;
+        }
+
+        /**
+         * Get the argument values that are also filterable.
+         *
+         * @param $instance
+         *
+         * @since 1.0.12 Don't set checkbox default value if the value is empty.
+         *
+         * @return array
+         */
+        public function argument_values( $instance ) {
+            $argument_values = array();
+
+            // set widget instance
+            $this->instance = $instance;
+
+            if ( empty( $this->arguments ) ) {
+                $this->arguments = $this->get_arguments();
+            }
+
+            if ( ! empty( $this->arguments ) ) {
+                foreach ( $this->arguments as $key => $args ) {
+                    // set the input name from the key
+                    $args['name'] = $key;
+                    //
+                    $argument_values[ $key ] = isset( $instance[ $key ] ) ? $instance[ $key ] : '';
+                    if($args['type']=='checkbox' && $argument_values[ $key ] == ''){
+                        // don't set default for an empty checkbox
+                    }
+                    elseif ( $argument_values[ $key ] == '' && isset( $args['default'] ) ) {
+                        $argument_values[ $key ] = $args['default'];
+                    }
+                }
+            }
+
+            return $argument_values;
+        }
+
+        /**
+         * Set arguments in super duper.
+         *
+         * @since 1.0.0
+         *
+         * @return array Set arguments.
+         */
+        public function set_arguments() {
+            return $this->arguments;
+        }
+
+        /**
+         * Get arguments in super duper.
+         *
+         * @since 1.0.0
+         *
+         * @return array Get arguments.
+         */
+        public function get_arguments() {
+            if ( empty( $this->arguments ) ) {
+                $this->arguments = $this->set_arguments();
+            }
+
+            $this->arguments = apply_filters( 'wp_super_duper_arguments', $this->arguments, $this->options, $this->instance );
+            $this->arguments = $this->add_name_from_key( $this->arguments, true );
+
+            return $this->arguments;
+        }
+
+        /**
+         * This is the main output class for all 3 items, widget, shortcode and block, it is extended in the calling class.
+         *
+         * @param array $args
+         * @param array $widget_args
+         * @param string $content
+         */
+        public function output( $args = array(), $widget_args = array(), $content = '' ) {
+
+        }
+
+        /**
+         * Add the dynamic block code inline when the wp-block in enqueued.
+         */
+        public function register_block() {
+            wp_add_inline_script( 'wp-blocks', $this->block() );
+            if ( class_exists( 'SiteOrigin_Panels' ) ) {
+
+                wp_add_inline_script( 'wp-blocks', $this->siteorigin_js() );
+
+            }
+        }
+
+        /**
+         * Check if we need to show advanced options.
+         *
+         * @return bool
+         */
+        public function block_show_advanced() {
+
+            $show      = false;
+            $arguments = $this->arguments;
+
+            if ( empty( $arguments ) ) {
+                $arguments = $this->get_arguments();
+            }
+
+            if ( ! empty( $arguments ) ) {
+                foreach ( $arguments as $argument ) {
+                    if ( isset( $argument['advanced'] ) && $argument['advanced'] ) {
+                        $show = true;
+                        break; // no need to continue if we know we have it
+                    }
+                }
+            }
+
+            return $show;
+        }
+
+        /**
+         * Get the url path to the current folder.
+         *
+         * @return string
+         */
+        public function get_url() {
+
+            $url = $this->url;
+
+            if(!$url){
+                // check if we are inside a plugin
+                $file_dir = str_replace("/includes","", dirname( __FILE__ ));
+
+                $dir_parts = explode("/wp-content/",$file_dir);
+                $url_parts = explode("/wp-content/",plugins_url());
+
+                if(!empty($url_parts[0]) && !empty($dir_parts[1])){
+                    $url = trailingslashit( $url_parts[0]."/wp-content/".$dir_parts[1] );
+                    $this->url = $url;
+                }
+            }
+
+
+            return $url;
+        }
+
+        /**
+         * Generate the block icon.
+         *
+         * Enables the use of Font Awesome icons.
+         *
+         * @note xlink:href is actually deprecated but href is not supported by all so we use both.
+         * @param $icon
+         * @since 1.1.0
+         * @return string
+         */
+        public function get_block_icon($icon){
+
+            // check if we have a Font Awesome icon
+            $fa_type = '';
+            if(substr( $icon, 0, 7 ) === "fas fa-"){
+                $fa_type = 'solid';
+            }elseif(substr( $icon, 0, 7 ) === "far fa-"){
+                $fa_type = 'regular';
+            }elseif(substr( $icon, 0, 7 ) === "fab fa-"){
+                $fa_type = 'brands';
+            }else{
+                $icon = "'".$icon."'";
+            }
+
+            // set the icon if we found one
+            if($fa_type){
+                $fa_icon = str_replace(array("fas fa-","far fa-","fab fa-"),"",$icon);
+                $icon  = "el('svg',{width: 20, height: 20, viewBox: '0 0 20 20'},el('use', {'xlink:href': '".$this->get_url()."icons/".$fa_type.".svg#".$fa_icon."','href': '".$this->get_url()."icons/".$fa_type.".svg#".$fa_icon."'}))";
+            }
+
+            return $icon;
+        }
+
+        public function group_arguments($arguments){
 //			echo '###';print_r($arguments);
-			if(!empty($arguments)){
-				$temp_arguments = array();
-				$general = __("General");
-				$add_sections = false;
-				foreach($arguments as $key => $args){
-					if(isset($args['group'])){
-						$temp_arguments[$args['group']][$key] = $args;
-						$add_sections = true;
-					}else{
-						$temp_arguments[$general][$key] = $args;
-					}
-				}
-
-				// only add sections if more than one
-				if($add_sections){
-					$arguments = $temp_arguments;
-				}
-			}
+            if(!empty($arguments)){
+                $temp_arguments = array();
+                $general = __("General");
+                $add_sections = false;
+                foreach($arguments as $key => $args){
+                    if(isset($args['group'])){
+                        $temp_arguments[$args['group']][$key] = $args;
+                        $add_sections = true;
+                    }else{
+                        $temp_arguments[$general][$key] = $args;
+                    }
+                }
+
+                // only add sections if more than one
+                if($add_sections){
+                    $arguments = $temp_arguments;
+                }
+            }
 //			echo '###';print_r($arguments);
-			return $arguments;
-		}
-
-
-		/**
-		 * Output the JS for building the dynamic Guntenberg block.
-		 *
-		 * @since 1.0.4 Added block_wrap property which will set the block wrapping output element ie: div, span, p or empty for no wrap.
-		 * @since 1.0.9 Save numbers as numbers and not strings.
-		 * @since 1.1.0 Font Awesome classes can be used for icons.
-		 * @return mixed
-		 */
-		public function block() {
-			ob_start();
-			?>
+            return $arguments;
+        }
+
+
+        /**
+         * Output the JS for building the dynamic Guntenberg block.
+         *
+         * @since 1.0.4 Added block_wrap property which will set the block wrapping output element ie: div, span, p or empty for no wrap.
+         * @since 1.0.9 Save numbers as numbers and not strings.
+         * @since 1.1.0 Font Awesome classes can be used for icons.
+         * @return mixed
+         */
+        public function block() {
+            ob_start();
+            ?>
 			<script>
 				/**
 				 * BLOCK: Basic
@@ -1633,93 +1633,93 @@ 
 						icon: <?php echo $this->get_block_icon($this->options['block-icon']);?>,//'<?php echo isset( $this->options['block-icon'] ) ? esc_attr( $this->options['block-icon'] ) : 'shield-alt';?>', // Block icon from Dashicons → https://developer.wordpress.org/resource/dashicons/.
 						supports: {
 							<?php
-							if(isset($this->options['block-supports'])){
-								echo $this->array_to_attributes( $this->options['block-supports'] );
-							}
-							?>
+                            if(isset($this->options['block-supports'])){
+                                echo $this->array_to_attributes( $this->options['block-supports'] );
+                            }
+                            ?>
 						},
 						category: '<?php echo isset( $this->options['block-category'] ) ? esc_attr( $this->options['block-category'] ) : 'common';?>', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
 						<?php if ( isset( $this->options['block-keywords'] ) ) {
-						echo "keywords : " . $this->options['block-keywords'] . ",";
-					}?>
+                        echo "keywords : " . $this->options['block-keywords'] . ",";
+                    }?>
 
 						<?php
 
-						// maybe set no_wrap
-						$no_wrap        = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
-						if( isset( $this->arguments['no_wrap'] ) && $this->arguments['no_wrap'] ){ $no_wrap = true; }
-						if( $no_wrap ){ $this->options['block-wrap'] = ''; }
+                        // maybe set no_wrap
+                        $no_wrap        = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
+                        if( isset( $this->arguments['no_wrap'] ) && $this->arguments['no_wrap'] ){ $no_wrap = true; }
+                        if( $no_wrap ){ $this->options['block-wrap'] = ''; }
 
-						$show_advanced = $this->block_show_advanced();
+                        $show_advanced = $this->block_show_advanced();
 
-						$show_alignment = false;
-						// align feature
-						/*echo "supports: {";
+                        $show_alignment = false;
+                        // align feature
+                        /*echo "supports: {";
 						echo "	align: true,";
 						echo "  html: false";
 						echo "},";*/
 
-						if ( ! empty( $this->arguments ) ) {
-							echo "attributes : {";
-
-							if ( $show_advanced ) {
-								echo "show_advanced: {";
-								echo "	type: 'boolean',";
-								echo "  default: false,";
-								echo "},";
-							}
-
-							// block wrap element
-							if ( !empty( $this->options['block-wrap'] ) ) { //@todo we should validate this?
-								echo "block_wrap: {";
-								echo "	type: 'string',";
-								echo "  default: '" . esc_attr( $this->options['block-wrap'] ) . "',";
-								echo "},";
-							}
-
-							foreach ( $this->arguments as $key => $args ) {
-
-								// set if we should show alignment
-								if ( $key == 'alignment' ) {
-									$show_alignment = true;
-								}
-
-								$extra = '';
-
-								if ( $args['type'] == 'checkbox' ) {
-									$type    = 'boolean';
-									$default = isset( $args['default'] ) && $args['default'] ? 'true' : 'false';
-								} elseif ( $args['type'] == 'number' ) {
-									$type    = 'number';
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-								} elseif ( $args['type'] == 'select' && ! empty( $args['multiple'] ) ) {
-									$type = 'array';
-									if ( is_array( $args['default'] ) ) {
-										$default = isset( $args['default'] ) ? "['" . implode( "','", $args['default'] ) . "']" : "[]";
-									} else {
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-									}
-								} elseif ( $args['type'] == 'multiselect' ) {
-									$type    = 'array';
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-								} else {
-									$type    = 'string';
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-								}
-								echo $key . " : {";
-								echo "type : '$type',";
-								echo "default : $default,";
-								echo "},";
-							}
-
-							echo "content : {type : 'string',default: 'Please select the attributes in the block settings'},";
-							echo "className: { type: 'string', default: '' },";
-
-							echo "},";
-
-						}
-
-						?>
+                        if ( ! empty( $this->arguments ) ) {
+                            echo "attributes : {";
+
+                            if ( $show_advanced ) {
+                                echo "show_advanced: {";
+                                echo "	type: 'boolean',";
+                                echo "  default: false,";
+                                echo "},";
+                            }
+
+                            // block wrap element
+                            if ( !empty( $this->options['block-wrap'] ) ) { //@todo we should validate this?
+                                echo "block_wrap: {";
+                                echo "	type: 'string',";
+                                echo "  default: '" . esc_attr( $this->options['block-wrap'] ) . "',";
+                                echo "},";
+                            }
+
+                            foreach ( $this->arguments as $key => $args ) {
+
+                                // set if we should show alignment
+                                if ( $key == 'alignment' ) {
+                                    $show_alignment = true;
+                                }
+
+                                $extra = '';
+
+                                if ( $args['type'] == 'checkbox' ) {
+                                    $type    = 'boolean';
+                                    $default = isset( $args['default'] ) && $args['default'] ? 'true' : 'false';
+                                } elseif ( $args['type'] == 'number' ) {
+                                    $type    = 'number';
+                                    $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+                                } elseif ( $args['type'] == 'select' && ! empty( $args['multiple'] ) ) {
+                                    $type = 'array';
+                                    if ( is_array( $args['default'] ) ) {
+                                        $default = isset( $args['default'] ) ? "['" . implode( "','", $args['default'] ) . "']" : "[]";
+                                    } else {
+                                        $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+                                    }
+                                } elseif ( $args['type'] == 'multiselect' ) {
+                                    $type    = 'array';
+                                    $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+                                } else {
+                                    $type    = 'string';
+                                    $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+                                }
+                                echo $key . " : {";
+                                echo "type : '$type',";
+                                echo "default : $default,";
+                                echo "},";
+                            }
+
+                            echo "content : {type : 'string',default: 'Please select the attributes in the block settings'},";
+                            echo "className: { type: 'string', default: '' },";
+
+                            echo "},";
+
+                        }
+
+                        ?>
 
 						// The "edit" property must be a valid function.
 						edit: function (props) {
@@ -1738,8 +1738,8 @@ 
 										'shortcode': '<?php echo $this->options['base_id'];?>',
 										'attributes': props.attributes,
 										'post_id': <?php global $post; if ( isset( $post->ID ) ) {
-										echo $post->ID;
-									}?>,
+                                        echo $post->ID;
+                                    }?>,
 										'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_output_shortcode' );?>'
 									};
 
@@ -1786,10 +1786,10 @@ 
 
 									<?php
 
-									if(! empty( $this->arguments )){
+                                    if(! empty( $this->arguments )){
 
-									if ( $show_advanced ) {
-									?>
+                                    if ( $show_advanced ) {
+                                    ?>
 									el(
 										wp.components.ToggleControl,
 										{
@@ -1802,61 +1802,61 @@ 
 									),
 									<?php
 
-									}
+                                    }
 
-									$arguments = $this->group_arguments($this->arguments);
+                                    $arguments = $this->group_arguments($this->arguments);
 
-									// Do we have sections?
-									$has_sections = $arguments == $this->arguments ? false : true;
+                                    // Do we have sections?
+                                    $has_sections = $arguments == $this->arguments ? false : true;
 
 
-									if($has_sections){
-									$panel_count = 0;
-									foreach($arguments as $key => $args){
-									?>
+                                    if($has_sections){
+                                    $panel_count = 0;
+                                    foreach($arguments as $key => $args){
+                                    ?>
 									el(wp.components.PanelBody, {
 											title: '<?php esc_attr_e($key); ?>',
 											initialOpen: <?php if($panel_count){echo "false";}else{echo "true";}?>
 										},
 										<?php
 
-										foreach($args as $k => $a){
-											$this->build_block_arguments($k, $a);
-										}
-										?>
+                                        foreach($args as $k => $a){
+                                            $this->build_block_arguments($k, $a);
+                                        }
+                                        ?>
 									),
 									<?php
-									$panel_count++;
+                                    $panel_count++;
 
-									}
-									}else{
-										foreach($this->arguments as $key => $args){
-											$this->build_block_arguments($key, $args);
-										}
-									}
+                                    }
+                                    }else{
+                                        foreach($this->arguments as $key => $args){
+                                            $this->build_block_arguments($key, $args);
+                                        }
+                                    }
 
 
 
-									}
-									?>
+                                    }
+                                    ?>
 
 								),
 
 								<?php
-								// If the user sets block-output array then build it
-								if ( ! empty( $this->options['block-output'] ) ) {
-								$this->block_element( $this->options['block-output'] );
-							}else{
-								// if no block-output is set then we try and get the shortcode html output via ajax.
-								?>
+                                // If the user sets block-output array then build it
+                                if ( ! empty( $this->options['block-output'] ) ) {
+                                $this->block_element( $this->options['block-output'] );
+                            }else{
+                                // if no block-output is set then we try and get the shortcode html output via ajax.
+                                ?>
 								el('div', {
 									dangerouslySetInnerHTML: {__html: onChangeContent()},
 									className: props.className,
 									style: {'min-height': '30px'}
 								})
 								<?php
-								}
-								?>
+                                }
+                                ?>
 							]; // end return
 						},
 
@@ -1874,10 +1874,10 @@ 
 							$html = '';
 							<?php
 
-							if(! empty( $this->arguments )){
+                            if(! empty( $this->arguments )){
 
-							foreach($this->arguments as $key => $args){
-							?>
+                            foreach($this->arguments as $key => $args){
+                            ?>
 							if (attr.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
 								if('<?php echo esc_attr( $key );?>' == 'html'){
 									$html = attr.<?php echo esc_attr( $key );?>;
@@ -1886,10 +1886,10 @@ 
 								}
 							}
 							<?php
-							}
-							}
+                            }
+                            }
 
-							?>
+                            ?>
 							content += "]";
 							
 							// if has html element
@@ -1912,20 +1912,20 @@ 
 							}
 
 							<?php
-							if(isset( $this->options['block-wrap'] ) && $this->options['block-wrap'] == ''){
-							?>
+                            if(isset( $this->options['block-wrap'] ) && $this->options['block-wrap'] == ''){
+                            ?>
 							return content;
 							<?php
-							}else{
-							?>
+                            }else{
+                            ?>
 							var block_wrap = 'div';
 							if (attr.hasOwnProperty("block_wrap")) {
 								block_wrap = attr.block_wrap;
 							}
 							return el(block_wrap, {dangerouslySetInnerHTML: {__html: content}, className: align});
 							<?php
-							}
-							?>
+                            }
+                            ?>
 
 
 						}
@@ -1933,89 +1933,89 @@ 
 				})();
 			</script>
 			<?php
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', $output );
-		}
-
-		public function build_block_arguments($key,$args){
-			$custom_attributes = ! empty( $args['custom_attributes'] ) ? $this->array_to_attributes( $args['custom_attributes'] ) : '';
-			$options = '';
-			$extra = '';
-			$require = '';
-
-			// `content` is a protected and special argument
-			if($key == 'content'){return;}
-
-			$onchange = "props.setAttributes({ $key: $key } )";
-			$value = "props.attributes.$key";
-			$text_type = array( 'text', 'password', 'number', 'email', 'tel', 'url', 'color' );
-			if ( in_array( $args['type'], $text_type ) ) {
-				$type = 'TextControl';
-				// Save numbers as numbers and not strings
-				if ( $args['type'] == 'number' ) {
-					$onchange = "props.setAttributes({ $key: Number($key) } )";
-				}
-			}
-			//									elseif ( $args['type'] == 'color' ) { //@todo ColorPicker labels are not shown yet, we use html5 color input for now https://github.com/WordPress/gutenberg/issues/14378
-			//										$type = 'ColorPicker';
-			//									}
-			elseif ( $args['type'] == 'checkbox' ) {
-				$type = 'CheckboxControl';
-				$extra .= "checked: props.attributes.$key,";
-				$onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
-			}elseif ( $args['type'] == 'textarea' ) {
-				$type = 'TextareaControl';
-			} elseif ( $args['type'] == 'select' || $args['type'] == 'multiselect' ) {
-				$type = 'SelectControl';
-				if ( ! empty( $args['options'] ) ) {
-					$options .= "options  : [";
-					foreach ( $args['options'] as $option_val => $option_label ) {
-						$options .= "{ value : '" . esc_attr( $option_val ) . "',     label : '" . esc_attr( $option_label ) . "'     },";
-					}
-					$options .= "],";
-				}
-				if ( isset( $args['multiple'] ) && $args['multiple'] ) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
-					$extra .= ' multiple: true, ';
-					//$onchange = "props.setAttributes({ $key: ['edit'] } )";
-					//$value = "['edit', 'delete']";
-				}
-			} elseif ( $args['type'] == 'alignment' ) {
-				$type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
-			} else {
-				return;// if we have not implemented the control then don't break the JS.
-			}
-
-			// add show only if advanced
-			if ( ! empty( $args['advanced'] ) ) {
-				echo "props.attributes.show_advanced && ";
-			}
-			// add setting require if defined
-			if ( ! empty( $args['element_require'] ) ) {
-				echo $this->block_props_replace( $args['element_require'], true ) . " && ";
-			}
-			?>
+            return str_replace( array(
+                '<script>',
+                '</script>'
+            ), '', $output );
+        }
+
+        public function build_block_arguments($key,$args){
+            $custom_attributes = ! empty( $args['custom_attributes'] ) ? $this->array_to_attributes( $args['custom_attributes'] ) : '';
+            $options = '';
+            $extra = '';
+            $require = '';
+
+            // `content` is a protected and special argument
+            if($key == 'content'){return;}
+
+            $onchange = "props.setAttributes({ $key: $key } )";
+            $value = "props.attributes.$key";
+            $text_type = array( 'text', 'password', 'number', 'email', 'tel', 'url', 'color' );
+            if ( in_array( $args['type'], $text_type ) ) {
+                $type = 'TextControl';
+                // Save numbers as numbers and not strings
+                if ( $args['type'] == 'number' ) {
+                    $onchange = "props.setAttributes({ $key: Number($key) } )";
+                }
+            }
+            //									elseif ( $args['type'] == 'color' ) { //@todo ColorPicker labels are not shown yet, we use html5 color input for now https://github.com/WordPress/gutenberg/issues/14378
+            //										$type = 'ColorPicker';
+            //									}
+            elseif ( $args['type'] == 'checkbox' ) {
+                $type = 'CheckboxControl';
+                $extra .= "checked: props.attributes.$key,";
+                $onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
+            }elseif ( $args['type'] == 'textarea' ) {
+                $type = 'TextareaControl';
+            } elseif ( $args['type'] == 'select' || $args['type'] == 'multiselect' ) {
+                $type = 'SelectControl';
+                if ( ! empty( $args['options'] ) ) {
+                    $options .= "options  : [";
+                    foreach ( $args['options'] as $option_val => $option_label ) {
+                        $options .= "{ value : '" . esc_attr( $option_val ) . "',     label : '" . esc_attr( $option_label ) . "'     },";
+                    }
+                    $options .= "],";
+                }
+                if ( isset( $args['multiple'] ) && $args['multiple'] ) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
+                    $extra .= ' multiple: true, ';
+                    //$onchange = "props.setAttributes({ $key: ['edit'] } )";
+                    //$value = "['edit', 'delete']";
+                }
+            } elseif ( $args['type'] == 'alignment' ) {
+                $type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
+            } else {
+                return;// if we have not implemented the control then don't break the JS.
+            }
+
+            // add show only if advanced
+            if ( ! empty( $args['advanced'] ) ) {
+                echo "props.attributes.show_advanced && ";
+            }
+            // add setting require if defined
+            if ( ! empty( $args['element_require'] ) ) {
+                echo $this->block_props_replace( $args['element_require'], true ) . " && ";
+            }
+            ?>
 			el(
 			wp.components.<?php echo esc_attr( $type );?>,
 			{
 			label: '<?php echo esc_attr( $args['title'] );?>',
 			help: '<?php if ( isset( $args['desc'] ) ) {
-				echo esc_attr( $args['desc'] );
-			}?>',
+                echo esc_attr( $args['desc'] );
+            }?>',
 			value: <?php echo $value;?>,
 			<?php if ( $type == 'TextControl' && $args['type'] != 'text' ) {
-				echo "type: '" . esc_attr( $args['type'] ) . "',";
-			}?>
+                echo "type: '" . esc_attr( $args['type'] ) . "',";
+            }?>
 			<?php if ( ! empty( $args['placeholder'] ) ) {
-				echo "placeholder: '" . esc_attr( $args['placeholder'] ) . "',";
-			}?>
+                echo "placeholder: '" . esc_attr( $args['placeholder'] ) . "',";
+            }?>
 			<?php echo $options;?>
 			<?php echo $extra;?>
 			<?php echo $custom_attributes;?>
@@ -2025,508 +2025,508 @@ 
 			}
 			),
 			<?php
-		}
-
-		/**
-		 * Convert an array of attributes to block string.
-		 *
-		 * @todo there is prob a faster way to do this, also we could add some validation here.
-		 *
-		 * @param $custom_attributes
-		 *
-		 * @return string
-		 */
-		public function array_to_attributes( $custom_attributes, $html = false ) {
-			$attributes = '';
-			if ( ! empty( $custom_attributes ) ) {
-
-				if ( $html ) {
-					foreach ( $custom_attributes as $key => $val ) {
-						$attributes .= " $key='$val' ";
-					}
-				} else {
-					foreach ( $custom_attributes as $key => $val ) {
-						$attributes .= "'$key': '$val',";
-					}
-				}
-			}
-
-			return $attributes;
-		}
-
-		/**
-		 * A self looping function to create the output for JS block elements.
-		 *
-		 * This is what is output in the WP Editor visual view.
-		 *
-		 * @param $args
-		 */
-		public function block_element( $args ) {
-
-
-			if ( ! empty( $args ) ) {
-				foreach ( $args as $element => $new_args ) {
-
-					if ( is_array( $new_args ) ) { // its an element
-
-
-						if ( isset( $new_args['element'] ) ) {
-
-							if ( isset( $new_args['element_require'] ) ) {
-								echo str_replace( array(
-										"'+",
-										"+'"
-									), '', $this->block_props_replace( $new_args['element_require'] ) ) . " &&  ";
-								unset( $new_args['element_require'] );
-							}
-
-							echo "\n el( '" . $new_args['element'] . "', {";
-
-							// get the attributes
-							foreach ( $new_args as $new_key => $new_value ) {
-
-
-								if ( $new_key == 'element' || $new_key == 'content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array( $new_value ) ) {
-									// do nothing
-								} else {
-									echo $this->block_element( array( $new_key => $new_value ) );
-								}
-							}
-
-							echo "},";// end attributes
-
-							// get the content
-							$first_item = 0;
-							foreach ( $new_args as $new_key => $new_value ) {
-								if ( $new_key === 'content' || is_array( $new_value ) ) {
-
-									if ( $new_key === 'content' ) {
-										echo "'" . $this->block_props_replace( wp_slash( $new_value ) ) . "'";
-									}
-
-									if ( is_array( $new_value ) ) {
-
-										if ( isset( $new_value['element_require'] ) ) {
-											echo str_replace( array(
-													"'+",
-													"+'"
-												), '', $this->block_props_replace( $new_value['element_require'] ) ) . " &&  ";
-											unset( $new_value['element_require'] );
-										}
-
-										if ( isset( $new_value['element_repeat'] ) ) {
-											$x = 1;
-											while ( $x <= absint( $new_value['element_repeat'] ) ) {
-												$this->block_element( array( '' => $new_value ) );
-												$x ++;
-											}
-										} else {
-											$this->block_element( array( '' => $new_value ) );
-										}
-									}
-									$first_item ++;
-								}
-							}
-
-							echo ")";// end content
-
-							echo ", \n";
-
-						}
-					} else {
-
-						if ( substr( $element, 0, 3 ) === "if_" ) {
-							echo str_replace( "if_", "", $element ) . ": " . $this->block_props_replace( $new_args, true ) . ",";
-						} elseif ( $element == 'style' ) {
-							echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
-						} else {
-							echo $element . ": '" . $this->block_props_replace( $new_args ) . "',";
-						}
-
-					}
-				}
-			}
-		}
-
-		/**
-		 * Replace block attributes placeholders with the proper naming.
-		 *
-		 * @param $string
-		 *
-		 * @return mixed
-		 */
-		public function block_props_replace( $string, $no_wrap = false ) {
-
-			if ( $no_wrap ) {
-				$string = str_replace( array( "[%", "%]" ), array( "props.attributes.", "" ), $string );
-			} else {
-				$string = str_replace( array( "[%", "%]" ), array( "'+props.attributes.", "+'" ), $string );
-			}
-
-			return $string;
-		}
-
-		/**
-		 * Outputs the content of the widget
-		 *
-		 * @param array $args
-		 * @param array $instance
-		 */
-		public function widget( $args, $instance ) {
-
-			// get the filtered values
-			$argument_values = $this->argument_values( $instance );
-			$argument_values = $this->string_to_bool( $argument_values );
-			$output          = $this->output( $argument_values, $args );
-
-			$no_wrap = false;
-			if( isset( $argument_values['no_wrap'] ) && $argument_values['no_wrap'] ){ $no_wrap = true; }
-
-			ob_start();
-			if ( $output && !$no_wrap) {
-				// Before widget
-				$before_widget = $args['before_widget'];
-				$before_widget = apply_filters( 'wp_super_duper_before_widget', $before_widget, $args, $instance, $this );
-				$before_widget = apply_filters( 'wp_super_duper_before_widget_' . $this->base_id, $before_widget, $args, $instance, $this );
-
-				// After widget
-				$after_widget = $args['after_widget'];
-				$after_widget = apply_filters( 'wp_super_duper_after_widget', $after_widget, $args, $instance, $this );
-				$after_widget = apply_filters( 'wp_super_duper_after_widget_' . $this->base_id, $after_widget, $args, $instance, $this );
-
-				echo $before_widget;
-				// elementor strips the widget wrapping div so we check for and add it back if needed
-				if ( $this->is_elementor_widget_output() ) {
-					echo ! empty( $this->options['widget_ops']['classname'] ) ? "<span class='" . esc_attr( $this->options['widget_ops']['classname'] ) . "'>" : '';
-				}
-				echo $this->output_title( $args, $instance );
-				echo $output;
-				if ( $this->is_elementor_widget_output() ) {
-					echo ! empty( $this->options['widget_ops']['classname'] ) ? "</span>" : '';
-				}
-				echo $after_widget;
-			} elseif ( $this->is_preview() && $output == '' ) {// if preview show a placeholder if empty
-				$output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
-				echo $output;
-			} elseif($output && $no_wrap){
-				echo $output;
-			}
-			$output = ob_get_clean();
-
-			$output = apply_filters( 'wp_super_duper_widget_output', $output, $instance, $args, $this );
-
-			echo $output;
-		}
-
-		/**
-		 * Tests if the current output is inside a elementor container.
-		 *
-		 * @since 1.0.4
-		 * @return bool
-		 */
-		public function is_elementor_widget_output() {
-			$result = false;
-			if ( defined( 'ELEMENTOR_VERSION' ) && isset( $this->number ) && $this->number == 'REPLACE_TO_ID' ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a elementor preview.
-		 *
-		 * @since 1.0.4
-		 * @return bool
-		 */
-		public function is_elementor_preview() {
-			$result = false;
-			if ( isset( $_REQUEST['elementor-preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) || ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor_ajax' ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a Divi preview.
-		 *
-		 * @since 1.0.6
-		 * @return bool
-		 */
-		public function is_divi_preview() {
-			$result = false;
-			if ( isset( $_REQUEST['et_fb'] ) || isset( $_REQUEST['et_pb_preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a Beaver builder preview.
-		 *
-		 * @since 1.0.6
-		 * @return bool
-		 */
-		public function is_beaver_preview() {
-			$result = false;
-			if ( isset( $_REQUEST['fl_builder'] ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a siteorigin builder preview.
-		 *
-		 * @since 1.0.6
-		 * @return bool
-		 */
-		public function is_siteorigin_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a cornerstone builder preview.
-		 *
-		 * @since 1.0.8
-		 * @return bool
-		 */
-		public function is_cornerstone_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['cornerstone_preview'] ) || basename( $_SERVER['REQUEST_URI'] ) == 'cornerstone-endpoint' ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a fusion builder preview.
-		 *
-		 * @since 1.1.0
-		 * @return bool
-		 */
-		public function is_fusion_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['fb-edit'] ) || ! empty( $_REQUEST['fusion_load_nonce'] ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * General function to check if we are in a preview situation.
-		 *
-		 * @since 1.0.6
-		 * @return bool
-		 */
-		public function is_preview() {
-			$preview = false;
-			if ( $this->is_divi_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_elementor_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_beaver_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_siteorigin_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_cornerstone_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_fusion_preview() ) {
-				$preview = true;
-			}
-
-			return $preview;
-		}
-
-		/**
-		 * Output the super title.
-		 *
-		 * @param $args
-		 * @param array $instance
-		 *
-		 * @return string
-		 */
-		public function output_title( $args, $instance = array() ) {
-			$output = '';
-			if ( ! empty( $instance['title'] ) ) {
-				/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
-				$title  = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
-				$output = $args['before_title'] . $title . $args['after_title'];
-			}
-
-			return $output;
-		}
-
-		/**
-		 * Outputs the options form inputs for the widget.
-		 *
-		 * @param array $instance The widget options.
-		 */
-		public function form( $instance ) {
-
-			// set widget instance
-			$this->instance = $instance;
-
-			// set it as a SD widget
-			echo $this->widget_advanced_toggle();
-
-			echo "<p>" . esc_attr( $this->options['widget_ops']['description'] ) . "</p>";
-			$arguments_raw = $this->get_arguments();
-
-			if ( is_array( $arguments_raw ) ) {
-
-				$arguments = $this->group_arguments($arguments_raw);
-
-				// Do we have sections?
-				$has_sections = $arguments == $arguments_raw ? false : true;
-
-
-				if($has_sections){
-					$panel_count = 0;
-					foreach($arguments as $key => $args){
-
-						?>
+        }
+
+        /**
+         * Convert an array of attributes to block string.
+         *
+         * @todo there is prob a faster way to do this, also we could add some validation here.
+         *
+         * @param $custom_attributes
+         *
+         * @return string
+         */
+        public function array_to_attributes( $custom_attributes, $html = false ) {
+            $attributes = '';
+            if ( ! empty( $custom_attributes ) ) {
+
+                if ( $html ) {
+                    foreach ( $custom_attributes as $key => $val ) {
+                        $attributes .= " $key='$val' ";
+                    }
+                } else {
+                    foreach ( $custom_attributes as $key => $val ) {
+                        $attributes .= "'$key': '$val',";
+                    }
+                }
+            }
+
+            return $attributes;
+        }
+
+        /**
+         * A self looping function to create the output for JS block elements.
+         *
+         * This is what is output in the WP Editor visual view.
+         *
+         * @param $args
+         */
+        public function block_element( $args ) {
+
+
+            if ( ! empty( $args ) ) {
+                foreach ( $args as $element => $new_args ) {
+
+                    if ( is_array( $new_args ) ) { // its an element
+
+
+                        if ( isset( $new_args['element'] ) ) {
+
+                            if ( isset( $new_args['element_require'] ) ) {
+                                echo str_replace( array(
+                                        "'+",
+                                        "+'"
+                                    ), '', $this->block_props_replace( $new_args['element_require'] ) ) . " &&  ";
+                                unset( $new_args['element_require'] );
+                            }
+
+                            echo "\n el( '" . $new_args['element'] . "', {";
+
+                            // get the attributes
+                            foreach ( $new_args as $new_key => $new_value ) {
+
+
+                                if ( $new_key == 'element' || $new_key == 'content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array( $new_value ) ) {
+                                    // do nothing
+                                } else {
+                                    echo $this->block_element( array( $new_key => $new_value ) );
+                                }
+                            }
+
+                            echo "},";// end attributes
+
+                            // get the content
+                            $first_item = 0;
+                            foreach ( $new_args as $new_key => $new_value ) {
+                                if ( $new_key === 'content' || is_array( $new_value ) ) {
+
+                                    if ( $new_key === 'content' ) {
+                                        echo "'" . $this->block_props_replace( wp_slash( $new_value ) ) . "'";
+                                    }
+
+                                    if ( is_array( $new_value ) ) {
+
+                                        if ( isset( $new_value['element_require'] ) ) {
+                                            echo str_replace( array(
+                                                    "'+",
+                                                    "+'"
+                                                ), '', $this->block_props_replace( $new_value['element_require'] ) ) . " &&  ";
+                                            unset( $new_value['element_require'] );
+                                        }
+
+                                        if ( isset( $new_value['element_repeat'] ) ) {
+                                            $x = 1;
+                                            while ( $x <= absint( $new_value['element_repeat'] ) ) {
+                                                $this->block_element( array( '' => $new_value ) );
+                                                $x ++;
+                                            }
+                                        } else {
+                                            $this->block_element( array( '' => $new_value ) );
+                                        }
+                                    }
+                                    $first_item ++;
+                                }
+                            }
+
+                            echo ")";// end content
+
+                            echo ", \n";
+
+                        }
+                    } else {
+
+                        if ( substr( $element, 0, 3 ) === "if_" ) {
+                            echo str_replace( "if_", "", $element ) . ": " . $this->block_props_replace( $new_args, true ) . ",";
+                        } elseif ( $element == 'style' ) {
+                            echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
+                        } else {
+                            echo $element . ": '" . $this->block_props_replace( $new_args ) . "',";
+                        }
+
+                    }
+                }
+            }
+        }
+
+        /**
+         * Replace block attributes placeholders with the proper naming.
+         *
+         * @param $string
+         *
+         * @return mixed
+         */
+        public function block_props_replace( $string, $no_wrap = false ) {
+
+            if ( $no_wrap ) {
+                $string = str_replace( array( "[%", "%]" ), array( "props.attributes.", "" ), $string );
+            } else {
+                $string = str_replace( array( "[%", "%]" ), array( "'+props.attributes.", "+'" ), $string );
+            }
+
+            return $string;
+        }
+
+        /**
+         * Outputs the content of the widget
+         *
+         * @param array $args
+         * @param array $instance
+         */
+        public function widget( $args, $instance ) {
+
+            // get the filtered values
+            $argument_values = $this->argument_values( $instance );
+            $argument_values = $this->string_to_bool( $argument_values );
+            $output          = $this->output( $argument_values, $args );
+
+            $no_wrap = false;
+            if( isset( $argument_values['no_wrap'] ) && $argument_values['no_wrap'] ){ $no_wrap = true; }
+
+            ob_start();
+            if ( $output && !$no_wrap) {
+                // Before widget
+                $before_widget = $args['before_widget'];
+                $before_widget = apply_filters( 'wp_super_duper_before_widget', $before_widget, $args, $instance, $this );
+                $before_widget = apply_filters( 'wp_super_duper_before_widget_' . $this->base_id, $before_widget, $args, $instance, $this );
+
+                // After widget
+                $after_widget = $args['after_widget'];
+                $after_widget = apply_filters( 'wp_super_duper_after_widget', $after_widget, $args, $instance, $this );
+                $after_widget = apply_filters( 'wp_super_duper_after_widget_' . $this->base_id, $after_widget, $args, $instance, $this );
+
+                echo $before_widget;
+                // elementor strips the widget wrapping div so we check for and add it back if needed
+                if ( $this->is_elementor_widget_output() ) {
+                    echo ! empty( $this->options['widget_ops']['classname'] ) ? "<span class='" . esc_attr( $this->options['widget_ops']['classname'] ) . "'>" : '';
+                }
+                echo $this->output_title( $args, $instance );
+                echo $output;
+                if ( $this->is_elementor_widget_output() ) {
+                    echo ! empty( $this->options['widget_ops']['classname'] ) ? "</span>" : '';
+                }
+                echo $after_widget;
+            } elseif ( $this->is_preview() && $output == '' ) {// if preview show a placeholder if empty
+                $output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
+                echo $output;
+            } elseif($output && $no_wrap){
+                echo $output;
+            }
+            $output = ob_get_clean();
+
+            $output = apply_filters( 'wp_super_duper_widget_output', $output, $instance, $args, $this );
+
+            echo $output;
+        }
+
+        /**
+         * Tests if the current output is inside a elementor container.
+         *
+         * @since 1.0.4
+         * @return bool
+         */
+        public function is_elementor_widget_output() {
+            $result = false;
+            if ( defined( 'ELEMENTOR_VERSION' ) && isset( $this->number ) && $this->number == 'REPLACE_TO_ID' ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a elementor preview.
+         *
+         * @since 1.0.4
+         * @return bool
+         */
+        public function is_elementor_preview() {
+            $result = false;
+            if ( isset( $_REQUEST['elementor-preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) || ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor_ajax' ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a Divi preview.
+         *
+         * @since 1.0.6
+         * @return bool
+         */
+        public function is_divi_preview() {
+            $result = false;
+            if ( isset( $_REQUEST['et_fb'] ) || isset( $_REQUEST['et_pb_preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a Beaver builder preview.
+         *
+         * @since 1.0.6
+         * @return bool
+         */
+        public function is_beaver_preview() {
+            $result = false;
+            if ( isset( $_REQUEST['fl_builder'] ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a siteorigin builder preview.
+         *
+         * @since 1.0.6
+         * @return bool
+         */
+        public function is_siteorigin_preview() {
+            $result = false;
+            if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a cornerstone builder preview.
+         *
+         * @since 1.0.8
+         * @return bool
+         */
+        public function is_cornerstone_preview() {
+            $result = false;
+            if ( ! empty( $_REQUEST['cornerstone_preview'] ) || basename( $_SERVER['REQUEST_URI'] ) == 'cornerstone-endpoint' ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a fusion builder preview.
+         *
+         * @since 1.1.0
+         * @return bool
+         */
+        public function is_fusion_preview() {
+            $result = false;
+            if ( ! empty( $_REQUEST['fb-edit'] ) || ! empty( $_REQUEST['fusion_load_nonce'] ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * General function to check if we are in a preview situation.
+         *
+         * @since 1.0.6
+         * @return bool
+         */
+        public function is_preview() {
+            $preview = false;
+            if ( $this->is_divi_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_elementor_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_beaver_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_siteorigin_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_cornerstone_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_fusion_preview() ) {
+                $preview = true;
+            }
+
+            return $preview;
+        }
+
+        /**
+         * Output the super title.
+         *
+         * @param $args
+         * @param array $instance
+         *
+         * @return string
+         */
+        public function output_title( $args, $instance = array() ) {
+            $output = '';
+            if ( ! empty( $instance['title'] ) ) {
+                /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
+                $title  = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
+                $output = $args['before_title'] . $title . $args['after_title'];
+            }
+
+            return $output;
+        }
+
+        /**
+         * Outputs the options form inputs for the widget.
+         *
+         * @param array $instance The widget options.
+         */
+        public function form( $instance ) {
+
+            // set widget instance
+            $this->instance = $instance;
+
+            // set it as a SD widget
+            echo $this->widget_advanced_toggle();
+
+            echo "<p>" . esc_attr( $this->options['widget_ops']['description'] ) . "</p>";
+            $arguments_raw = $this->get_arguments();
+
+            if ( is_array( $arguments_raw ) ) {
+
+                $arguments = $this->group_arguments($arguments_raw);
+
+                // Do we have sections?
+                $has_sections = $arguments == $arguments_raw ? false : true;
+
+
+                if($has_sections){
+                    $panel_count = 0;
+                    foreach($arguments as $key => $args){
+
+                        ?>
 						<script>
 							//							jQuery(this).find("i").toggleClass("fas fa-chevron-up fas fa-chevron-down");jQuery(this).next().toggle();
 						</script>
 						<?php
 
-						$hide = $panel_count ? ' style="display:none;" ' : '';
-						$icon_class = $panel_count ? 'fas fa-chevron-up' : 'fas fa-chevron-down';
-						echo "<button onclick='jQuery(this).find(\"i\").toggleClass(\"fas fa-chevron-up fas fa-chevron-down\");jQuery(this).next().slideToggle();' type='button' class='sd-toggle-group-button sd-input-group-toggle".sanitize_title_with_dashes($key)."'>".esc_attr($key)." <i style='float:right;' class='".$icon_class."'></i></button>";
-						echo "<div class='sd-toggle-group sd-input-group-".sanitize_title_with_dashes($key)."' $hide>";
-
-						foreach($args as $k => $a){
-							$this->widget_inputs($a, $instance);
-						}
-
-						echo "</div>";
-
-						$panel_count++;
-
-					}
-				}else{
-					foreach ( $arguments as $key => $args ) {
-						$this->widget_inputs( $args, $instance );
-					}
-				}
-
-			}
-		}
-
-		/**
-		 * Get the hidden input that when added makes the advanced button show on widget settings.
-		 *
-		 * @return string
-		 */
-		public function widget_advanced_toggle() {
-
-			$output = '';
-			if ( $this->block_show_advanced() ) {
-				$val = 1;
-			} else {
-				$val = 0;
-			}
-
-			$output .= "<input type='hidden'  class='sd-show-advanced' value='$val' />";
-
-			return $output;
-		}
-
-		/**
-		 * Convert require element.
-		 *
-		 * @since 1.0.0
-		 *
-		 * @param string $input Input element.
-		 *
-		 * @return string $output
-		 */
-		public function convert_element_require( $input ) {
-
-			$input = str_replace( "'", '"', $input );// we only want double quotes
-
-			$output = esc_attr( str_replace( array( "[%", "%]" ), array(
-				"jQuery(form).find('[data-argument=\"",
-				"\"]').find('input,select,textarea').val()"
-			), $input ) );
-
-			return $output;
-		}
-
-		/**
-		 * Builds the inputs for the widget options.
-		 *
-		 * @param $args
-		 * @param $instance
-		 */
-		public function widget_inputs( $args, $instance ) {
-
-			$class             = "";
-			$element_require   = "";
-			$custom_attributes = "";
-
-			// get value
-			if ( isset( $instance[ $args['name'] ] ) ) {
-				$value = $instance[ $args['name'] ];
-			} elseif ( ! isset( $instance[ $args['name'] ] ) && ! empty( $args['default'] ) ) {
-				$value = is_array( $args['default'] ) ? array_map( "esc_html", $args['default'] ) : esc_html( $args['default'] );
-			} else {
-				$value = '';
-			}
-
-			// get placeholder
-			if ( ! empty( $args['placeholder'] ) ) {
-				$placeholder = "placeholder='" . esc_html( $args['placeholder'] ) . "'";
-			} else {
-				$placeholder = '';
-			}
-
-			// get if advanced
-			if ( isset( $args['advanced'] ) && $args['advanced'] ) {
-				$class .= " sd-advanced-setting ";
-			}
-
-			// element_require
-			if ( isset( $args['element_require'] ) && $args['element_require'] ) {
-				$element_require = $args['element_require'];
-			}
-
-			// custom_attributes
-			if ( isset( $args['custom_attributes'] ) && $args['custom_attributes'] ) {
-				$custom_attributes = $this->array_to_attributes( $args['custom_attributes'], true );
-			}
-
-			// before wrapper
-			?>
+                        $hide = $panel_count ? ' style="display:none;" ' : '';
+                        $icon_class = $panel_count ? 'fas fa-chevron-up' : 'fas fa-chevron-down';
+                        echo "<button onclick='jQuery(this).find(\"i\").toggleClass(\"fas fa-chevron-up fas fa-chevron-down\");jQuery(this).next().slideToggle();' type='button' class='sd-toggle-group-button sd-input-group-toggle".sanitize_title_with_dashes($key)."'>".esc_attr($key)." <i style='float:right;' class='".$icon_class."'></i></button>";
+                        echo "<div class='sd-toggle-group sd-input-group-".sanitize_title_with_dashes($key)."' $hide>";
+
+                        foreach($args as $k => $a){
+                            $this->widget_inputs($a, $instance);
+                        }
+
+                        echo "</div>";
+
+                        $panel_count++;
+
+                    }
+                }else{
+                    foreach ( $arguments as $key => $args ) {
+                        $this->widget_inputs( $args, $instance );
+                    }
+                }
+
+            }
+        }
+
+        /**
+         * Get the hidden input that when added makes the advanced button show on widget settings.
+         *
+         * @return string
+         */
+        public function widget_advanced_toggle() {
+
+            $output = '';
+            if ( $this->block_show_advanced() ) {
+                $val = 1;
+            } else {
+                $val = 0;
+            }
+
+            $output .= "<input type='hidden'  class='sd-show-advanced' value='$val' />";
+
+            return $output;
+        }
+
+        /**
+         * Convert require element.
+         *
+         * @since 1.0.0
+         *
+         * @param string $input Input element.
+         *
+         * @return string $output
+         */
+        public function convert_element_require( $input ) {
+
+            $input = str_replace( "'", '"', $input );// we only want double quotes
+
+            $output = esc_attr( str_replace( array( "[%", "%]" ), array(
+                "jQuery(form).find('[data-argument=\"",
+                "\"]').find('input,select,textarea').val()"
+            ), $input ) );
+
+            return $output;
+        }
+
+        /**
+         * Builds the inputs for the widget options.
+         *
+         * @param $args
+         * @param $instance
+         */
+        public function widget_inputs( $args, $instance ) {
+
+            $class             = "";
+            $element_require   = "";
+            $custom_attributes = "";
+
+            // get value
+            if ( isset( $instance[ $args['name'] ] ) ) {
+                $value = $instance[ $args['name'] ];
+            } elseif ( ! isset( $instance[ $args['name'] ] ) && ! empty( $args['default'] ) ) {
+                $value = is_array( $args['default'] ) ? array_map( "esc_html", $args['default'] ) : esc_html( $args['default'] );
+            } else {
+                $value = '';
+            }
+
+            // get placeholder
+            if ( ! empty( $args['placeholder'] ) ) {
+                $placeholder = "placeholder='" . esc_html( $args['placeholder'] ) . "'";
+            } else {
+                $placeholder = '';
+            }
+
+            // get if advanced
+            if ( isset( $args['advanced'] ) && $args['advanced'] ) {
+                $class .= " sd-advanced-setting ";
+            }
+
+            // element_require
+            if ( isset( $args['element_require'] ) && $args['element_require'] ) {
+                $element_require = $args['element_require'];
+            }
+
+            // custom_attributes
+            if ( isset( $args['custom_attributes'] ) && $args['custom_attributes'] ) {
+                $custom_attributes = $this->array_to_attributes( $args['custom_attributes'], true );
+            }
+
+            // before wrapper
+            ?>
 			<p class="sd-argument <?php echo esc_attr( $class ); ?>"
 			   data-argument='<?php echo esc_attr( $args['name'] ); ?>'
 			   data-element_require='<?php if ( $element_require ) {
-				   echo $this->convert_element_require( $element_require );
-			   } ?>'
+                    echo $this->convert_element_require( $element_require );
+                } ?>'
 			>
 				<?php
 
-				switch ( $args['type'] ) {
-					//array('text','password','number','email','tel','url','color')
-					case "text":
-					case "password":
-					case "number":
-					case "email":
-					case "tel":
-					case "url":
-					case "color":
-						?>
+                switch ( $args['type'] ) {
+                    //array('text','password','number','email','tel','url','color')
+                    case "text":
+                    case "password":
+                    case "number":
+                    case "email":
+                    case "tel":
+                    case "url":
+                    case "color":
+                        ?>
 						<label
 							for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo esc_attr( $args['title'] ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
 						<input <?php echo $placeholder; ?> class="widefat"
@@ -2537,47 +2537,47 @@ 
 							                               value="<?php echo esc_attr( $value ); ?>">
 						<?php
 
-						break;
-					case "select":
-						$multiple = isset( $args['multiple'] ) && $args['multiple'] ? true : false;
-						if ( $multiple ) {
-							if ( empty( $value ) ) {
-								$value = array();
-							}
-						}
-						?>
+                        break;
+                    case "select":
+                        $multiple = isset( $args['multiple'] ) && $args['multiple'] ? true : false;
+                        if ( $multiple ) {
+                            if ( empty( $value ) ) {
+                                $value = array();
+                            }
+                        }
+                        ?>
 						<label
 							for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo esc_attr( $args['title'] ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
 						<select <?php echo $placeholder; ?> class="widefat"
 							<?php echo $custom_attributes; ?>
 							                                id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
 							                                name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) );
-							                                if ( $multiple ) {
-								                                echo "[]";
-							                                } ?>"
+                                                            if ( $multiple ) {
+                                                                echo "[]";
+                                                            } ?>"
 							<?php if ( $multiple ) {
-								echo "multiple";
-							} //@todo not implemented yet due to gutenberg not supporting it
-							?>
+                                echo "multiple";
+                            } //@todo not implemented yet due to gutenberg not supporting it
+                            ?>
 						>
 							<?php
 
-							if ( ! empty( $args['options'] ) ) {
-								foreach ( $args['options'] as $val => $label ) {
-									if ( $multiple ) {
-										$selected = in_array( $val, $value ) ? 'selected="selected"' : '';
-									} else {
-										$selected = selected( $value, $val, false );
-									}
-									echo "<option value='$val' " . $selected . ">$label</option>";
-								}
-							}
-							?>
+                            if ( ! empty( $args['options'] ) ) {
+                                foreach ( $args['options'] as $val => $label ) {
+                                    if ( $multiple ) {
+                                        $selected = in_array( $val, $value ) ? 'selected="selected"' : '';
+                                    } else {
+                                        $selected = selected( $value, $val, false );
+                                    }
+                                    echo "<option value='$val' " . $selected . ">$label</option>";
+                                }
+                            }
+                            ?>
 						</select>
 						<?php
-						break;
-					case "checkbox":
-						?>
+                        break;
+                    case "checkbox":
+                        ?>
 						<input <?php echo $placeholder; ?>
 							<?php checked( 1, $value, true ) ?>
 							<?php echo $custom_attributes; ?>
@@ -2587,9 +2587,9 @@ 
 						<label
 							for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo esc_attr( $args['title'] ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
 						<?php
-						break;
-					case "textarea":
-						?>
+                        break;
+                    case "textarea":
+                        ?>
 						<label
 							for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo esc_attr( $args['title'] ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
 						<textarea <?php echo $placeholder; ?> class="widefat"
@@ -2599,136 +2599,136 @@ 
 							                               ><?php echo esc_attr( $value ); ?></textarea>
 						<?php
 
-						break;
-					case "hidden":
-						?>
+                        break;
+                    case "hidden":
+                        ?>
 						<input id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
 						       name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="hidden"
 						       value="<?php echo esc_attr( $value ); ?>">
 						<?php
-						break;
-					default:
-						echo "No input type found!"; // @todo we need to add more input types.
-				}
+                        break;
+                    default:
+                        echo "No input type found!"; // @todo we need to add more input types.
+                }
 
-				// after wrapper
-				?>
+                // after wrapper
+                ?>
 			</p>
 			<?php
 
-		}
-
-		/**
-		 * Get the widget input description html.
-		 *
-		 * @param $args
-		 *
-		 * @return string
-		 * @todo, need to make its own tooltip script
-		 */
-		public function widget_field_desc( $args ) {
-
-			$description = '';
-			if ( isset( $args['desc'] ) && $args['desc'] ) {
-				if ( isset( $args['desc_tip'] ) && $args['desc_tip'] ) {
-					$description = $this->desc_tip( $args['desc'] );
-				} else {
-					$description = '<span class="description">' . wp_kses_post( $args['desc'] ) . '</span>';
-				}
-			}
-
-			return $description;
-		}
-
-		/**
-		 * Get the tool tip html.
-		 *
-		 * @param $tip
-		 * @param bool $allow_html
-		 *
-		 * @return string
-		 */
-		function desc_tip( $tip, $allow_html = false ) {
-			if ( $allow_html ) {
-				$tip = $this->sanitize_tooltip( $tip );
-			} else {
-				$tip = esc_attr( $tip );
-			}
-
-			return '<span class="gd-help-tip dashicons dashicons-editor-help" title="' . $tip . '"></span>';
-		}
-
-		/**
-		 * Sanitize a string destined to be a tooltip.
-		 *
-		 * @param string $var
-		 *
-		 * @return string
-		 */
-		public function sanitize_tooltip( $var ) {
-			return htmlspecialchars( wp_kses( html_entity_decode( $var ), array(
-				'br'     => array(),
-				'em'     => array(),
-				'strong' => array(),
-				'small'  => array(),
-				'span'   => array(),
-				'ul'     => array(),
-				'li'     => array(),
-				'ol'     => array(),
-				'p'      => array(),
-			) ) );
-		}
-
-		/**
-		 * Processing widget options on save
-		 *
-		 * @param array $new_instance The new options
-		 * @param array $old_instance The previous options
-		 *
-		 * @return array
-		 * @todo we should add some sanitation here.
-		 */
-		public function update( $new_instance, $old_instance ) {
-
-			//save the widget
-			$instance = array_merge( (array) $old_instance, (array) $new_instance );
-
-			// set widget instance
-			$this->instance = $instance;
-
-			if ( empty( $this->arguments ) ) {
-				$this->get_arguments();
-			}
-
-			// check for checkboxes
-			if ( ! empty( $this->arguments ) ) {
-				foreach ( $this->arguments as $argument ) {
-					if ( isset( $argument['type'] ) && $argument['type'] == 'checkbox' && ! isset( $new_instance[ $argument['name'] ] ) ) {
-						$instance[ $argument['name'] ] = '0';
-					}
-				}
-			}
-
-			return $instance;
-		}
-
-		/**
-		 * Checks if the current call is a ajax call to get the block content.
-		 *
-		 * This can be used in your widget to return different content as the block content.
-		 *
-		 * @since 1.0.3
-		 * @return bool
-		 */
-		public function is_block_content_call() {
-			$result = false;
-			if ( wp_doing_ajax() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'super_duper_output_shortcode' ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-	}
+        }
+
+        /**
+         * Get the widget input description html.
+         *
+         * @param $args
+         *
+         * @return string
+         * @todo, need to make its own tooltip script
+         */
+        public function widget_field_desc( $args ) {
+
+            $description = '';
+            if ( isset( $args['desc'] ) && $args['desc'] ) {
+                if ( isset( $args['desc_tip'] ) && $args['desc_tip'] ) {
+                    $description = $this->desc_tip( $args['desc'] );
+                } else {
+                    $description = '<span class="description">' . wp_kses_post( $args['desc'] ) . '</span>';
+                }
+            }
+
+            return $description;
+        }
+
+        /**
+         * Get the tool tip html.
+         *
+         * @param $tip
+         * @param bool $allow_html
+         *
+         * @return string
+         */
+        function desc_tip( $tip, $allow_html = false ) {
+            if ( $allow_html ) {
+                $tip = $this->sanitize_tooltip( $tip );
+            } else {
+                $tip = esc_attr( $tip );
+            }
+
+            return '<span class="gd-help-tip dashicons dashicons-editor-help" title="' . $tip . '"></span>';
+        }
+
+        /**
+         * Sanitize a string destined to be a tooltip.
+         *
+         * @param string $var
+         *
+         * @return string
+         */
+        public function sanitize_tooltip( $var ) {
+            return htmlspecialchars( wp_kses( html_entity_decode( $var ), array(
+                'br'     => array(),
+                'em'     => array(),
+                'strong' => array(),
+                'small'  => array(),
+                'span'   => array(),
+                'ul'     => array(),
+                'li'     => array(),
+                'ol'     => array(),
+                'p'      => array(),
+            ) ) );
+        }
+
+        /**
+         * Processing widget options on save
+         *
+         * @param array $new_instance The new options
+         * @param array $old_instance The previous options
+         *
+         * @return array
+         * @todo we should add some sanitation here.
+         */
+        public function update( $new_instance, $old_instance ) {
+
+            //save the widget
+            $instance = array_merge( (array) $old_instance, (array) $new_instance );
+
+            // set widget instance
+            $this->instance = $instance;
+
+            if ( empty( $this->arguments ) ) {
+                $this->get_arguments();
+            }
+
+            // check for checkboxes
+            if ( ! empty( $this->arguments ) ) {
+                foreach ( $this->arguments as $argument ) {
+                    if ( isset( $argument['type'] ) && $argument['type'] == 'checkbox' && ! isset( $new_instance[ $argument['name'] ] ) ) {
+                        $instance[ $argument['name'] ] = '0';
+                    }
+                }
+            }
+
+            return $instance;
+        }
+
+        /**
+         * Checks if the current call is a ajax call to get the block content.
+         *
+         * This can be used in your widget to return different content as the block content.
+         *
+         * @since 1.0.3
+         * @return bool
+         */
+        public function is_block_content_call() {
+            $result = false;
+            if ( wp_doing_ajax() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'super_duper_output_shortcode' ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+    }
 
 }
\ No newline at end of file