Bump version v2.7.11

.vscode/settings.json

@@ -75,7 +75,7 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[javascriptreact]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": "vscode.typescript-language-features"
   },
   "typescript.validate.enable": false
 }

backend/Actions/Bento/BentoController.php

@@ -7,8 +7,8 @@
 namespace BitApps\Integrations\Actions\Bento;
 
 use BitApps\Integrations\Config;
-use BitApps\Integrations\Core\Util\HttpHelper;
 use BitApps\Integrations\Core\Util\Hooks;
+use BitApps\Integrations\Core\Util\HttpHelper;
 use WP_Error;
 
 /**
@@ -44,21 +44,25 @@ public function getAllFields($fieldsRequestParams)
                 $defaultFields = [(object) ['label' => __('Email Address', 'bit-integrations'), 'key' => 'email', 'required' => true]];
                 $fields = Hooks::apply(Config::withPrefix('bento_get_user_fields'), $defaultFields, $fieldsRequestParams);
 
-                /**
-                 * @deprecated 2.7.8 Use `bit_integrations_bento_get_user_fields` filter instead.
-                 * @since 2.7.8
-                 */
-                $fields = Hooks::apply('btcbi_bento_get_user_fields', $fields, $fieldsRequestParams);
+                if (empty($fields)) {
+                    /**
+                     * @deprecated 2.7.8 Use `bit_integrations_bento_get_user_fields` filter instead.
+                     * @since 2.7.8
+                     */
+                    $fields = Hooks::apply('btcbi_bento_get_user_fields', $defaultFields, $fieldsRequestParams);
+                }
 
                 break;
             case 'add_event':
                 $fields = Hooks::apply(Config::withPrefix('bento_get_event_fields'), []);
 
-                /**
-                 * @deprecated 2.7.8 Use `bit_integrations_bento_get_event_fields` filter instead.
-                 * @since 2.7.8
-                 */
-                $fields = Hooks::apply('btcbi_bento_get_event_fields', $fields);
+                if (empty($fields)) {
+                    /**
+                     * @deprecated 2.7.8 Use `bit_integrations_bento_get_event_fields` filter instead.
+                     * @since 2.7.8
+                     */
+                    $fields = Hooks::apply('btcbi_bento_get_event_fields', []);
+                }
 
                 break;
 
@@ -77,11 +81,13 @@ public function getAlTags($fieldsRequestParams)
 
         $tags = Hooks::apply(Config::withPrefix('bento_get_all_tags'), [], $fieldsRequestParams);
 
-        /**
-         * @deprecated 2.7.8 Use `bit_integrations_bento_get_all_tags` filter instead.
-         * @since 2.7.8
-         */
-        $tags = Hooks::apply('btcbi_bento_get_all_tags', $tags, $fieldsRequestParams);
+        if (empty($tags)) {
+            /**
+             * @deprecated 2.7.8 Use `bit_integrations_bento_get_all_tags` filter instead.
+             * @since 2.7.8
+             */
+            $tags = Hooks::apply('btcbi_bento_get_all_tags', [], $fieldsRequestParams);
+        }
 
         wp_send_json_success($tags, 200);
     }

backend/Actions/CustomAction/CustomActionController.php

@@ -2,27 +2,25 @@
 
 namespace BitApps\Integrations\Actions\CustomAction;
 
