Merge pull request #126 from Bit-Apps-Pro/rishad-dev-tmp

Bump version to 2.7.3

Author: RishadAlam

bitwpfi.php

@@ -4,13 +4,13 @@
  * Plugin Name: Bit Integrations
  * Plugin URI:  https://bitapps.pro/bit-integrations
  * Description: Bit Integrations is a platform that integrates with over 300+ 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.7.2
+ * Version:     2.7.3
  * Author:      Automation & Integration Plugin - Bit Apps
  * Author URI:  https://bitapps.pro
  * Text Domain: bit-integrations
  * Requires PHP: 7.4
  * Requires at least: 5.1
- * Tested up to: 6.8
+ * Tested up to: 6.9
  * Domain Path: /languages
  * License:  GPLv2 or later
  */
@@ -24,7 +24,7 @@
 $btcbi_db_version = '1.1';
 
 // Define most essential constants.
-define('BTCBI_VERSION', '2.7.2');
+define('BTCBI_VERSION', '2.7.3');
 define('BTCBI_PLUGIN_MAIN_FILE', __FILE__);
 
 require_once plugin_dir_path(__FILE__) . 'includes/loader.php';

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

@@ -642,6 +642,10 @@ const tutorialLinks = {
   acpt: {
     youTubeLink: '',
     docLink: ''
+  },
+  mailerPress: {
+    youTubeLink: '',
+    docLink: ''
   }
 }
 export default tutorialLinks

frontend-dev/src/components/AllIntegrations/EditInteg.jsx

@@ -24,6 +24,7 @@ const EditMailChimp = lazy(() => import('./MailChimp/EditMailChimp'))
 const Mail = lazy(() => import('./Mail/Mail'))
 const EditPod = lazy(() => import('./Pods/EditPod'))
 const EditMailPoet = lazy(() => import('./MailPoet/EditMailPoet'))
+const EditMailerPress = lazy(() => import('./MailerPress/EditMailerPress'))
 const EditSendinBlue = lazy(() => import('./SendinBlue/EditSendinBlue'))
 const EditWooCommerce = lazy(() => import('./WooCommerce/EditWooCommerce'))
 const EditActiveCampaign = lazy(() => import('./ActiveCampaign/EditActiveCampaign'))
