Skip to content
Merged
11 changes: 6 additions & 5 deletions bin/download-test-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@ else
mkdir -p "$WORDPRESS_DIR/wp-content/mu-plugins"
fi

URLS=('https://downloads.wordpress.org/plugin/contact-form-7.6.1.3.zip'
'https://downloads.wordpress.org/plugin/ninja-forms.3.13.0.zip'
'https://www.codeccoop.org/formsbridge/plugins/wpforms.zip'
URLS=('https://downloads.wordpress.org/plugin/contact-form-7.6.1.4.zip'
'https://downloads.wordpress.org/plugin/formidable.6.26.1.zip'
'https://www.codeccoop.org/formsbridge/plugins/gravityforms.zip'
'https://downloads.wordpress.org/plugin/woocommerce.10.3.4.zip')
'https://downloads.wordpress.org/plugin/ninja-forms.3.13.3.zip'
'https://downloads.wordpress.org/plugin/woocommerce.10.4.3.zip'
'https://downloads.wordpress.org/plugin/wpforms-lite.1.9.8.7.zip')

PLUGINS=('contact-form-7' 'gravityforms' 'ninja-forms' 'wpforms', 'woocommerce')
PLUGINS=('contact-form-7' 'formidable' 'gravityforms' 'ninja-forms' 'woocommerce' 'wpforms-lite')

COUNT=${#PLUGINS[@]}

Expand Down
10 changes: 3 additions & 7 deletions forms-bridge/includes/class-form-bridge-template.php
Original file line number Diff line number Diff line change
Expand Up @@ -927,7 +927,7 @@ static function ( $field ) {

if ( 'woo' === $integration ) {
$data['form']['id'] = 1;
} elseif ( 'wpforms' === $integration ) {
} elseif ( in_array( $integration, array( 'wpforms', 'formidable' ), true ) ) {
$mappers = array();
foreach ( $data['form']['fields'] as &$field ) {
if ( 'file' !== $field['type'] ) {
Expand Down Expand Up @@ -1005,9 +1005,7 @@ static function ( $field ) {

if ( ! $result ) {
if ( $create_form ) {
$integration_instance->remove_form(
$data['form']['id']
);
$integration_instance->remove_form( $data['form']['id'] );
}

return new WP_Error(
Expand Down Expand Up @@ -1060,9 +1058,7 @@ static function ( $field ) {

if ( ! $bridge_created ) {
if ( $create_form ) {
$integration_instance->remove_form(
$data['bridge']['form_id']
);
$integration_instance->remove_form( $data['form']['id'] );
}

if ( $create_credential ) {
Expand Down
3 changes: 3 additions & 0 deletions forms-bridge/includes/class-integration.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ private static function check_dependencies( $integration ) {
case 'woo':
$deps = array( 'woocommerce/woocommerce.php' );
break;
case 'formidable':
$deps = array( 'formidable/formidable.php' );
break;
default:
return false;
}
Expand Down
Loading