Skip to content

Beautiful Open-Source Form Builder

Apply previous changes: slack webhooks, date range issue, 12h am/pm format, today preifl, api-keys

JhumanJ18ed28da2e21
diff --git a/app/Http/Requests/UserFormRequest.php b/app/Http/Requests/UserFormRequest.php
index ee9a88ad0..ecfb0739a 100644
--- a/app/Http/Requests/UserFormRequest.php
+++ b/app/Http/Requests/UserFormRequest.php
@@ -40,6 +40,7 @@ abstract class UserFormRequest extends \Illuminate\Foundation\Http\FormRequest
'notifications_include_submission' => 'boolean',
'webhook_url' => 'url|nullable',
'use_captcha' => 'boolean',
+ 'slack_webhook_url' => 'url|nullable',
// Customization
'theme' => ['required',Rule::in(Form::THEMES)],
@@ -96,7 +97,9 @@ abstract class UserFormRequest extends \Illuminate\Foundation\Http\FormRequest
// Date field
'properties.*.with_time' => 'boolean|nullable',
+ 'properties.*.use_am_pm' => 'boolean|nullable',
'properties.*.date_range' => 'boolean|nullable',
+ 'properties.*.prefill_today' => 'boolean|nullable',
// Select / Multi Select field
'properties.*.allow_creation' => 'boolean|nullable',
diff --git a/app/Http/Resources/FormResource.php b/app/Http/Resources/FormResource.php
index a8bfeda5a..f8ebfff40 100644
--- a/app/Http/Resources/FormResource.php
+++ b/app/Http/Resources/FormResource.php
@@ -29,6 +29,7 @@ class FormResource extends JsonResource
'views_count' => $this->when($this->workspace->is_pro, $this->views_count),
'submissions_count' => $this->when($this->workspace->is_pro, $this->submissions_count),
'notifies' => $this->notifies,
+ 'notifies_slack' => $this->notifies_slack,
'send_submission_confirmation' => $this->send_submission_confirmation,
'webhook_url' => $this->webhook_url,
'redirect_url' => $this->redirect_url,
@@ -42,6 +43,7 @@ class FormResource extends JsonResource
'password' => $this->password,
'tags' => $this->tags,
'notification_emails' => $this->notification_emails,
+ 'slack_webhook_url' => $this->slack_webhook_url,
] : [];
$baseData = $this->getFilteredFormData(parent::toArray($request), $userIsFormOwner);
diff --git a/app/Listeners/Forms/NotifyFormSubmission.php b/app/Listeners/Forms/NotifyFormSubmission.php
index b42a3c43d..5ab5a2fdb 100644
--- a/app/Listeners/Forms/NotifyFormSubmission.php
+++ b/app/Listeners/Forms/NotifyFormSubmission.php
@@ -7,6 +7,8 @@ use App\Notifications\Forms\FormSubmissionNotification;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Support\Facades\Notification;
+use Spatie\WebhookServer\WebhookCall;
+use App\Service\Forms\FormSubmissionFormatter;
class NotifyFormSubmission implements ShouldQueue
{
@@ -20,18 +22,77 @@ class NotifyFormSubmission implements ShouldQueue
*/
public function handle(FormSubmitted $event)
{
- if (!$event->form->notifies || !$event->form->is_pro) return;
-
- $subscribers = collect(preg_split("/\r\n|\n|\r/", $event->form->notification_emails))->filter(function($email) {
- return filter_var($email, FILTER_VALIDATE_EMAIL);
- });
- \Log::debug('Sending email notification',[
- 'recipients' => $subscribers->toArray(),
- 'form_id' => $event->form->id,
- 'form_slug' => $event->form->slug,
- ]);
- $subscribers->each(function ($subscriber) use ($event) {
- Notification::route('mail', $subscriber)->notify(new FormSubmissionNotification($event));
- });
+ if (!$event->form->is_pro) return;
+
+ if ($event->form->notifies) {
+ // Send Email Notification
+ $subscribers = collect(preg_split("/\r\n|\n|\r/", $event->form->notification_emails))->filter(function($email) {
+ return filter_var($email, FILTER_VALIDATE_EMAIL);
+ });
+ \Log::debug('Sending email notification',[
+ 'recipients' => $subscribers->toArray(),
+ 'form_id' => $event->form->id,
+ 'form_slug' => $event->form->slug,
+ ]);
+ $subscribers->each(function ($subscriber) use ($event) {
+ Notification::route('mail', $subscriber)->notify(new FormSubmissionNotification($event));
+ });
+ }
+
+ if ($event->form->notifies_slack) {
+ // Send Slack Notification
+ $this->sendSlackNotification($event);
+ }
+ }
+
+ private function sendSlackNotification(FormSubmitted $event)
+ {
+ if($this->validateSlackWebhookUrl($event->form->slack_webhook_url)){
+ $submissionString = "";
+ $formatter = (new FormSubmissionFormatter($event->form, $event->data))->outputStringsOnly();
+ foreach ($formatter->getFieldsWithValue() as $field) {
+ $tmpVal = is_array($field['value']) ? implode(",", $field['value']) : $field['value'];
+ $submissionString .= ">*".ucfirst($field['name'])."*: ".$tmpVal." \n";
+ }
+
+ $formURL = url("forms/".$event->form->slug);
+ $editFormURL = url("forms/".$event->form->slug."/show");
+ $finalSlackPostData = [
+ 'blocks' => [
+ [
+ 'type' => 'section',
+ 'text' => [
+ 'type' => 'mrkdwn',
+ 'text' => 'New submission for your form *<'.$formURL.'|'.$event->form->title.':>*',
+ ]
+ ],
+ [
+ 'type' => 'section',
+ 'text' => [
+ 'type' => 'mrkdwn',
+ 'text' => $submissionString
+ ]
+ ],
+ [
+ 'type' => 'section',
+ 'text' => [
+ 'type' => 'mrkdwn',
+ 'text' => '*<'.$formURL.'|🔗 Open Form>* *<'.$editFormURL.'|✍️ Edit Form>*',
+ ]
+ ],
+ ]
+ ];
+
+ WebhookCall::create()
+ ->url($event->form->slack_webhook_url)
+ ->doNotSign()
+ ->payload($finalSlackPostData)
+ ->dispatch();
+ }
+ }
+
+ private function validateSlackWebhookUrl($url)
+ {
+ return ($url) ? str_contains($url, 'https://hooks.slack.com/') : false;
}
}
diff --git a/app/Models/Forms/Form.php b/app/Models/Forms/Form.php
index 5e4f8dfa5..64c029b3b 100644
--- a/app/Models/Forms/Form.php
+++ b/app/Models/Forms/Form.php
@@ -37,6 +37,7 @@ class Form extends Model
'notification_subject',
'notification_body',
'notifications_include_submission',
+ 'slack_webhook_url',
// integrations
'webhook_url',
@@ -94,6 +95,7 @@ class Form extends Model
protected $hidden = [
'workspace_id',
'notifies',
+ 'slack_webhook_url',
'webhook_url',
'send_submission_confirmation',
'redirect_url',
@@ -223,4 +225,9 @@ class Form extends Model
{
return FormFactory::new();
}
+
+ public function getNotifiesSlackAttribute()
+ {
+ return !empty($this->slack_webhook_url);
+ }
}
diff --git a/app/Models/User.php b/app/Models/User.php
index 079ee5e77..4618afa0f 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -4,7 +4,6 @@ namespace App\Models;
use App\Http\Controllers\SubscriptionController;
use App\Models\Forms\Form;
-use App\Models\Workspace;
use App\Notifications\ResetPassword;
use App\Notifications\VerifyEmail;
use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -13,7 +12,6 @@ use Illuminate\Foundation\Auth\User as Authenticatable;
// use Illuminate\Contracts\Auth\MustVerifyEmail;
use Illuminate\Notifications\Notifiable;
use Laravel\Cashier\Billable;
-use Rickycezar\Impersonate\Models\Impersonate;
use Tymon\JWTAuth\Contracts\JWTSubject;
class User extends Authenticatable implements JWTSubject //, MustVerifyEmail
@@ -205,5 +203,5 @@ class User extends Authenticatable implements JWTSubject //, MustVerifyEmail
});
});
}
-
+
}
diff --git a/app/Service/Forms/FormCleaner.php b/app/Service/Forms/FormCleaner.php
index c63c199c9..f46af77f2 100644
--- a/app/Service/Forms/FormCleaner.php
+++ b/app/Service/Forms/FormCleaner.php
@@ -38,6 +38,7 @@ class FormCleaner
'theme' => 'default',
'use_captcha' => false,
'password' => null,
+ 'slack_webhook_url' => null,
];
private array $fieldDefaults = [
@@ -68,6 +69,7 @@ class FormCleaner
'logo_picture' => 'The logo was removed.',
'database_fields_update' => 'Form submission will only create new records (no updates).',
'theme' => 'Default theme was applied.',
+ 'slack_webhook_url' => "Slack webhook disabled.",
// For fields
'hide_field_name' => 'Hide field name removed.',
diff --git a/config/services.php b/config/services.php
index e668b03cf..eaa8e0db4 100644
--- a/config/services.php
+++ b/config/services.php
@@ -46,5 +46,9 @@ return [
'notion' => [
'worker' => env('NOTION_WORKER','https://notion-forms-worker.notionforms.workers.dev/v1')
- ]
+ ],
+
+ 'google_analytics_code' => env('GOOGLE_ANALYTICS_CODE'),
+ 'amplitude_code' => env('AMPLITUDE_CODE'),
+ 'crisp_website_id' => env('CRISP_WEBSITE_ID')
];
diff --git a/database/factories/FormFactory.php b/database/factories/FormFactory.php
index 7320977d1..40d485012 100644
--- a/database/factories/FormFactory.php
+++ b/database/factories/FormFactory.php
@@ -57,7 +57,7 @@ class FormFactory extends Factory
{
return [
'title' => $this->faker->text(30),
- 'description' => $this->faker->randomHtml(2),
+ 'description' => $this->faker->randomHtml(1),
'notifies' => false,
'send_submission_confirmation' => false,
'webhook_url' => null,
@@ -80,7 +80,8 @@ class FormFactory extends Factory
'use_captcha' => false,
'can_be_indexed' => true,
'password' => false,
- 'tags' => []
+ 'tags' => [],
+ 'slack_webhook_url' => null,
];
}
diff --git a/database/migrations/2022_09_16_110344_add_slack_webhook_url_to_forms.php b/database/migrations/2022_09_16_110344_add_slack_webhook_url_to_forms.php
new file mode 100644
index 000000000..33df31cf4
--- /dev/null
+++ b/database/migrations/2022_09_16_110344_add_slack_webhook_url_to_forms.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+ /**
+ * Run the migrations.
+ *
+ * @return void
+ */
+ public function up()
+ {
+ Schema::table('forms', function (Blueprint $table) {
+ $table->string('slack_webhook_url')->nullable();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::table('forms', function (Blueprint $table) {
+ $table->dropColumn('slack_webhook_url');
+ });
+ }
+};
diff --git a/resources/js/components/forms/DateInput.vue b/resources/js/components/forms/DateInput.vue
index b196de3e4..abddb1cc9 100644
--- a/resources/js/components/forms/DateInput.vue
+++ b/resources/js/components/forms/DateInput.vue
@@ -11,7 +11,8 @@
:style="inputStyle" :name="name" :fixed-classes="fixedClasses" :range="dateRange"
:placeholder="placeholder" :timepicker="useTime"
:date-format="useTime?'Z':'Y-m-d'"
- :user-format="useTime?'F j, Y - H:i':'F j, Y'"
+ :user-format="useTime ? amPm ? 'F j, Y - G:i K' : 'F j, Y - H:i' : 'F j, Y'"
+ :amPm="amPm"
/>
<small v-if="help" :class="theme.default.help">
<slot name="help">{{ help }}</slot>
@@ -30,7 +31,8 @@ export default {
props: {
withTime: { type: Boolean, default: false },
- dateRange: { type: Boolean, default: false }
+ dateRange: { type: Boolean, default: false },
+ amPm: { type: Boolean, default: false }
},
data: () => ({
diff --git a/resources/js/components/forms/FlatSelectInput.vue b/resources/js/components/forms/FlatSelectInput.vue
index 1d624682a..836102482 100644
--- a/resources/js/components/forms/FlatSelectInput.vue
+++ b/resources/js/components/forms/FlatSelectInput.vue
@@ -1,86 +1,84 @@
<template>
- <div :class="wrapperClass">
- <label v-if="label" :for="id?id:name"
- :class="[theme.default.label,{'uppercase text-xs':uppercaseLabels, 'text-sm':!uppercaseLabels}]"
- >
- {{ label }}
- <span v-if="required" class="text-red-500 required-dot">*</span>
- </label>
+ <div :class="wrapperClass">
+ <label v-if="label" :for="id?id:name"
+ :class="[theme.default.label,{'uppercase text-xs':uppercaseLabels, 'text-sm':!uppercaseLabels}]"
+ >
+ {{ label }}
+ <span v-if="required" class="text-red-500 required-dot">*</span>
+ </label>
- <loader v-if="loading" key="loader" class="h-6 w-6 text-nt-blue mx-auto" />
- <div v-else v-for="option in options" :key="option[optionKey]" class="flex border mb-4 p-3 cursor-pointer rounded-2xl" @click="onSelect(option[optionKey])">
- <p class="flex-grow">
- {{ option[displayKey] }}
- </p>
- <span v-if="isSelected(option[optionKey])" class="float-right">
- <svg class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
- <path fill-rule="evenodd"
- d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z"
- clip-rule="evenodd"
- />
- </svg>
- </span>
- </div>
-
- <small v-if="help" :class="theme.SelectInput.help">
- <slot name="help">{{ help }}</slot>
- </small>
- <has-error v-if="hasValidation" :form="form" :field="name" />
+ <loader v-if="loading" key="loader" class="h-6 w-6 text-nt-blue mx-auto" />
+ <div v-for="(option, index) in options" v-else :key="option[optionKey]"
+ :class="[theme.default.input,'cursor-pointer hover:bg-gray-50 dark:hover:bg-gray-900 flex',{ 'mb-2': index !== options.length,'ring-red-500 ring-2': hasValidation && form.errors.has(name), 'cursor-not-allowed bg-gray-200':disabled }]"
+ @click="onSelect(option[optionKey])"
+ >
+ <p class="flex-grow">
+ {{ option[displayKey] }}
+ </p>
+ <div v-if="isSelected(option[optionKey])" class="flex items-center">
+ <svg :color="color" xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
+ <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z" clip-rule="evenodd" />
+ </svg>
+ </div>
</div>
- </template>
- <script>
- import inputMixin from '~/mixins/forms/input'
+ <small v-if="help" :class="theme.SelectInput.help">
+ <slot name="help">{{ help }}</slot>
+ </small>
+ <has-error v-if="hasValidation" :form="form" :field="name" />
+ </div>
+</template>
- /**
- * Options: {name,value} objects
- */
- export default {
- name: 'FlatSelectInput',
- mixins: [inputMixin],
+<script>
+import inputMixin from '~/mixins/forms/input'
- props: {
- options: { type: Array, required: true },
- optionKey: { type: String, default: 'value' },
- emitKey: { type: String, default: 'value' },
- displayKey: { type: String, default: 'name' },
- loading: { type: Boolean, default: false },
- multiple: { type: Boolean, default: false },
- },
- data () {
- return {
- }
- },
- computed: {
- },
- methods: {
- onSelect (value) {
- if (this.multiple) {
- const emitValue = Array.isArray(this.compVal) ? [...this.compVal] : []
+/**
+ * Options: {name,value} objects
+ */
+export default {
+ name: 'FlatSelectInput',
+ mixins: [inputMixin],
- // Already in value, remove it
- if (this.isSelected(value)) {
- this.compVal = emitValue.filter((item) => {
- return item !== value
- })
- return
- }
+ props: {
+ options: { type: Array, required: true },
+ optionKey: { type: String, default: 'value' },
+ emitKey: { type: String, default: 'value' },
+ displayKey: { type: String, default: 'name' },
+ loading: { type: Boolean, default: false },
+ multiple: { type: Boolean, default: false }
+ },
+ data () {
+ return {}
+ },
+ computed: {},
+ methods: {
+ onSelect (value) {
+ if (this.multiple) {
+ const emitValue = Array.isArray(this.compVal) ? [...this.compVal] : []
- // Otherwise add value
- emitValue.push(value)
- this.compVal = emitValue
- } else {
- this.compVal = (this.compVal === value) ? null : value
+ // Already in value, remove it
+ if (this.isSelected(value)) {
+ this.compVal = emitValue.filter((item) => {
+ return item !== value
+ })
+ return
}
- },
- isSelected (value) {
- if(!this.compVal) return false
- if (this.multiple) {
- return this.compVal.includes(value)
- }
- return this.compVal === value
+ // Otherwise add value
+ emitValue.push(value)
+ this.compVal = emitValue
+ } else {
+ this.compVal = (this.compVal === value) ? null : value
+ }
+ },
+ isSelected (value) {
+ if (!this.compVal) return false
+
+ if (this.multiple) {
+ return this.compVal.includes(value)
}
+ return this.compVal === value
}
}
- </script>
+}
+</script>
diff --git a/resources/js/components/open/forms/OpenForm.vue b/resources/js/components/open/forms/OpenForm.vue
index 6c85d7bb8..427acb046 100644
--- a/resources/js/components/open/forms/OpenForm.vue
+++ b/resources/js/components/open/forms/OpenForm.vue
@@ -288,6 +288,12 @@ export default {
} else if (urlPrefill && urlPrefill.has(field.id + '[]')) {
// Array url prefills
formData[field.id] = urlPrefill.getAll(field.id + '[]')
+ } else if (field.type === 'date' && field.prefill_today === true) { // For Prefill with 'today'
+ const dateObj = new Date()
+ const currentDate = dateObj.getFullYear() + '-' +
+ String(dateObj.getMonth() + 1).padStart(2, '0') + '-' +
+ String(dateObj.getDate()).padStart(2, '0')
+ formData[field.id] = currentDate
} else { // Default prefill if any
formData[field.id] = field.prefill
}
@@ -363,6 +369,9 @@ export default {
} else if (field.date_range) {
inputProperties.dateRange = true
}
+ if (field.use_am_pm) {
+ inputProperties.amPm = true
+ }
} else if (field.type === 'files' || (field.type === 'url' && field.file_upload)) {
inputProperties.multiple = (field.multiple !== undefined && field.multiple)
inputProperties.mbLimit = 5
diff --git a/resources/js/components/open/forms/components/form-components/FormIntegrations.vue b/resources/js/components/open/forms/components/form-components/FormIntegrations.vue
index bdd51414f..28925bd15 100644
--- a/resources/js/components/open/forms/components/form-components/FormIntegrations.vue
+++ b/resources/js/components/open/forms/components/form-components/FormIntegrations.vue
@@ -2,11 +2,13 @@
<collapse class="p-5 w-full border-b">
<template #title>
<h3 class="font-semibold text-lg">
- <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 inline text-gray-500 mr-2 -mt-1" fill="none" viewBox="0 0 24 24" stroke="currentColor">
- <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M11 4a2 2 0 114 0v1a1 1 0 001 1h3a1 1 0 011 1v3a1 1 0 01-1 1h-1a2 2 0 100 4h1a1 1 0 011 1v3a1 1 0 01-1 1h-3a1 1 0 01-1-1v-1a2 2 0 10-4 0v1a1 1 0 01-1 1H7a1 1 0 01-1-1v-3a1 1 0 00-1-1H4a2 2 0 110-4h1a1 1 0 001-1V7a1 1 0 011-1h3a1 1 0 001-1V4z" />
+ <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 inline text-gray-500 mr-2 -mt-1" fill="none"
+ viewBox="0 0 24 24" stroke="currentColor">
+ <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+ d="M11 4a2 2 0 114 0v1a1 1 0 001 1h3a1 1 0 011 1v3a1 1 0 01-1 1h-1a2 2 0 100 4h1a1 1 0 011 1v3a1 1 0 01-1 1h-3a1 1 0 01-1-1v-1a2 2 0 10-4 0v1a1 1 0 01-1 1H7a1 1 0 01-1-1v-3a1 1 0 00-1-1H4a2 2 0 110-4h1a1 1 0 001-1V7a1 1 0 011-1h3a1 1 0 001-1V4z"/>
</svg>
Integrations
- <pro-tag />
+ <pro-tag/>
</h3>
</template>
<text-input name="webhook_url" class="mt-4"
@@ -14,24 +16,26 @@
label="Webhook URL"
/>
- <p>
- <span class="text-uppercase font-semibold text-blue-500">NEW</span> - our Zapier integration is available for
- beta testers! During the beta, <b>you don't need a Pro subscription</b> to try it out.
- </p>
- <p class="w-full text-center mt-5">
- <a :href="zapierUrl" target="_blank">
- <v-button color="gray" shade="lighter">
- <svg class="h-5 w-5 inline text-yellow-500" fill="currentColor" xmlns="http://www.w3.org/2000/svg"
- viewBox="0 0 512 512"
- >
- <path
- d="M318 256c0 19-4 36-10 52-16 7-34 10-52 10-19 0-36-3-52-9-7-17-10-34-10-53 0-18 3-36 10-52 16-6 33-10 52-10 18 0 36 4 52 10 6 16 10 34 10 52zm182-41H355l102-102c-8-11-17-22-26-32-10-9-21-18-32-26L297 157V12c-13-2-27-3-41-3s-28 1-41 3v145L113 55c-12 8-22 17-32 26-10 10-19 21-27 32l102 102H12s-3 27-3 41 1 28 3 41h144L54 399c16 23 36 43 59 59l102-102v144c13 2 27 3 41 3s28-1 41-3V356l102 102c11-8 22-17 32-27 9-10 18-20 26-32L355 297h145c2-13 3-27 3-41s-1-28-3-41z"
- />
- </svg>
- Zapier Integration
- </v-button>
- </a>
- </p>
+<!-- <div>-->
+<!-- <p>-->
+<!-- <span class="text-uppercase font-semibold text-blue-500">NEW</span> - our Zapier integration is available for-->
+<!-- beta testers!-->
+<!-- </p>-->
+<!-- <p class="w-full text-center mt-5">-->
+<!-- <a :href="zapierUrl" target="_blank">-->
+<!-- <v-button color="gray" shade="lighter">-->
+<!-- <svg class="h-5 w-5 inline text-yellow-500" fill="currentColor" xmlns="http://www.w3.org/2000/svg"-->
+<!-- viewBox="0 0 512 512"-->
+<!-- >-->
+<!-- <path-->
+<!-- d="M318 256c0 19-4 36-10 52-16 7-34 10-52 10-19 0-36-3-52-9-7-17-10-34-10-53 0-18 3-36 10-52 16-6 33-10 52-10 18 0 36 4 52 10 6 16 10 34 10 52zm182-41H355l102-102c-8-11-17-22-26-32-10-9-21-18-32-26L297 157V12c-13-2-27-3-41-3s-28 1-41 3v145L113 55c-12 8-22 17-32 26-10 10-19 21-27 32l102 102H12s-3 27-3 41 1 28 3 41h144L54 399c16 23 36 43 59 59l102-102v144c13 2 27 3 41 3s28-1 41-3V356l102 102c11-8 22-17 32-27 9-10 18-20 26-32L355 297h145c2-13 3-27 3-41s-1-28-3-41z"-->
+<!-- />-->
+<!-- </svg>-->
+<!-- Zapier Integration-->
+<!-- </v-button>-->
+<!-- </a>-->
+<!-- </p>-->
+<!-- </div>-->
</collapse>
</template>
@@ -40,21 +44,19 @@ import Collapse from '../../../../common/Collapse'
import ProTag from '../../../../common/ProTag'
export default {
- components: { Collapse, ProTag },
- props: {
- },
- data () {
- return {
- }
+ components: {Collapse, ProTag},
+ props: {},
+ data() {
+ return {}
},
computed: {
form: {
- get () {
+ get() {
return this.$store.state['open/working_form'].content
},
/* We add a setter */
- set (value) {
+ set(value) {
this.$store.commit('open/working_form/set', value)
}
},
@@ -64,10 +66,9 @@ export default {
watch: {},
- mounted () {
+ mounted() {
},
- methods: {
- }
+ methods: {}
}
</script>
diff --git a/resources/js/components/open/forms/components/form-components/FormNotifications.vue b/resources/js/components/open/forms/components/form-components/FormNotifications.vue
index e72dc4bc8..2ae71189e 100644
--- a/resources/js/components/open/forms/components/form-components/FormNotifications.vue
+++ b/resources/js/components/open/forms/components/form-components/FormNotifications.vue
@@ -15,6 +15,17 @@
<text-area-input v-if="form.notifies" name="notification_emails" :form="form" class="mt-4"
label="Notification Emails" help="Add one email per line"
/>
+ <checkbox-input name="notifies_slack" :form="form" class="mt-4"
+ label="Receive a Slack notification on submission"
+ />
+ <text-input v-if="form.notifies_slack" name="slack_webhook_url" :form="form" class="mt-4"
+ label="Slack webhook url" help="help"
+ >
+ <template #help>
+ Receive slack message on each form submission. <a href="https://api.slack.com/messaging/webhooks" target="_blank">Click here</a> to learn how to get a slack webhook url
+ </template>
+ </text-input>
+
<checkbox-input :disabled="emailSubmissionConfirmationField===null" name="send_submission_confirmation"
:form="form" class="mt-4"
label="Send submission confirmation" :help="emailSubmissionConfirmationHelp"
diff --git a/resources/js/components/open/forms/fields/FormFieldOptionsModal.vue b/resources/js/components/open/forms/fields/FormFieldOptionsModal.vue
index 8ec878efe..9908b15de 100644
--- a/resources/js/components/open/forms/fields/FormFieldOptionsModal.vue
+++ b/resources/js/components/open/forms/fields/FormFieldOptionsModal.vue
@@ -111,12 +111,30 @@
<p class="text-gray-400 mb-5">
Include time. Or not. This cannot be used with the date range option yet.
</p>
+ <v-checkbox v-if="field.with_time"
+ v-model="field.use_am_pm"
+ name="use_am_pm"
+ >
+ Use 12h AM/PM format
+ </v-checkbox>
+ <p v-if="field.with_time" class="text-gray-400 mb-5">
+ By default, input uses the 24 hours format
+ </p>
<select-input v-if="field.with_time" name="timezone" class="mt-4"
:form="field" :options="timezonesOptions"
label="Timezone" :searchable="true"
help="Make sure to select correct timezone. Leave blank otherwise."
/>
+ <v-checkbox v-model="field.prefill_today"
+ name="prefill_today"
+ @input="onFieldPrefillTodayChange"
+ >
+ Prefill with 'today'
+ </v-checkbox>
+ <p class="text-gray-400 mb-5">
+ if enabled we will pre-fill this field with the current date
+ </p>
</div>
<!-- select/multiselect Options -->
@@ -180,6 +198,11 @@
label="Pre-filled value"
:multiple="field.type==='multi_select'"
/>
+ <date-input v-else-if="field.type==='date' && field.prefill_today!==true" name="prefill" class="mt-4"
+ :form="field" :with-time="field.with_time===true" :am-pm="field.use_am_pm===true"
+ :date-range="field.date_range===true"
+ label="Pre-filled value"
+ />
<text-area-input v-else-if="field.type === 'text' && field.multi_lines"
name="prefill" class="mt-4"
:form="field"
@@ -188,6 +211,7 @@
<text-input v-else-if="field.type!=='files'" name="prefill" class="mt-4"
:form="field"
label="Pre-filled value"
+ :disabled="field.type==='date' && field.prefill_today===true"
/>
<div v-if="['select','multi_select'].includes(field.type)" class="-mt-3 mb-3 text-gray-400 dark:text-gray-500">
<small>
@@ -383,10 +407,12 @@ export default {
this.$set(this.field, 'date_range', val)
if (this.field.date_range) {
this.$set(this.field, 'with_time', false)
+ this.$set(this.field, 'prefill_today', false)
}
},
onFieldWithTimeChange (val) {
this.$set(this.field, 'with_time', val)
+ this.$set(this.field, 'use_am_pm', false)
if (this.field.with_time) {
this.$set(this.field, 'date_range', false)
}
@@ -420,6 +446,15 @@ export default {
})
this.$set(this.field, this.field.type, {'options': tmpOpts})
},
+ onFieldPrefillTodayChange (val) {
+ this.$set(this.field, 'prefill_today', val)
+ if (this.field.prefill_today) {
+ this.$set(this.field, 'prefill', 'Pre-filled with current date')
+ this.$set(this.field, 'date_range', false)
+ } else {
+ this.$set(this.field, 'prefill', null)
+ }
+ },
onFieldAllowCreationChange (val) {
this.$set(this.field, 'allow_creation', val)
if(this.field.allow_creation){
diff --git a/resources/js/components/service/Amplitude.vue b/resources/js/components/service/Amplitude.vue
index b0bab6a6c..30c3b7c1a 100644
--- a/resources/js/components/service/Amplitude.vue
+++ b/resources/js/components/service/Amplitude.vue
@@ -44,7 +44,7 @@ export default {
}
},
loadAmplitude () {
- if (this.loaded || !typeof window.amplitude === 'undefined') return
+ if (this.loaded || !typeof window.amplitude === 'undefined' || !window.config.amplitude_code) return
(function (e, t) {
const n = e.amplitude || { _q: [], _iq: {} }; const r = t.createElement('script')
@@ -88,7 +88,7 @@ export default {
})(window, document)
this.amplitudeInstance = window.amplitude.getInstance()
- this.amplitudeInstance.init('9952c8b914ce3f2bd494fce2dba18243')
+ this.amplitudeInstance.init(window.config.amplitude_code)
this.loaded = true
this.authenticateUser()
}
diff --git a/resources/js/components/service/Crisp.vue b/resources/js/components/service/Crisp.vue
index 6fd5d176f..869b59016 100644
--- a/resources/js/components/service/Crisp.vue
+++ b/resources/js/components/service/Crisp.vue
@@ -18,10 +18,10 @@ export default {
methods: {
loadCrisp () {
- if (this.isIframe) return
+ if (this.isIframe || !window.config.crisp_website_id) return
window.$crisp = []
- window.CRISP_WEBSITE_ID = '94219d77-06ff-4aec-b07a-5bf26ec8fde1'
+ window.CRISP_WEBSITE_ID = window.config.crisp_website_id
const script = document.createElement('script')
script.setAttribute('src', 'https://client.crisp.chat/l.js')
diff --git a/resources/js/pages/forms/create.vue b/resources/js/pages/forms/create.vue
index 49b26efa1..43b66dc60 100644
--- a/resources/js/pages/forms/create.vue
+++ b/resources/js/pages/forms/create.vue
@@ -152,6 +152,7 @@ export default {
properties: [],
notifies: false,
+ slack_notifies: false,
send_submission_confirmation: false,
webhook_url: null,
diff --git a/resources/views/spa.blade.php b/resources/views/spa.blade.php
index 8aa1281d7..d3c0cec6a 100644
--- a/resources/views/spa.blade.php
+++ b/resources/views/spa.blade.php
@@ -10,6 +10,9 @@
'links' => config('links'),
'production' => App::isProduction(),
'hCaptchaSiteKey' => config('services.h_captcha.site_key'),
+ 'google_analytics_code' => config('services.google_analytics_code'),
+ 'amplitude_code' => config('services.amplitude_code'),
+ 'crisp_website_id' => config('services.crisp_website_id'),
];
@endphp
<!DOCTYPE html>
@@ -37,8 +40,9 @@
{{-- Load the application scripts --}}
<script src="{{ mix('dist/js/app.js') }}"></script>
+@if($config['google_analytics_code'])
<!-- Global site tag (gtag.js) - Google Analytics -->
-<script defer src="https://www.googletagmanager.com/gtag/js?id=G-PR916W6KJZ"></script>
+<script defer src="https://www.googletagmanager.com/gtag/js?id={{ $config['google_analytics_code'] }}"></script>
<script defer>
window.dataLayer = window.dataLayer || []
@@ -46,7 +50,9 @@
gtag('js', new Date())
- gtag('config', 'G-PR916W6KJZ')
+ gtag('config', "{{ $config['google_analytics_code'] }}")
</script>
+@endif
+
</body>
</html>