Merge pull request #5 from Bit-Apps-Pro/niloy-dev

Version updated to 2.0.1

Author: abdul-kaioum

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 200+ 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.0.0
+ * Version:     2.0.1
  * Author:    Automation & Integration Plugin - Bit Apps
  * Author URI:  https://bitapps.pro
  * Text Domain: bit-integrations
@@ -25,7 +25,7 @@
 $btcbi_db_version = '1.0';
 
 // Define most essential constants.
-define('BTCBI_VERSION', '2.0.0');
+define('BTCBI_VERSION', '2.0.1');
 define('BTCBI_PLUGIN_MAIN_FILE', __FILE__);
 
 require_once plugin_dir_path(__FILE__) . 'includes/loader.php';

frontend-dev/src/components/Triggers/TriggerHelpers/FluentBookingHelper.jsx

@@ -0,0 +1,36 @@
+import MultiSelect from 'react-multiple-select-dropdown-lite'
+import 'react-multiple-select-dropdown-lite/dist/index.css'
+import { __ } from '../../../Utils/i18nwrap'
+import { getFluentFluentBookingFields } from './FluentBookingHelper/FluentBookingCommonFunction'
+
+const FluentBookingHelper = ({ flow, setFlowData }) => {
+    const id = flow?.triggerData?.formID
+
+    const handleChange = (val) => {
+        setFlowData(val, 'selectedEvent')
+        if (val) {
+            getFluentFluentBookingFields(setFlowData, val)
+        } else {
+            setFlowData([], 'fields')
+        }
+    }
+
+    return (
+        <div>
+            {id &&
+                <>
+                    <h4>Select a Event</h4>
+                    <MultiSelect
+                        className="msl-wrp-options"
+                        defaultValue={flow.triggerData?.selectedEvent}
+                        options={flow?.triggerData?.events?.map(event => ({ label: event.title, value: event.id.toString() }))}
+                        onChange={(val) => handleChange(val)}
+                        singleSelect
+                        style={{ width: '100%', minWidth: 300, maxWidth: 400 }}
+                    />
+                </>}
+        </div>
+    )
+}
+
+export default FluentBookingHelper

frontend-dev/src/components/Triggers/TriggerHelpers/FluentBookingHelper/FluentBookingCommonFunction.js

@@ -0,0 +1,19 @@
+import bitsFetch from '../../../../Utils/bitsFetch'
+import { __ } from '../../../../Utils/i18nwrap'
+
+export const getFluentFluentBookingFields = (setFlowData, value) => {
+    const loadTags = bitsFetch(
+        { id: value },
+        'fluentBooking/get/fields',
+        null,
+        'POST',
+    ).then((result) => {
+        if (result && result.success) {
+            setFlowData(result.data, 'fields')
+
+            return 'Fetched fields successfully'
+        }
+
+        return 'Fields fetching failed. please try again'
+    })
+}

frontend-dev/src/components/Triggers/TriggerHelpers/TriggerStateHelper.js

@@ -51,6 +51,8 @@ export const FormPluginStateHelper = (val, tmpNewFlow, resp, setNewFlow) => {
     UltimateMemberStateFP(val, tmpNewFlow, resp, setNewFlow);
   } else if (tmpNewFlow?.triggered_entity === "AcademyLms") {
     academylmsStateFP(val, tmpNewFlow, resp, setNewFlow);
+  } else if (tmpNewFlow?.triggered_entity === 'FluentBooking') {
+    fluentBookingStateFP(val, tmpNewFlow, resp, setNewFlow)
   } else {
     setNewFlow(tmpNewFlow);
   }
@@ -93,6 +95,13 @@ export const tutorlmsStateFP = (val, tmpNewFlow, resp, setNewFlow) => {
   setNewFlow(tmpNewFlow);
 };
 
