Skip to content

Commit d7b6561

Browse files
committed
fix: paid membership pro membership selection issue
1 parent 15d0f66 commit d7b6561

File tree

3 files changed

+42
-33
lines changed

3 files changed

+42
-33
lines changed

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

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,25 @@ const PaidMembershipProHelper = ({ flow, setFlowData, edit = false }) => {
99

1010
const [newFlow, setNewFlow] = useRecoilState($newFlow)
1111
const triggerData = !edit ? newFlow?.triggerData : flow.flow_details
12+
1213
return (
1314
<div>
14-
{(id === '1' || id === '2' || id === '3' || id === '4') && (
15-
<div className={edit ? 'flx mt-3' : ''}>
16-
<b className={edit ? 'wdt-200 d-in-b' : 'wdt-200 d-in-b mt-3 mb-3'}>
17-
{__('Select membership', 'bit-integrations')}
18-
</b>
19-
<MultiSelect
20-
className="msl-wrp-options"
21-
defaultValue={triggerData?.selectedMembershipLevel}
22-
options={triggerData?.AllMembershipLevels?.map((list) => ({
23-
label: list.membershipTitle,
24-
value: list.membershipId.toString()
25-
}))}
26-
onChange={(val) => setFlowData(val, 'selectedMembershipLevel')}
27-
singleSelect
28-
style={{ width: '100%', minWidth: 300, maxWidth: 400 }}
29-
/>
30-
</div>
31-
)}
15+
<div className={edit ? 'flx mt-3' : ''}>
16+
<b className={edit ? 'wdt-200 d-in-b' : 'wdt-200 d-in-b mt-3 mb-3'}>
17+
{__('Select membership', 'bit-integrations')}
18+
</b>
19+
<MultiSelect
20+
className="msl-wrp-options"
21+
defaultValue={triggerData?.selectedMembershipLevel}
22+
options={triggerData?.AllMembershipLevels?.map(list => ({
23+
label: list.membershipTitle,
24+
value: list.membershipId.toString()
25+
}))}
26+
onChange={val => setFlowData(val, 'selectedMembershipLevel')}
27+
singleSelect
28+
style={{ width: '100%', minWidth: 300, maxWidth: 400 }}
29+
/>
30+
</div>
3231
</div>
3332
)
3433
}

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

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,14 @@ export const eventsCalendarStateFP = (val, tmpNewFlow, resp, setNewFlow) => {
227227
}
228228

229229
export const voxelStateFP = (val, tmpNewFlow, resp, setNewFlow) => {
230-
if (val === 'voxel-7' || val === 'voxel-8' || val === 'voxel-9' || val === 'voxel-10' || val === 'voxel-11' || val === 'voxel-20') {
230+
if (
231+
val === 'voxel-7' ||
232+
val === 'voxel-8' ||
233+
val === 'voxel-9' ||
234+
val === 'voxel-10' ||
235+
val === 'voxel-11' ||
236+
val === 'voxel-20'
237+
) {
231238
tmpNewFlow.triggerData = {
232239
...tmpNewFlow.triggerData,
233240
postTypes: resp.data.postTypes,
@@ -445,9 +452,8 @@ export const MemberpressStateFP = (val, tmpNewFlow, resp, setNewFlow) => {
445452
}
446453

447454
export const PaidMembershipProStateFP = (val, tmpNewFlow, resp, setNewFlow) => {
448-
if (val === '1' || val === '2' || val === '3' || val === '4') {
449-
tmpNewFlow.triggerData.AllMembershipLevels = resp.data.AllMembershipLevels
450-
}
455+
tmpNewFlow.triggerData.AllMembershipLevels = resp.data.AllMembershipLevels
456+
451457
setNewFlow(tmpNewFlow)
452458
}
453459

@@ -618,7 +624,14 @@ export const eventsCalendarIH = (tmpConf, flowData, triggered_entity_id) => {
618624
export const voxelIH = (tmpConf, flowData, triggered_entity_id) => {
619625
const formId = flowData.formID ? flowData.formID : triggered_entity_id
620626

621-
if (formId === 'voxel-7' || formId === 'voxel-8' || formId === 'voxel-9' || formId === 'voxel-10' || formId === 'voxel-11' || formId === 'voxel-20') {
627+
if (
628+
formId === 'voxel-7' ||
629+
formId === 'voxel-8' ||
630+
formId === 'voxel-9' ||
631+
formId === 'voxel-10' ||
632+
formId === 'voxel-11' ||
633+
formId === 'voxel-20'
634+
) {
622635
tmpConf.selectedPostType = flowData.selectedPostType
623636
tmpConf.postTypes = flowData.postTypes
624637
}
@@ -871,11 +884,9 @@ export const memberpressStateIH = (tmpConf, flowData) => {
871884
}
872885

873886
export const PaidMembershipProStateIH = (tmpConf, flowData) => {
874-
const val = Number(flowData.formID)
875-
if (val === 1 || val === 2 || val === 3 || val === 4) {
876-
tmpConf.selectedMembershipLevel = flowData.selectedMembershipLevel
877-
tmpConf.AllMembershipLevels = flowData.AllMembershipLevels
878-
}
887+
tmpConf.selectedMembershipLevel = flowData.selectedMembershipLevel
888+
tmpConf.AllMembershipLevels = flowData.AllMembershipLevels
889+
879890
return tmpConf
880891
}
881892

@@ -889,7 +900,6 @@ export const SliceWpStateIH = (tmpConf, flowData) => {
889900
}
890901

891902
export const SureCartStateIH = (tmpConf, flowData) => {
892-
893903
tmpConf.selectedProduct = flowData.selectedProduct
894904
tmpConf.allProduct = flowData.allProduct
895905

includes/Actions/ZohoCRM/ZohoCRMController.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
namespace BitCode\FI\Actions\ZohoCRM;
88

9-
use BitCode\FI\Core\Util\HttpHelper;
10-
use BitCode\FI\Flow\FlowController;
11-
use BitCode\FI\Log\LogHandler;
129
use stdClass;
1310
use WP_Error;
11+
use BitCode\FI\Log\LogHandler;
12+
use BitCode\FI\Flow\FlowController;
13+
use BitCode\FI\Core\Util\HttpHelper;
1414

1515
/**
1616
* Provide functionality for ZohoCrm integration
@@ -199,7 +199,7 @@ public static function refreshLayoutsAjaxHelper($queryParams)
199199
$authorizationHeader['Authorization'] = "Zoho-oauthtoken {$queryParams->tokenDetails->access_token}";
200200
$requiredParams['module'] = $queryParams->module;
201201
$layoutsMetaResponse = HttpHelper::get($layoutsMetaApiEndpoint, $requiredParams, $authorizationHeader);
202-
error_log(print_r($layoutsMetaResponse, true));
202+
203203
if (!is_wp_error($layoutsMetaResponse) && (empty($layoutsMetaResponse->status) || (!empty($layoutsMetaResponse->status) && $layoutsMetaResponse->status !== 'error'))) {
204204
$retriveLayoutsData = $layoutsMetaResponse->layouts;
205205
$layouts = [];

0 commit comments

Comments
 (0)