Skip to content

Commit e15b85f

Browse files
RishadAlamRishadAlam
authored
Merge pull request #83 from Bit-Apps-Pro/rishad-dev-tmp
Version updated to 2.4.5 with some minor bug fixed
2 parents 4eb384d + fbc2420 commit e15b85f

File tree

16 files changed

+133
-57
lines changed

16 files changed

+133
-57
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 250+ 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.4.4
7+
* Version: 2.4.5
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.4.4');
27+
define('BTCBI_VERSION', '2.4.5');
2828
define('BTCBI_PLUGIN_MAIN_FILE', __FILE__);
2929

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

‎frontend-dev/src/Utils/StaticData/tutorialLinks.js‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ const tutorialLinks = {
575575
docLink: 'https://bit-integrations.com/wp-docs/actions/mailster-integrations-as-an-action/'
576576
},
577577
wpforo: {
578-
youTubeLink: '#',
578+
youTubeLink: '',
579579
docLink: 'https://bit-integrations.com/wp-docs/actions/wpforo-integrations-as-an-action/'
580580
},
581581
dokan: {
@@ -587,25 +587,29 @@ const tutorialLinks = {
587587
docLink: 'https://bit-integrations.com/wp-docs/actions/drip-integrations/'
588588
},
589589
jetEngine: {
590-
youTubeLink: '#',
590+
youTubeLink: '',
591591
docLink: 'https://bit-integrations.com/wp-docs/actions/jetengine-integrations-as-an-action/'
592592
},
593593
highLevel: {
594-
youTubeLink: '#',
594+
youTubeLink: '',
595595
docLink: 'https://bit-integrations.com/wp-docs/actions/gohighlevel-integrations/'
596596
},
597597
theEventsCalendar: {
598-
youTubeLink: '#',
598+
youTubeLink: '',
599599
docLink:
600600
'https://bit-integrations.com/wp-docs/actions/the-events-calendar-integrations-as-an-action/'
601601
},
602602
lmfwc: {
603-
youTubeLink: '#',
604-
docLink: '#'
603+
youTubeLink: '',
604+
docLink: 'https://bit-integrations.com/wp-docs/actions/license-manager-for-woocommerce-integrations/'
605605
},
606606
voxel: {
607-
youTubeLink: '#',
607+
youTubeLink: '',
608608
docLink: 'https://bit-integrations.com/wp-docs/actions/voxel-integrations-as-an-action/'
609+
},
610+
smartSuite: {
611+
youTubeLink: '',
612+
docLink: 'https://bit-integrations.com/wp-docs/actions/smartsuite-integrations/'
609613
}
610614
}
611615
export default tutorialLinks

‎frontend-dev/src/components/AllIntegrations/MailPoet/MailPoetActions.jsx‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
/* eslint-disable no-param-reassign */
22

3+
import { useRecoilValue } from 'recoil'
4+
import { $btcbi } from '../../../GlobalStates'
35
import { __ } from '../../../Utils/i18nwrap'
46
import TableCheckBox from '../../Utilities/TableCheckBox'
57

