← All changes | app/Services/Integrations/FluentCRM/Bootstrap.php +31 -20 1.5.22 → 2.5.0 View file →

		@@ -99,8 +99,10 @@
99	99	unset($fieldOptions['prefix']);
100	100	unset($fieldOptions['full_name']);
101	101	unset($fieldOptions['company_id']);
102	102
	103	+ $canCreateTaxonomy = \FluentCrm\App\Services\PermissionManager::currentUserCan('fcrm_manage_contact_cats');
	104	+
103	105	$fields = [
104	106	[
105	107	'key' => 'name',
106	108	'label' => __('Feed Name', 'fluent-booking'),
		@@ -143,36 +145,42 @@
143	145	'field_label_local' => __('Form Field', 'fluent-booking'),
144	146	'options' => $fieldOptions,
145	147	],
146	148	[
147		- 'key' => 'list_ids',
148		- 'label' => __('FluentCRM Lists', 'fluent-booking'),
149		- 'placeholder' => __('Select FluentCRM Lists', 'fluent-booking'),
150		- 'tips' => __('Select the FluentCRM Lists you would like to add your contacts to.', 'fluent-booking'),
151		- 'component' => 'select',
152		- 'is_multiple' => true,
153		- 'required' => false,
154		- 'options' => $this->getLists(),
	149	+ 'key' => 'list_ids',
	150	+ 'label' => __('FluentCRM Lists', 'fluent-booking'),
	151	+ 'placeholder' => __('Select FluentCRM Lists', 'fluent-booking'),
	152	+ 'tips' => __('Select the FluentCRM Lists you would like to add your contacts to.', 'fluent-booking'),
	153	+ 'component' => 'select',
	154	+ 'is_multiple' => true,
	155	+ 'required' => false,
	156	+ 'options' => $this->getLists(),
	157	+ 'creatable' => $canCreateTaxonomy,
	158	+ 'taxonomy' => 'lists',
	159	+ 'create_placeholder' => __('New list name', 'fluent-booking'),
155	160	],
156	161	[
157		- 'key' => 'tag_ids',
158		- 'require_list' => false,
159		- 'label' => __('Contact Tags', 'fluent-booking'),
160		- 'placeholder' => __('Select Tags', 'fluent-booking'),
161		- 'component' => 'select',
162		- 'is_multiple' => true,
163		- 'options' => $this->getTags(),
	162	+ 'key' => 'tag_ids',
	163	+ 'require_list' => false,
	164	+ 'label' => __('Contact Tags', 'fluent-booking'),
	165	+ 'placeholder' => __('Select Tags', 'fluent-booking'),
	166	+ 'component' => 'select',
	167	+ 'is_multiple' => true,
	168	+ 'options' => $this->getTags(),
	169	+ 'creatable' => $canCreateTaxonomy,
	170	+ 'taxonomy' => 'tags',
	171	+ 'create_placeholder' => __('New tag name', 'fluent-booking'),
164	172	],
165	173	[
166	174	'key' => 'skip_if_exists',
167	175	'require_list' => false,
168		- 'checkbox_label' => __('Skip if contact already exist in FluentCRM', 'fluent-booking'),
	176	+ 'checkbox_label' => __('Skip if contact already exists in FluentCRM', 'fluent-booking'),
169	177	'component' => 'checkbox-single',
170	178	],
171	179	[
172	180	'key' => 'skip_primary_data',
173	181	'require_list' => false,
174		- 'checkbox_label' => __('Skip name update if existing contact have old data (per primary field)', 'fluent-booking'),
	182	+ 'checkbox_label' => __('Skip name update if an existing contact has old data (per primary field)', 'fluent-booking'),
175	183	'component' => 'checkbox-single',
176	184	],
177	185	[
178	186	'key' => 'double_opt_in',
		@@ -184,9 +192,9 @@
184	192	'key' => 'force_subscribe',
185	193	'require_list' => false,
186	194	'checkbox_label' => __('Enable Force Subscribe if contact is not in subscribed status (Existing contact only)', 'fluent-booking'),
187	195	'component' => 'checkbox-single',
188		- 'inline_tip' => __('If you enable this then contact will forcefully subscribed no matter in which status that contact had', 'fluent-booking'),
	196	+ 'inline_tip' => __('If you enable this, the contact will be forcefully subscribed regardless of its current status', 'fluent-booking'),
189	197	],
190	198	[
191	199	'require_list' => false,
192	200	'required' => true,
		@@ -194,8 +202,11 @@
194	202	'options' => [
195	203	'after_booking_scheduled' => __('Booking Confirmed', 'fluent-booking'),
196	204	'booking_schedule_completed' => __('Booking Completed', 'fluent-booking'),
197	205	'booking_schedule_cancelled' => __('Booking Canceled', 'fluent-booking'),
	206	+ 'after_booking_rescheduled' => __('Booking Rescheduled', 'fluent-booking'),
	207	+ 'booking_schedule_rejected' => __('Booking Rejected', 'fluent-booking'),
	208	+ 'booking_schedule_no_show' => __('Booking No-Show', 'fluent-booking'),
198	209	],
199	210	'tips' => __('Select in which booking stage you want to trigger this feed', 'fluent-booking'),
200	211	'label' => __('Event Trigger', 'fluent-booking'),
201	212	'component' => 'checkbox-multiple-text',
		@@ -286,9 +297,9 @@
286	297
287	298	if (!is_email($contact['email'])) {
288	299	$this->addLog(
289	300	$feed['settings']['name'],
290		- __('FluentCRM API called skipped because no valid email available', 'fluent-booking'),
	301	+ __('FluentCRM API call was skipped because no valid email is available', 'fluent-booking'),
291	302	$booking->id,
292	303	'failed'
293	304	);
294	305	return false;
		@@ -297,9 +308,9 @@
297	308	$subscriber = Subscriber::where('email', $contact['email'])->first();
298	309	if ($subscriber && Arr::isTrue($data, 'skip_if_exists')) {
299	310	$this->addLog(
300	311	$feed['settings']['name'],
301		- __('Contact creation has been skipped because contact already exist in the database', 'fluent-booking'),
	312	+ __('Contact creation has been skipped because the contact already exists in the database', 'fluent-booking'),
302	313	$booking->id,
303	314	'failed'
304	315	);
305	316	return false;