Skip to content

Commit 20e7749

Browse files
authored
Merge pull request #114 from Bit-Apps-Pro/rishad-dev-tmp
Version updated to v2.6.8
2 parents c88f2f4 + c7a12bc commit 20e7749

File tree

9 files changed

+66
-34
lines changed

9 files changed

+66
-34
lines changed

bitwpfi.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Plugin Name: Bit Integrations
55
* Plugin URI: https://bitapps.pro/bit-integrations
66
* 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
7-
* Version: 2.6.7
7+
* Version: 2.6.8
88
* Author: Automation & Integration Plugin - Bit Apps
99
* Author URI: https://bitapps.pro
1010
* Text Domain: bit-integrations
@@ -24,7 +24,7 @@
2424
$btcbi_db_version = '1.1';
2525

2626
// Define most essential constants.
27-
define('BTCBI_VERSION', '2.6.7');
27+
define('BTCBI_VERSION', '2.6.8');
2828
define('BTCBI_PLUGIN_MAIN_FILE', __FILE__);
2929

3030
require_once plugin_dir_path(__FILE__) . 'includes/loader.php';

frontend-dev/src/Utils/StaticData/webhookIntegrations.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,11 @@ export const customFormIntegrations = [
6666
'ProfileBuilder',
6767
'QuillForms',
6868
'UserFeedback',
69+
'NewUserApprove',
70+
'WPSubscription',
71+
'WPTravelEngine',
72+
'WPUserFrontend',
73+
'FluentAffiliate'
6974
]
7075

7176
export const actionHookIntegrations = ['ActionHook']

frontend-dev/src/pages/ChangelogToggle.jsx

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { __, sprintf } from '../Utils/i18nwrap'
1111

1212
// const source = !btcbi.isPro ? 'bit-integrations' : 'bit-integrations-pro'
1313
// const dealURL = `https://bitapps.pro/new-year-deal/#bit-integrations-pricing`
14-
const releaseDate = '6th August 2025'
14+
const releaseDate = '1st September 2025'
1515