6-
export default function MailPoetActions({ mailPoetConf, setMailPoetConf, formFields }) {
8+
export default function MailPoetActions({ mailPoetConf, setMailPoetConf }) {
9+
const btcbi = useRecoilValue($btcbi)
10+
const { isPro } = btcbi
11+
712
const actionHandler = (e, type) => {
813
const newConf = { ...mailPoetConf }
914
if (type === 'update') {
@@ -23,8 +28,23 @@ export default function MailPoetActions({ mailPoetConf, setMailPoetConf, formFie
2328
onChange={(e) => actionHandler(e, 'update')}
2429
className="wdt-200 mt-4 mr-2"
2530
value="user_share"
26-
title={__('Update MailPoet', 'bit-integrations')}
27-
subTitle={__('Update Responses with Mailpoet exist Subscriber?', 'bit-integrations')}
31+
isInfo={!isPro}
32+
title={`${__('Update Subscriber', 'bit-integrations')} ${isPro ? '' : `(${__('Pro', 'bit-integrations')})`}`}
33+
subTitle={
34+
isPro
35+
? __(
36+
'Update Mailpoet exist Subscriber? First name, last name, and email may not be updated.',
37+
'bit-integrations'
38+
)
39+
: sprintf(
40+
__(
41+
'The Bit Integration Pro v(%s) or above plugin needs to be installed and activated to enable the %s feature',
42+
'bit-integrations'
43+
),
44+
'2.4.1',
45+
__('Update Subscriber', 'bit-integrations')
46+
)
47+
}
2848
/>
2949
</div>
3050
)

‎frontend-dev/src/components/AllIntegrations/MailPoet/MailPoetIntegLayout.jsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import Loader from '../../Loaders/Loader'
44
import { addFieldMap } from '../IntegrationHelpers/IntegrationHelpers'
55
import { refreshMailpoetHeader, refreshNewsLetter } from './MailPoetCommonFunc'
66
import MailPoetFieldMap from './MailPoetFieldMap'
7+
import MailPoetActions from './MailPoetActions'
78

89
export default function MailPoetIntegLayout({
910
formID,
@@ -101,6 +102,7 @@ export default function MailPoetIntegLayout({
101102
</div>
102103
<br />
103104
<br />
105+
<MailPoetActions mailPoetConf={mailPoetConf} setMailPoetConf={setMailPoetConf} formFields={formFields} />
104106
</>
105107
)}
106108
</>

‎frontend-dev/src/components/AllIntegrations/PostCreation/Post.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ function Post({ formFields, setFlow, flow, allIntegURL }) {
275275
<option disabled selected>
276276
{__('Select Author', 'bit-integrations')}
277277
</option>
278-
<option value="logged_in_user">Logged In User</option>
278+
<option value="logged_in_user">{__('Logged In User', 'bit-integrations')}</option>
279279
{users?.map((user, key) => (
280280
<option key={`acf-${key * 2}`} value={user.ID}>
281281
{user.display_name}

‎frontend-dev/src/components/AllIntegrations/PostCreation/PostEdit.jsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ function Post({ allIntegURL }) {
240240
<option disabled selected>
241241
{__('Select Author', 'bit-integrations')}
242242
</option>
243+
<option value="logged_in_user">{__('Logged In User', 'bit-integrations')}</option>
243244
{users?.map((user, key) => (
244245
<option key={`acf-${key * 2}`} value={user.ID}>
245246
{user.display_name}

‎frontend-dev/src/components/Triggers/TriggerHelpers/GamiPressHelper.jsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import 'react-multiple-select-dropdown-lite/dist/index.css'
33
import { useRecoilState } from 'recoil'
44
import { $newFlow } from '../../../GlobalStates'
55
import { getAllAwardByAchievementType, getAllRank } from './GamiPressHelper/GamiPressCommonFunction'
6+
import { __ } from '../../../Utils/i18nwrap'
67

78
const GamiPressHelper = ({ flow, setFlowData, edit = false }) => {
89
const id = !edit ? flow?.triggerData?.formID : flow.triggered_entity_id

‎frontend-dev/src/pages/ChangelogToggle.jsx‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export default function ChangelogToggle() {
1818

1919
// const source = !btcbi.isPro ? 'bit-integrations' : 'bit-integrations-pro'
2020
// const dealURL = `https://bitapps.pro/new-year-deal/#bit-integrations-pricing`
21-
const releaseDate = '16th January 2025'
21+
const releaseDate = '25th January 2025'
2222

2323
// Changelog items format [{ 'label': '', 'desc': '', 'isPro': true }]
2424
const changeLog = [
@@ -32,24 +32,19 @@ export default function ChangelogToggle() {
3232
label: __('New Actions', 'bit-integrations'),
3333
headClass: 'new-integration',
3434
itemClass: 'integration-list',
35-
items: [{ 'label': 'SmartSuite', 'desc': '', 'isPro': false }]
35+
items: []
3636
},
3737
{
3838
label: __('New Triggers', 'bit-integrations'),
3939
headClass: 'new-trigger',
4040
itemClass: 'integration-list',
41-
items: [
42-
{ 'label': 'Advanced Ads', 'desc': '', 'isPro': true },
43-
{ 'label': 'BuddyPress', 'desc': '', 'isPro': true },
44-
{ 'label': 'Ninja Tables', 'desc': '', 'isPro': true },
45-
{ 'label': 'Sensei LMS', 'desc': '', 'isPro': true }
46-
]
41+
items: []
4742
},
4843
{
4944
label: __('New Features', 'bit-integrations'),
5045
headClass: 'new-feature',
5146
itemClass: 'feature-list',
52-
items: []
47+
items: [{ 'label': 'MailPoet', 'desc': 'Added the update subscriber feature.', 'isPro': true }]
5348
},
5449
{
5550
label: __('New Improvements', 'bit-integrations'),

‎includes/Actions/CustomApi/CustomApiController.php‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
namespace BitCode\FI\Actions\CustomApi;
88

9-
use BitCode\FI\Log\LogHandler;
109
use BitCode\FI\Core\Util\Common;
1110
use BitCode\FI\Core\Util\HttpHelper;
11+
use BitCode\FI\Log\LogHandler;
1212

1313
/**
1414
* Provide functionality for webhooks
@@ -28,7 +28,8 @@ public static function execute($integrationDetails, $fieldValues)
2828

2929
if ($details->authType === 'apikey') {
3030
if ($details->apiKeyAddTo === 'query') {
31-
$url = "{$url}" . "{$details->key}={$details->value}";
31+
$separator = (strpos($url, '?') !== false) ? '&' : '?';
32+
$url = "{$url}{$separator}{$details->key}={$details->value}";
3233
} else {
3334
$headers = array_merge($headers, [$details->key => $details->value]);
3435
}
@@ -85,6 +86,11 @@ private static function urlParserWrapper($url, $fieldValues = [])
8586

8687
$cleanURL = "{$Scheme}{$Usr}{$Pass}{$Host}{$Port}{$Path}";
8788
$params = [];
89+
90+
if (empty($Query)) {
91+
return $cleanURL;
92+
}
93+
8894
foreach (explode('&', $Query) as $keyValue) {
8995
if (empty($keyValue)) {
9096
continue;

‎includes/Actions/Dropbox/RecordApiHelper.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
namespace BitCode\FI\Actions\Dropbox;
44

5-
use BitCode\FI\Core\Util\HttpHelper;
6-
use BitCode\FI\Log\LogHandler;
75
use WP_Error;
6+
use BitCode\FI\Log\LogHandler;
7+
use BitCode\FI\Core\Util\Common;
8+
use BitCode\FI\Core\Util\HttpHelper;
89

910
class RecordApiHelper
1011
{
@@ -27,7 +28,8 @@ public function uploadFile($folder, $filePath)
2728
return false;
2829
}
2930

30-
$body = file_get_contents(trim($filePath));
31+
$body = file_get_contents(Common::filePath(trim($filePath)));
32+
3133
if (!$body) {
3234
return new WP_Error(423, 'Can\'t open file!');
3335
}

0 commit comments

Comments
 (0)