@@ -270,6 +271,8 @@ const IntegType = memo(({ allIntegURL, flow }) => {
       return <EditPod allIntegURL={allIntegURL} />
     case 'Mail Poet':
       return <EditMailPoet allIntegURL={allIntegURL} />
+    case 'MailerPress':
+      return <EditMailerPress allIntegURL={allIntegURL} />
     case 'SendinBlue':
     case 'Brevo(Sendinblue)':
       return <EditSendinBlue allIntegURL={allIntegURL} />

frontend-dev/src/components/AllIntegrations/GlobalIntegrationHelper.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-unused-expressions */
 
-import bitsFetch from "../../Utils/bitsFetch"
+import bitsFetch from '../../Utils/bitsFetch'
 
 export const addFieldMap = (i, confTmp, setConf) => {
   const newConf = { ...confTmp }
@@ -30,19 +30,19 @@ export const handleFieldMapping = (event, index, conftTmp, setConf) => {
 export const handleCustomValue = (event, index, conftTmp, setConf) => {
   const newConf = { ...conftTmp }
 
-  newConf.field_map[index].customValue = event.target.value
+  newConf.field_map[index].customValue = event?.target?.value || event
   setConf({ ...newConf })
 }
 
 export const handleAuthData = async (actionName, tokenDetails, userInfo, setAuthData) => {
-  const requestParams = {};
+  const requestParams = {}
   requestParams.actionName = actionName
   requestParams.tokenDetails = tokenDetails
   requestParams.userInfo = userInfo
-  await bitsFetch(requestParams, 'store/authData').then((resp) => {
+  await bitsFetch(requestParams, 'store/authData').then(resp => {
     if (resp.success) {
       if (resp.data.data.length > 0) {
-        setAuthData(resp.data.data);
+        setAuthData(resp.data.data)
       }
       // setSnackbar({ show: true, msg: 'Authorization Data Fetched Successfully' })
     }

frontend-dev/src/components/AllIntegrations/IntegInfo.jsx

@@ -30,6 +30,7 @@ const ZohoRecruitAuthorization = lazy(() => import('./ZohoRecruit/ZohoRecruitAut
 const GoogleSheetAuthorization = lazy(() => import('./GoogleSheet/GoogleSheetAuthorization'))
 const MailChimpAuthorization = lazy(() => import('./MailChimp/MailChimpAuthorization'))
 const MailPoetAuthorization = lazy(() => import('./MailPoet/MailPoetAuthorization'))
+const MailerPressAuthorization = lazy(() => import('./MailerPress/MailerPressAuthorization'))
 const SendinblueAuthorization = lazy(() => import('./SendinBlue/SendinBlueAuthorization'))
 const WooCommerceAuthorization = lazy(() => import('./WooCommerce/WooCommerceAuthorization'))
 const ActiveCampaignAuthorization = lazy(() => import('./ActiveCampaign/ActiveCampaignAuthorization'))
@@ -290,6 +291,8 @@ export default function IntegInfo() {
         )
       case 'Mail Poet':
         return <MailPoetAuthorization mailPoetConf={integrationConf} step={1} isInfo />
+      case 'MailerPress':
+        return <MailerPressAuthorization mailerPressConf={integrationConf} step={1} isInfo />
       case 'SendinBlue':
       case 'Brevo(Sendinblue)':
         return <SendinblueAuthorization sendinBlueConf={integrationConf} step={1} isInfo />

frontend-dev/src/components/AllIntegrations/MailerPress/EditMailerPress.jsx

@@ -0,0 +1,75 @@
+import { useState } from 'react'
+import { useNavigate, useParams } from 'react-router-dom'
+import { useRecoilState, useRecoilValue } from 'recoil'
+import { $actionConf, $formFields, $newFlow } from '../../../GlobalStates'
+import { __ } from '../../../Utils/i18nwrap'
+import SnackMsg from '../../Utilities/SnackMsg'
+import { saveActionConf } from '../IntegrationHelpers/IntegrationHelpers'
+import IntegrationStepThree from '../IntegrationHelpers/IntegrationStepThree'
+import SetEditIntegComponents from '../IntegrationHelpers/SetEditIntegComponents'
+import { checkMappedFields, handleInput } from './MailerPressCommonFunc'
+import MailerPressIntegLayout from './MailerPressIntegLayout'
+
+export default function EditMailerPress({ allIntegURL }) {
+  const navigate = useNavigate()
+  const { id, formID } = useParams()
+
+  const [mailerPressConf, setMailerPressConf] = useRecoilState($actionConf)
+  const [flow, setFlow] = useRecoilState($newFlow)
+  const formFields = useRecoilValue($formFields)
+  const [isLoading, setIsLoading] = useState(false)
+  const [snack, setSnackbar] = useState({ show: false })
+
+  return (
+    <div style={{ width: 900 }}>
+      <SnackMsg snack={snack} setSnackbar={setSnackbar} />
+
+      <div className="flx mt-3">
+        <b className="wdt-200 d-in-b">{__('Integration Name:', 'bit-integrations')}</b>
+        <input
+          className="btcd-paper-inp w-5"
+          onChange={e => handleInput(e, mailerPressConf, setMailerPressConf)}
+          name="name"
+          value={mailerPressConf.name}
+          type="text"
+          placeholder={__('Integration Name...', 'bit-integrations')}
+        />
+      </div>
+      <br />
+
+      <SetEditIntegComponents entity={flow.triggered_entity} setSnackbar={setSnackbar} />
+
+      <MailerPressIntegLayout
+        formID={formID}
+        formFields={formFields}
+        mailerPressConf={mailerPressConf}
+        setMailerPressConf={setMailerPressConf}
+        setSnackbar={setSnackbar}
+        setIsLoading={setIsLoading}
+        isLoading={isLoading}
+      />
+
+      <IntegrationStepThree
+        edit
+        saveConfig={() =>
+          saveActionConf({
+            flow,
+            allIntegURL,
+            conf: mailerPressConf,
+            navigate,
+            id,
+            edit: 1,
+            setIsLoading,
+            setSnackbar
+          })
+        }
+        disabled={!checkMappedFields(mailerPressConf)}
+        isLoading={isLoading}
+        dataConf={mailerPressConf}
+        setDataConf={setMailerPressConf}
+        formFields={formFields}
+      />
+      <br />
+    </div>
+  )
+}

frontend-dev/src/components/AllIntegrations/MailerPress/MailerPress.jsx

@@ -0,0 +1,107 @@
+import { useState } from 'react'
+import 'react-multiple-select-dropdown-lite/dist/index.css'
+import { useNavigate, useParams } from 'react-router-dom'
+import BackIcn from '../../../Icons/BackIcn'
+import { __ } from '../../../Utils/i18nwrap'
+import SnackMsg from '../../Utilities/SnackMsg'
+import { saveIntegConfig } from '../IntegrationHelpers/IntegrationHelpers'
+import IntegrationStepThree from '../IntegrationHelpers/IntegrationStepThree'
+import MailerPressAuthorization from './MailerPressAuthorization'
+import { checkMappedFields } from './MailerPressCommonFunc'
+import MailerPressIntegLayout from './MailerPressIntegLayout'
+
+export default function MailerPress({ formFields, setFlow, flow, allIntegURL }) {
+  const navigate = useNavigate()
+  const { formID } = useParams()
+  const [isLoading, setIsLoading] = useState(false)
+  const [step, setStep] = useState(1)
+  const [snack, setSnackbar] = useState({ show: false })
+  const [mailerPressConf, setMailerPressConf] = useState({
+    name: 'MailerPress',
+    type: 'MailerPress',
+    field_map: [{ formField: '', mailerPressField: '' }],
+    lists: [],
+    tags: [],
+    actions: {},
+    mainAction: ''
+  })
+
+  const nextPage = val => {
+    setTimeout(() => {
+      document.getElementById('btcd-settings-wrp').scrollTop = 0
+    }, 300)
+    if (val === 3) {
+      if (!checkMappedFields(mailerPressConf)) {
+        setSnackbar({
+          show: true,
+          msg: __('Please map all required fields to continue.', 'bit-integrations')
+        })
+        return
+      }
+      if (mailerPressConf.name !== '' && mailerPressConf.field_map.length > 0) {
+        setStep(val)
+      }
+    } else {
+      setStep(val)
+    }
+  }
+
+  return (
+    <div>
+      <SnackMsg snack={snack} setSnackbar={setSnackbar} />
+      <div className="txt-center mt-2">{/* <Steps step={3} active={step} /> */}</div>
+
+      {/* STEP 1 */}
+      <MailerPressAuthorization
+        formID={formID}
+        mailerPressConf={mailerPressConf}
+        setMailerPressConf={setMailerPressConf}
+        step={step}
+        nextPage={nextPage}
+        isLoading={isLoading}
+        setIsLoading={setIsLoading}
+        setSnackbar={setSnackbar}
+      />
+
+      {/* STEP 2 */}
+      <div
+        className="btcd-stp-page"
+        style={{
+          width: step === 2 && 900,
+          height: step === 2 && 'auto',
+          minHeight: step === 2 && `${200}px`
+        }}>
+        <MailerPressIntegLayout
+          formID={formID}
+          formFields={formFields}
+          mailerPressConf={mailerPressConf}
+          setMailerPressConf={setMailerPressConf}
+          setSnackbar={setSnackbar}
+          setIsLoading={setIsLoading}
+          isLoading={isLoading}
+        />
+        <br />
+        <br />
+        <br />
+        <button
+          onClick={() => nextPage(3)}
+          disabled={mailerPressConf.field_map.length < 1}
+          className="btn f-right btcd-btn-lg purple sh-sm flx"
+          type="button">
+          {__('Next', 'bit-integrations')}
+          <BackIcn className="ml-1 rev-icn" />
+        </button>
+      </div>
+
+      {/* STEP 3 */}
+      <IntegrationStepThree
+        step={step}
+        saveConfig={() =>
+          saveIntegConfig(flow, setFlow, allIntegURL, mailerPressConf, navigate, '', '', setIsLoading)
+        }
+        isLoading={isLoading}
+      />
+    </div>
+  )
+}
+