-use BitApps\Integrations\Core\Util\PhpSyntaxChecker;
+use BitApps\Integrations\Core\Util\CustomFuncValidator;
 use BitApps\Integrations\Log\LogHandler;
 use Throwable;
 
 class CustomActionController
 {
     public static function functionValidateHandler($data)
     {
-        $result = PhpSyntaxChecker::validate($data);
-
-        if ($result['is_valid']) {
-            wp_send_json_success(
-                sprintf(
-                    /* translators: %s: validation result message */
-                    __('Congrats, %s', 'bit-integrations'),
-                    $result['message']
-                )
-            );
+        if (empty($data)) {
+            wp_send_json_error(__('No function content provided.', 'bit-integrations'));
+
+            return;
+        }
+
+        if (!CustomFuncValidator::loopbackValidateContent($data)) {
+            return;
         }
 
-        wp_send_json_error($result['message']);
+        wp_send_json_success(__('No syntax errors detected in your function.', 'bit-integrations'));
     }
 
     public function execute($integrationData, $fieldValues)

backend/Actions/Dokan/RecordApiHelper.php

@@ -83,11 +83,13 @@ public function formatVendorUpsertData($finalData, $actions, $module)
 
         $filterResponse = Hooks::apply(Config::withPrefix('dokan_vendor_crud_actions'), $module, $actions);
 
-        /**
-         * @deprecated 2.7.8 Use `bit_integrations_dokan_vendor_crud_actions` filter instead.
-         * @since 2.7.8
-         */
-        $filterResponse = Hooks::apply('btcbi_dokan_vendor_crud_actions', $filterResponse, $module, $actions);
+        if (empty($filterResponse)) {
+            /**
+             * @deprecated 2.7.8 Use `bit_integrations_dokan_vendor_crud_actions` filter instead.
+             * @since 2.7.8
+             */
+            $filterResponse = Hooks::apply('btcbi_dokan_vendor_crud_actions', $module, $actions);
+        }
 
         if ($filterResponse !== $module && !empty($filterResponse)) {
             $data = array_merge($data, $filterResponse);

backend/Actions/FluentCrm/RecordApiHelper.php

@@ -138,11 +138,13 @@ public function execute($fieldValues, $fieldMap, $actions, $list_id, $tags, $act
     {
         $fieldData = Hooks::apply(Config::withPrefix('fluent_crm_assign_company'), [], (array) $actions);
 
-        /**
-         * @deprecated 2.7.8 Use `bit_integrations_fluent_crm_assign_company` filter instead.
-         * @since 2.7.8
-         */
-        $fieldData = Hooks::apply('btcbi_fluent_crm_assign_company', $fieldData, (array) $actions);
+        if (empty($fieldData)) {
+            /**
+             * @deprecated 2.7.8 Use `bit_integrations_fluent_crm_assign_company` filter instead.
+             * @since 2.7.8
+             */
+            $fieldData = Hooks::apply('btcbi_fluent_crm_assign_company', [], (array) $actions);
+        }
 
         foreach ($fieldMap as $fieldKey => $fieldPair) {
             if (!empty($fieldPair->fluentCRMField)) {

backend/Actions/Trello/TrelloController.php

@@ -7,8 +7,8 @@
 namespace BitApps\Integrations\Actions\Trello;
 
 use BitApps\Integrations\Config;
-use BitApps\Integrations\Core\Util\HttpHelper;
 use BitApps\Integrations\Core\Util\Hooks;
+use BitApps\Integrations\Core\Util\HttpHelper;
 use WP_Error;
 
 /**
@@ -118,12 +118,13 @@ public function fetchAllCustomFields($queryParams)
 
         $allFields = Hooks::apply(Config::withPrefix('trello_get_all_custom_fields'), [], $queryParams->boardId, $queryParams->clientId, $queryParams->accessToken);
 
-        /**
-         * @deprecated 2.7.8 Use `bit_integrations_trello_get_all_custom_fields` filter instead.
-         * @since 2.7.8
-         */
-        $allFields = Hooks::apply('btcbi_trello_get_all_custom_fields', $allFields, $queryParams->boardId, $queryParams->clientId, $queryParams->accessToken);
-
+        if (empty($allFields)) {
+            /**
+             * @deprecated 2.7.8 Use `bit_integrations_trello_get_all_custom_fields` filter instead.
+             * @since 2.7.8
+             */
+            $allFields = Hooks::apply('btcbi_trello_get_all_custom_fields', [], $queryParams->boardId, $queryParams->clientId, $queryParams->accessToken);
+        }
         wp_send_json_success($allFields, 200);
     }
 

backend/Actions/WooCommerce/WooCommerceMetaFields.php

@@ -146,11 +146,13 @@ private static function getFlexibleCheckoutFields()
         $checkoutFields = [];
         $fields = Hooks::apply(Config::withPrefix('woocommerce_flexible_checkout_fields'), []);
 
-        /**
-         * @deprecated 2.7.8 Use `bit_integrations_woocommerce_flexible_checkout_fields` filter instead.
-         * @since 2.7.8
-         */
-        $fields = Hooks::apply('btcbi_woocommerce_flexible_checkout_fields', $fields);
+        if (empty($fields)) {
+            /**
+             * @deprecated 2.7.8 Use `bit_integrations_woocommerce_flexible_checkout_fields` filter instead.
+             * @since 2.7.8
+             */
+            $fields = Hooks::apply('btcbi_woocommerce_flexible_checkout_fields', []);
+        }
 
         foreach ($fields as $field) {
             $checkoutFields[$field->fieldName] = (object) [

backend/Actions/ZohoBigin/ZohoBiginController.php

@@ -357,11 +357,13 @@ public static function getTagList($queryParams)
         $accessToken = isset($response['tokenDetails']->access_token) ? $response['tokenDetails']->access_token : $queryParams->tokenDetails->access_token;
         $response['tags'] = Hooks::apply(Config::withPrefix('zbigin_get_tags'), [], $accessToken, $queryParams->dataCenter, $queryParams->module);
 
-        /**
-         * @deprecated 2.7.8 Use `bit_integrations_zbigin_get_tags` filter instead.
-         * @since 2.7.8
-         */
-        $response['tags'] = Hooks::apply('btcbi_zbigin_get_tags', $response['tags'], $accessToken, $queryParams->dataCenter, $queryParams->module);
+        if (empty($response['tags'])) {
+            /**
+             * @deprecated 2.7.8 Use `bit_integrations_zbigin_get_tags` filter instead.
+             * @since 2.7.8
+             */
+            $response['tags'] = Hooks::apply('btcbi_zbigin_get_tags', [], $accessToken, $queryParams->dataCenter, $queryParams->module);
+        }
 
         if (!empty($response['tokenDetails']) && !empty($queryParams->id)) {
             self::saveRefreshedToken($queryParams->id, $response['tokenDetails'], $response['lists']);

backend/Config.php

@@ -22,7 +22,7 @@ class Config
 
     public const VAR_PREFIX = 'bit_integrations_';
 
-    public const VERSION = '2.7.10';
+    public const VERSION = '2.7.11';
 
     public const DB_VERSION = '1.1';