Merge branch 'main' into feat/acpt-actions

Author: RishadAlam

bitwpfi.php

@@ -4,7 +4,7 @@
  * Plugin Name: Bit Integrations
  * Plugin URI:  https://bitapps.pro/bit-integrations
  * Description: Bit Integrations is a platform that integrates with over 290+ different platforms to help with various tasks on your WordPress site, like WooCommerce, Form builder, Page builder, LMS, Sales funnels, Bookings, CRM, Webhooks, Email marketing, Social media and Spreadsheets, etc
- * Version:     2.6.7
+ * Version:     2.6.8
  * Author:      Automation & Integration Plugin - Bit Apps
  * Author URI:  https://bitapps.pro
  * Text Domain: bit-integrations
@@ -24,7 +24,7 @@
 $btcbi_db_version = '1.1';
 
 // Define most essential constants.
-define('BTCBI_VERSION', '2.6.7');
+define('BTCBI_VERSION', '2.6.8');
 define('BTCBI_PLUGIN_MAIN_FILE', __FILE__);
 
 require_once plugin_dir_path(__FILE__) . 'includes/loader.php';

frontend-dev/src/pages/ChangelogToggle.jsx

@@ -11,7 +11,7 @@ import { __, sprintf } from '../Utils/i18nwrap'
 
 // const source = !btcbi.isPro ? 'bit-integrations' : 'bit-integrations-pro'
 // const dealURL = `https://bitapps.pro/new-year-deal/#bit-integrations-pricing`
-const releaseDate = '6th August 2025'
+const releaseDate = '1st September 2025'
 
 // Changelog items format [{ 'label': '', 'desc': '', 'isPro': true }]
 const changeLog = [
@@ -25,19 +25,19 @@ const changeLog = [
     label: __('New Actions', 'bit-integrations'),
     headClass: 'new-integration',
     itemClass: 'integration-list',
-    items: [
-      {
-        label: 'Line',
-        desc: '3 New Events Added.',
-        isPro: false
-      }
-    ]
+    items: []
   },
   {
     label: __('New Triggers', 'bit-integrations'),
     headClass: 'new-trigger',
     itemClass: 'integration-list',
-    items: []
+    items: [
+      {
+        label: 'FluentAffiliate',
+        desc: '8 New Events Added.',
+        isPro: true
+      }
+    ]
   },
   {
     label: __('New Features', 'bit-integrations'),
@@ -49,18 +49,7 @@ const changeLog = [
     label: __('Improvements', 'bit-integrations'),
     headClass: 'new-improvement',
     itemClass: 'feature-list',
-    items: [
-      {
-        label: 'Google Sheets',
-        desc: 'Removed unusual components from the authorization page UI for a cleaner, more streamlined interface.',
-        isPro: false
-      },
-      {
-        label: 'Paid Membership Pro',
-        desc: 'Added validation for level change event to ensure proper functionality.',
-        isPro: true
-      }
-    ]
+    items: []
   },
   {
     label: __('Bug Fixes', 'bit-integrations'),
@@ -69,12 +58,12 @@ const changeLog = [
     items: [
       {
         label: 'MemberPress',
-        desc: 'Fixed a fatal error related to the namespace issue.',
+        desc: 'Fixed undefined array key issue.',
         isPro: false
       },
       {
-        label: 'WhatsApp',
-        desc: 'Resolved the undefined authorization route function issue.',
+        label: 'MemberPress',
+        desc: 'Resolved lifetime expiration date bug.',
         isPro: false
       }
     ]

frontend-dev/src/resource/img/integ/fluentAffiliate.webp

@@ -55,17 +55,18 @@ public function crateMember($integrationDetails, $finalData)
         $allData->user_id = $user->ID;
         $allData->product_id = sanitize_key($product_id);
 
-        $allData->amount = (float) $finalData['sub_total'];
-        $allData->tax_amount = (float) $finalData['tax_amount'];
-        $allData->total = ((float) $finalData['sub_total'] + (float) $finalData['tax_amount']);
-        $allData->tax_rate = (float) $finalData['taxrate'];
+        $allData->amount = (float) $finalData['sub_total'] ?? 0;
+        $allData->tax_amount = (float) $finalData['tax_amount'] ?? 0;
+        $allData->tax_rate = (float) $finalData['taxrate'] ?? 0;
+
+        $allData->total = ($allData->amount + $allData->tax_amount);
         $allData->status = sanitize_text_field($statusId);
         $allData->gateway = sanitize_text_field($gateway);
         $allData->created_at = MeprUtils::ts_to_mysql_date(time());
 
-        $expiration_date = $finalData['expiration_date'];
+        $expiration_date = $finalData['expiration_date'] ?? null;
 
-        if (isset($expiration_date) && ($expiration_date === '' || \is_null($expiration_date))) {
+        if (empty($expiration_date)) {
             $obj = new MeprProduct(sanitize_key($product_id));
             $expires_at_ts = $obj->get_expires_at();
             if (\is_null($expires_at_ts)) {

includes/Actions/Memberpress/RecordApiHelper.php

@@ -21,7 +21,7 @@ class Config
 
     public const VAR_PREFIX = 'btcbi_';
 
-    public const VERSION = '2.6.7';
+    public const VERSION = '2.6.8';
 
     public const DB_VERSION = '1.0';
 

includes/Config.php

@@ -42,6 +42,7 @@ public static function allTriggersName()
             'EssentialBlocks'            => ['name' => 'Essential Blocks',  'isPro' => true, 'is_active' => false],
             'Eventin'                    => ['name' => 'Eventin',  'isPro' => true, 'is_active' => false],
             'EVF'                        => ['name' => 'Everest Forms',  'isPro' => true, 'is_active' => false],
+            'FluentAffiliate'            => ['name' => 'FluentAffiliate',  'isPro' => true, 'is_active' => false],
             'FF'                         => ['name' => 'Fluent Forms',  'isPro' => true, 'is_active' => false],
             'FluentBoards'               => ['name' => 'Fluent Boards',  'isPro' => true, 'is_active' => false],
             'FluentBooking'              => ['name' => 'Fluent Booking',  'isPro' => true, 'is_active' => false],

includes/Core/Util/AllTriggersName.php

@@ -485,6 +485,11 @@ public static function convertStringToArray($data, $separator = ',')
         return array_map('trim', explode($separator, $data));
     }
 
+    public static function jsonEncodeDecode($data)
+    {
+        return json_decode(json_encode($data), true);
+    }
+
     private static function getVariableType($val)
     {
         $types = [

includes/Core/Util/Helper.php

@@ -4,7 +4,7 @@ Tags: automation, automator, Google Sheets, webhooks, zapier, marketing automati
 Requires at least: 5.1
 Tested up to: 6.8
 Requires PHP: 7.4
-Stable tag: 2.6.7
+Stable tag: 2.6.8
 License: GPLv2 or later
 
 Perfect Automation and integration plugin: Connect 290+ platforms and automate CRM, Email marketing tools, Google Sheets, Contact forms, LMS and more
@@ -700,6 +700,16 @@ Bit Integrations follows WordPress coding standards and best practices to ensure
 
 == Changelog ==
 
+= 2.6.8 =
+_Release Date -1st September 2025_
+
+- **New Trigger**
+ - FluentAffiliate: 8 New Events Added (Pro).
+
+- **Bug Fixes**
+ - MemberPress: Fixed undefined array key issue.
+ - MemberPress: Resolved lifetime expiration date bug.
+ 
 = 2.6.7 =
 _Release Date -20th August 2025_