1616
// Changelog items format [{ 'label': '', 'desc': '', 'isPro': true }]
1717
const changeLog = [
@@ -25,19 +25,19 @@ const changeLog = [
2525
label: __('New Actions', 'bit-integrations'),
2626
headClass: 'new-integration',
2727
itemClass: 'integration-list',
28-
items: [
29-
{
30-
label: 'Line',
31-
desc: '3 New Events Added.',
32-
isPro: false
33-
}
34-
]
28+
items: []
3529
},
3630
{
3731
label: __('New Triggers', 'bit-integrations'),
3832
headClass: 'new-trigger',
3933
itemClass: 'integration-list',
40-
items: []
34+
items: [
35+
{
36+
label: 'FluentAffiliate',
37+
desc: '8 New Events Added.',
38+
isPro: true
39+
}
40+
]
4141
},
4242
{
4343
label: __('New Features', 'bit-integrations'),
@@ -49,18 +49,7 @@ const changeLog = [
4949
label: __('Improvements', 'bit-integrations'),
5050
headClass: 'new-improvement',
5151
itemClass: 'feature-list',
52-
items: [
53-
{
54-
label: 'Google Sheets',
55-
desc: 'Removed unusual components from the authorization page UI for a cleaner, more streamlined interface.',
56-
isPro: false
57-
},
58-
{
59-
label: 'Paid Membership Pro',
60-
desc: 'Added validation for level change event to ensure proper functionality.',
61-
isPro: true
62-
}
63-
]
52+
items: []
6453
},
6554
{
6655
label: __('Bug Fixes', 'bit-integrations'),
@@ -69,12 +58,12 @@ const changeLog = [
6958
items: [
7059
{
7160
label: 'MemberPress',
72-
desc: 'Fixed a fatal error related to the namespace issue.',
61+
desc: 'Fixed undefined array key issue.',
7362
isPro: false
7463
},
7564
{
76-
label: 'WhatsApp',
77-
desc: 'Resolved the undefined authorization route function issue.',
65+
label: 'MemberPress',
66+
desc: 'Resolved lifetime expiration date bug.',
7867
isPro: false
7968
}
8069
]
2.92 KB
Loading

includes/Actions/Memberpress/RecordApiHelper.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,18 @@ public function crateMember($integrationDetails, $finalData)
5555
$allData->user_id = $user->ID;
5656
$allData->product_id = sanitize_key($product_id);
5757

58-
$allData->amount = (float) $finalData['sub_total'];
59-
$allData->tax_amount = (float) $finalData['tax_amount'];
60-
$allData->total = ((float) $finalData['sub_total'] + (float) $finalData['tax_amount']);
61-
$allData->tax_rate = (float) $finalData['taxrate'];
58+
$allData->amount = (float) $finalData['sub_total'] ?? 0;
59+
$allData->tax_amount = (float) $finalData['tax_amount'] ?? 0;
60+
$allData->tax_rate = (float) $finalData['taxrate'] ?? 0;
61+
62+
$allData->total = ($allData->amount + $allData->tax_amount);
6263
$allData->status = sanitize_text_field($statusId);
6364
$allData->gateway = sanitize_text_field($gateway);
6465
$allData->created_at = MeprUtils::ts_to_mysql_date(time());
6566

66-
$expiration_date = $finalData['expiration_date'];
67+
$expiration_date = $finalData['expiration_date'] ?? null;
6768

68-
if (isset($expiration_date) && ($expiration_date === '' || \is_null($expiration_date))) {
69+
if (empty($expiration_date)) {
6970
$obj = new MeprProduct(sanitize_key($product_id));
7071
$expires_at_ts = $obj->get_expires_at();
7172
if (\is_null($expires_at_ts)) {

includes/Config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class Config
2121

2222
public const VAR_PREFIX = 'btcbi_';
2323

24-
public const VERSION = '2.6.7';
24+
public const VERSION = '2.6.8';
2525

2626
public const DB_VERSION = '1.0';
2727

includes/Core/Util/AllTriggersName.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public static function allTriggersName()
4242
'EssentialBlocks' => ['name' => 'Essential Blocks', 'isPro' => true, 'is_active' => false],
4343
'Eventin' => ['name' => 'Eventin', 'isPro' => true, 'is_active' => false],
4444
'EVF' => ['name' => 'Everest Forms', 'isPro' => true, 'is_active' => false],
45+
'FluentAffiliate' => ['name' => 'FluentAffiliate', 'isPro' => true, 'is_active' => false],
4546
'FF' => ['name' => 'Fluent Forms', 'isPro' => true, 'is_active' => false],
4647
'FluentBoards' => ['name' => 'Fluent Boards', 'isPro' => true, 'is_active' => false],
4748
'FluentBooking' => ['name' => 'Fluent Booking', 'isPro' => true, 'is_active' => false],

includes/Core/Util/Helper.php

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,32 @@ public static function decodeHtmlEntities($input)
464464
return static::decodeSingleEntity($input);
465465
}
466466

467+
/**
468+
* Convert string to array.
469+
*
470+
* @param null|array|string $data
471+
* @param string $separator
472+
*
473+
* @return array
474+
*/
475+
public static function convertStringToArray($data, $separator = ',')
476+
{
477+
if (empty($data)) {
478+
return [];
479+
}
480+
481+
if (\is_array($data)) {
482+
return array_map('trim', $data);
483+
}
484+
485+
return array_map('trim', explode($separator, $data));
486+
}
487+
488+
public static function jsonEncodeDecode($data)
489+
{
490+
return json_decode(json_encode($data), true);
491+
}
492+
467493
private static function getVariableType($val)
468494
{
469495
$types = [

readme.txt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Tags: automation, automator, Google Sheets, webhooks, zapier, marketing automati
44
Requires at least: 5.1
55
Tested up to: 6.8
66
Requires PHP: 7.4
7-
Stable tag: 2.6.7
7+
Stable tag: 2.6.8
88
License: GPLv2 or later
99

1010
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
700700

701701
== Changelog ==
702702

703+
= 2.6.8 =
704+
_Release Date -1st September 2025_
705+
706+
- **New Trigger**
707+
- FluentAffiliate: 8 New Events Added (Pro).
708+
709+
- **Bug Fixes**
710+
- MemberPress: Fixed undefined array key issue.
711+
- MemberPress: Resolved lifetime expiration date bug.
712+
703713
= 2.6.7 =
704714
_Release Date -20th August 2025_
705715

0 commit comments

Comments
 (0)