diff --git a/resources/views/form/list.blade.php b/resources/views/form/list.blade.php index 05103308..ad53f26a 100644 --- a/resources/views/form/list.blade.php +++ b/resources/views/form/list.blade.php @@ -70,12 +70,9 @@ @if(isset($formdata) && isset($formdata->workflow) && $formdata->workflow == 'yes' ) Workflow Status @endif - @if(isset($form) && isset($form->show_position) && $form->show_position == 'yes' ) - Territory - Area - Region - Zone - @endif + @foreach(($positionColumns ?? []) as $positionField) + {{ ucfirst($positionField) }} + @endforeach @if(isset($form) && isset($form->show_manager_details) && $form->show_manager_details == 'yes' ) L1 Manager L1 Employee Code @@ -232,12 +229,9 @@ @if(isset($formdata) && isset($formdata->workflow) && $formdata->workflow == 'yes' ) { "data": "workflow_status" }, @endif - @if(isset($form) && isset($form->show_position) && $form->show_position == 'yes') - { "data": "territory" }, - { "data": "area" }, - { "data": "region" }, - { "data": "zone" }, - @endif + @foreach(($positionColumns ?? []) as $positionField) + { "data": "{{ $positionField }}" }, + @endforeach @if(isset($form) && isset($form->show_manager_details) && $form->show_manager_details == 'yes') { "data": "manager1_name" }, { "data": "manager1_code" }, @@ -460,10 +454,10 @@ partition: '{{ $formdata->partition ?? '' }}', limit: 50 }; + params['user_id'] = '{{ $formdata->user_id ?? '' }}'; @if(isset($formdata->all_data_access) && $formdata->all_data_access == 1) params['alldata'] = 1; @else - params['user_id'] = '{{ $formdata->user_id ?? '' }}'; params['team_report'] = 1; @endif diff --git a/resources/views/form/personalization-1694503336-f9a0ca13-2b04-4b76-8a1e-4c8f01e8a15f.blade.php b/resources/views/form/personalization-1694503336-f9a0ca13-2b04-4b76-8a1e-4c8f01e8a15f.blade.php index dcd2c8e2..6b0720ff 100644 --- a/resources/views/form/personalization-1694503336-f9a0ca13-2b04-4b76-8a1e-4c8f01e8a15f.blade.php +++ b/resources/views/form/personalization-1694503336-f9a0ca13-2b04-4b76-8a1e-4c8f01e8a15f.blade.php @@ -1,296 +1,308 @@ - - - - @include('layouts.shared/title-meta', ['title' => "Form"]) - @include('layouts.shared/head-css', ["mode" => $mode ?? '', "demo" => $demo ?? '']) - - - - -
- processing... -
- -
-
-
-
-
-
- - @if(Session::has('error'))
{{Session::get('error')}}
-
@endif - @if(session('success'))
{{ session('success') }} -
-
@endif -
-

{{$form->title}}

-
-
-
Select any one of the templates
- @foreach($personalizations as $pers) -
-
- {{$pers->title}} -
- @endforeach -
- -
-
- - - @csrf -
-
- -
-
- -
-
- @foreach($questions as $question) -
- - @switch($question->type) - @case('hidden') - - @break - @case('text') - @case('email') - @case('tel') - @case('date') - code) ? ($question->code == 'message_body' ? '220' : '') : '' }}> - @break - @case('number') - - @break - @case('textarea') - - @break - @case('dropdown') - - @break - @case('checkbox') - @foreach($question->options as $option) -
- value) && $question->value != '' && in_array($option->value, $question->value) ? 'checked':''}}> - -
- @endforeach - @break - @case('file') - -

500MB Max File size

- @break - @case('multitextbox') -
- @foreach($question->options as $option) -
{{$option->display}}
-
- -
- @endforeach -
- @break - @endswitch -
- @endforeach - @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) ) -
- -
- @endif -
-
-
-
-
- - @csrf -
-
- -
-
- -
-
-
-
- -
-
- - - - -
-
- -
- -
- - -@include('layouts.shared/footer-script') - - - - - - + + + + @include('layouts.shared/title-meta', ['title' => "Form"]) + @include('layouts.shared/head-css', ["mode" => $mode ?? '', "demo" => $demo ?? '']) + + + + +
+ processing... +
+ +
+
+
+
+
+
+ + @if(Session::has('error'))
{{Session::get('error')}}
+
@endif + @if(session('success'))
{{ session('success') }} +
+
@endif +
+

{{$form->title}}

+
+
+
Select any one of the templates
+ @foreach($personalizations as $pers) +
+
+ {{$pers->title}} +
+ @endforeach +
+ +
+
+ + + @csrf +
+
+ +
+
+ +
+
+ @foreach($questions as $question) +
+ + @switch($question->type) + @case('hidden') + + @break + @case('text') + @case('email') + @case('tel') + @case('date') + code) ? ($question->code == 'message_body' ? '220' : '') : '' }}> + @break + @case('number') + + @break + @case('textarea') + + @break + @case('dropdown') + + @break + @case('checkbox') + @foreach($question->options as $option) +
+ value) && $question->value != '' && in_array($option->value, $question->value) ? 'checked':''}}> + +
+ @endforeach + @break + @case('file') + +

500MB Max File size

+ @break + @case('multitextbox') +
+ @foreach($question->options as $option) +
{{$option->display}}
+
+ +
+ @endforeach +
+ @break + @endswitch +
+ @endforeach + @if(!isset($form->is_approval) || (isset($form->is_approval) && $form->is_approval != 'yes' ) ) +
+ +
+ @endif +
+
+
+
+
+ + @csrf +
+
+ +
+
+ +
+
+
+
+ +
+
+ + + + +
+
+ +
+ +
+ + +@include('layouts.shared/footer-script') + + + + + + \ No newline at end of file diff --git a/resources/views/form/personalization.blade.php b/resources/views/form/personalization.blade.php index f0edcf86..36cecd81 100644 --- a/resources/views/form/personalization.blade.php +++ b/resources/views/form/personalization.blade.php @@ -227,10 +227,24 @@ processData: false, contentType: false, success: function( data ) { - $('#cropper-wrapper').show() - $('#form-wrapper').hide() - $("#pageloader").fadeOut(); console.log(data) + // Skip cropper when this template has no image overlay or no image was uploaded + var hasImageOverlay = false + if (data.form_info && data.form_info.positions) { + try { + hasImageOverlay = data.form_info.positions.some(function (p) { + var positions = typeof p === 'string' ? JSON.parse(p) : p + return Array.isArray(positions) && positions.some(function (pi) { return pi && pi.type === 'image' }) + }) + } catch (e) {} + } + if (data.skip_cropper || data.redirect || !hasImageOverlay || !(data.images_fields && data.images_fields.length > 0)) { + document.location.href = data.redirect || '/form/generatepersonalization' + return + } + $('#form-wrapper').hide() + $('#cropper-wrapper').show() + $("#pageloader").fadeOut(); if(data.hasOwnProperty('images_fields') && data.images_fields.length > 0 ) { for(let im of data.images_fields) { let pos = data.form_info.positions.map(p => JSON.parse(p)) @@ -266,8 +280,6 @@ } //} } - } else { - document.location.href = '/form/generatepersonalization' } },