+export const fluentBookingStateFP = (val, tmpNewFlow, resp, setNewFlow) => {
+  if (val) {
+    tmpNewFlow.triggerData.events = resp.data.events
+  }
+  setNewFlow(tmpNewFlow)
+}
+
 export const WooCommerceStateFP = (val, tmpNewFlow, resp, setNewFlow) => {
   if (val === "10" || val === "19") {
     tmpNewFlow.triggerData.products = resp.data.products;

frontend-dev/src/components/Triggers/TriggerMultiOption.jsx

@@ -21,6 +21,7 @@ import MasterStudyLmsHelper from './TriggerHelpers/MasterStudyLmsHelper'
 import ThriveApprenticeHelper from './TriggerHelpers/ThriveApprenticeHelper'
 import UltimateMemberHelper from './TriggerHelpers/UltimateMemberHelper'
 import AcademyLmsHelper from './TriggerHelpers/AcademyLmsHelper'
+import FluentBookingHelper from './TriggerHelpers/FluentBookingHelper'
 
 const TriggerMultiOption = ({ flow, setFlowData, edit = false }) => (
   <div>
@@ -47,6 +48,7 @@ const TriggerMultiOption = ({ flow, setFlowData, edit = false }) => (
     {flow?.triggered_entity === 'ThriveApprentice' && <ThriveApprenticeHelper flow={flow} setFlowData={setFlowData} edit={edit} />}
     {flow?.triggered_entity === 'UltimateMember' && <UltimateMemberHelper flow={flow} setFlowData={setFlowData} edit={edit} />}
     {flow?.triggered_entity === 'AcademyLms' && <AcademyLmsHelper flow={flow} setFlowData={setFlowData} />}
+    {flow?.triggered_entity === 'FluentBooking' && <FluentBookingHelper flow={flow} setFlowData={setFlowData} />}
   </div>
 )
 

frontend-dev/src/pages/ChangelogToggle.jsx

@@ -10,7 +10,7 @@ import Modal from '../components/Utilities/Modal'
 export default function ChangelogToggle() {
     const btcbi = useRecoilValue($btcbi)
     const [show, setShow] = useState(btcbi.changelogVersion !== btcbi.version)
-    const version = btcbi.isPro ? '2.0.0' : '2.0.0'
+    const version = btcbi.isPro ? '2.0.2' : '2.0.1'
     return (
         <div className="changelog-toggle">
             <button
@@ -27,7 +27,7 @@ export default function ChangelogToggle() {
                     {/* <h4 className='changelog-notif'> From 1.4.1 update,To use pro plugin free version is required. </h4> */}
                     <div className="flx flx-col flx-center whats-new">
                         <h3>What's New in {version}?</h3>
-                        <small className='date'> <b>25th April 2024</b></small>
+                        <small className='date'> <b>6th May 2024</b></small>
                     </div>
                     <div className='changelog-content'>
                         {/* <h4>New Integration</h4> */}
@@ -40,7 +40,7 @@ export default function ChangelogToggle() {
                             </ul>
                         </div> */}
 
-                        <span className='new-feature'><b>Compatibility Update:</b></span>
+                        {/* <span className='new-feature'><b>Compatibility Update:</b></span>
 
                         <div className='feature-list'>
                             <ul>
@@ -64,16 +64,16 @@ export default function ChangelogToggle() {
                                     </ul>
                                 </li>
                             </ul>
-                        </div>
+                        </div> */}
 
 
-                        {/* <span className='fixes'><b>Fixed</b></span>
+                        <span className='fixes'><b>Fixed</b></span>
 
                         <div className='fixes-list'>
                             <ul>
-                                <li>MailChimp: Field Mapping visibility </li>
+                                <li> Woocommerce: specific task order change issue </li>
                             </ul>
-                        </div> */}
+                        </div>
                     </div>
                     <div>
                         <span className='footer'>{__('For more details,')}</span>

includes/Actions/ActionController.php

@@ -37,7 +37,7 @@ final class ActionController
     public function handleRedirect(WP_REST_Request $request)
     {
         $state = $request->get_param('state');
-        $parsed_url = parse_url(get_site_url());
+        $parsed_url = wp_parse_url(get_site_url());
         $site_url = $parsed_url['scheme'] . '://' . $parsed_url['host'];
         $site_url .= empty($parsed_url['port']) ? null : ':' . $parsed_url['port'];
         if (strpos($state, $site_url) === false) {

includes/Actions/ActiveCampaign/RecordApiHelper.php

@@ -47,7 +47,7 @@ public function updateRecord($id, $data, $existContact)
 
         $updateRecordEndpoint = "{$this->_apiEndpoint}/contacts/{$id}";
 
-        return HttpHelper::request($updateRecordEndpoint, 'PUT', json_encode($data), $this->_defaultHeader);
+        return HttpHelper::request($updateRecordEndpoint, 'PUT', wp_json_encode($data), $this->_defaultHeader);
     }
 
     public function execute($integrationDetails, $fieldValues, $fieldMap, $actions, $listId, $tags)

includes/Actions/Acumbamail/RecordApiHelper.php

@@ -93,9 +93,9 @@ public function execute(
             $apiResponse = $this->deleteSubscriber($auth_token, $listId, $finalData);
         }
         if (property_exists($apiResponse, 'error')) {
-            LogHandler::save($this->_integrationID, json_encode(['type' => 'contact', 'type_name' => 'add-contact']), 'error', json_encode($apiResponse));
+            LogHandler::save($this->_integrationID, wp_json_encode(['type' => 'contact', 'type_name' => 'add-contact']), 'error', wp_json_encode($apiResponse));
         } else {
-            LogHandler::save($this->_integrationID, json_encode(['type' => 'record', 'type_name' => 'add-contact']), 'success', json_encode($apiResponse));
+            LogHandler::save($this->_integrationID, wp_json_encode(['type' => 'record', 'type_name' => 'add-contact']), 'success', wp_json_encode($apiResponse));
         }
 
         return $apiResponse;

includes/Actions/Affiliate/RecordApiHelper.php

@@ -99,7 +99,7 @@ public static function createAffiliateWithSpecificId($affiliateId, $statusId, $r
         if ($affiliate_user_id && affwp_is_affiliate($affiliate_user_id)) {
             return affwp_add_referral($finalData);
         }
-        LogHandler::save(self::$integrationID, json_encode(['type' => 'group', 'type_name' => 'create-referral']), 'error', json_encode('User are not affiliate'));
+        LogHandler::save(self::$integrationID, wp_json_encode(['type' => 'group', 'type_name' => 'create-referral']), 'error', wp_json_encode('User are not affiliate'));
     }
 
     public static function createAffiliateFortheUser($statusId, $referralId, $finalData)
@@ -151,7 +151,7 @@ public static function createAffiliateFortheUser($statusId, $referralId, $finalD
         if ($affiliate_user_id && affwp_is_affiliate($affiliate_user_id)) {
             return affwp_add_referral($finalData);
         }
-        LogHandler::save(self::$integrationID, json_encode(['type' => 'referral', 'type_name' => 'create-referral']), 'error', json_encode('User are not affiliate'));
+        LogHandler::save(self::$integrationID, wp_json_encode(['type' => 'referral', 'type_name' => 'create-referral']), 'error', wp_json_encode('User are not affiliate'));
     }
 
     public function execute(
@@ -174,9 +174,9 @@ public function execute(
                 $finalData
             );
             if ($apiResponse !== 0) {
-                LogHandler::save(self::$integrationID, json_encode(['type' => 'referral', 'type_name' => 'create-referral']), 'success', json_encode('Created Referral id ' . $apiResponse));
+                LogHandler::save(self::$integrationID, wp_json_encode(['type' => 'referral', 'type_name' => 'create-referral']), 'success', wp_json_encode('Created Referral id ' . $apiResponse));
             } else {
-                LogHandler::save(self::$integrationID, json_encode(['type' => 'referral', 'type_name' => 'create-referral']), 'error', json_encode('Error in creating referral'));
+                LogHandler::save(self::$integrationID, wp_json_encode(['type' => 'referral', 'type_name' => 'create-referral']), 'error', wp_json_encode('Error in creating referral'));
             }
 
             return $apiResponse;
@@ -192,9 +192,9 @@ public function execute(
                 $finalData
             );
             if ($apiResponse !== 0) {
-                LogHandler::save(self::$integrationID, json_encode(['type' => 'referral', 'type_name' => 'create-referral']), 'success', json_encode('Created Referral id ' . $apiResponse));
+                LogHandler::save(self::$integrationID, wp_json_encode(['type' => 'referral', 'type_name' => 'create-referral']), 'success', wp_json_encode('Created Referral id ' . $apiResponse));
             } else {
-                LogHandler::save(self::$integrationID, json_encode(['type' => 'referral', 'type_name' => 'create-referral']), 'error', json_encode('Error in creating referral'));
+                LogHandler::save(self::$integrationID, wp_json_encode(['type' => 'referral', 'type_name' => 'create-referral']), 'error', wp_json_encode('Error in creating referral'));
             }
 
             return $apiResponse;