Roberto Santini 3 anos atrás
pai
commit
3a59b5b195

+ 4
- 3
app/Http/Controllers/IssueController.php Ver arquivo

@@ -42,9 +42,9 @@ class IssueController extends Controller
42 42
 
43 43
     if($response_issue->ok()){
44 44
       $issue = $response_issue->object()->issue;
45
-      $helpdesk = $response_helpesk->object()->helpdesk_ticket;
46 45
 
47 46
       try{
47
+        $helpdesk = $response_helpesk->object()->helpdesk_ticket;
48 48
         $author = $helpdesk->contact->name." (".$helpdesk->from_address.")";
49 49
       }catch(\Exception $e){
50 50
         $author = $issue->author->name;
@@ -116,8 +116,8 @@ class IssueController extends Controller
116 116
 
117 117
     $collectionAltreSegnalazioni = new Collection();
118 118
 
119
-    foreach($altreSegnalazioni->object()->issues as $issue){
120
-      $collectionAltreSegnalazioni->push($issue);
119
+    foreach($altreSegnalazioni->object()->issues as $issueCorrelato){
120
+      $collectionAltreSegnalazioni->push($issueCorrelato);
121 121
     }
122 122
 
123 123
     // foreach($collectionAltreSegnalazioni as $t){
@@ -172,6 +172,7 @@ class IssueController extends Controller
172 172
       $sign_tecnico = $user->firma;
173 173
     }
174 174
 
175
+    $sign_path_cliente = 'sign_cliente_'.time().'.png';
175 176
     if($request->has('signature_image_cliente')){
176 177
       $encoded_image = explode(",", $request->signature_image_cliente)[1];
177 178
       $sign_cliente = base64_decode($encoded_image);

+ 13
- 4
app/Http/Controllers/UserController.php Ver arquivo

@@ -25,10 +25,19 @@ class UserController extends Controller{
25 25
       return redirect()->route('user.profilo');
26 26
     }
27 27
 
28
-    $sign_path_tecnico = 'sign_tecnico_'.time().'.png';
29
-    $encoded_image = explode(",", $request->signature_image_tecnico)[1];
30
-    $user->firma = pg_escape_bytea($encoded_image);
31
-    $user->save();
28
+    try{
29
+      $sign_path_tecnico = 'sign_tecnico_'.time().'.png';
30
+      $encoded_image = explode(",", $request->signature_image_tecnico)[1];
31
+      if(config('database.default') == 'mysql'){
32
+        $user->firma = base64_encode($encoded_image);
33
+      }else{
34
+        $user->firma = pg_escape_bytea($encoded_image);
35
+      }
36
+      $user->save();
37
+    }catch(\Exception $e){
38
+      
39
+    }
40
+
32 41
 
33 42
     Session::flash('flash_message', 'Profilo aggiornato');
34 43
     return redirect()->route('user.profilo');

+ 1
- 1
resources/views/components/application-logo.blade.php Ver arquivo

@@ -1,5 +1,5 @@
1 1
 @if(session('azienda') != null && session('azienda')->path_logo != null)
2 2
 <img src="{{ Storage::disk('azienda')->url(session('azienda')->path_logo) }}" {{ $attributes }}/>
3 3
 @else
4
-<img src="{{ asset('logo_rm.png') }}" {{ $attributes }}/>
4
+<img src="{{ asset('assets/logo_rm.png') }}" {{ $attributes }}/>
5 5
 @endif

+ 9
- 1
resources/views/issue/firma.blade.php Ver arquivo

@@ -200,7 +200,15 @@ use Carbon\Carbon;
200 200
               <canvas id="signature-pad_tecnico" class="signature-pad"></canvas>
201 201
               {!! Form::hidden('signature_image_tecnico', null, ['id' => 'signature_image_tecnico']) !!}
202 202
               @else
203
-              <img src="data:image/png;base64,{{ chunk_split(base64_encode($user->firma)) }}" />
203
+
204
+
205
+              @if(config('database.default') == 'mysql')
206
+              <img src="data:image/png;base64,{!! base64_decode($user->firma) !!}" />
207
+              @else
208
+              <img src="data:image/png;base64,{!! stream_get_contents($user->firma) !!}" />
209
+              @endif
210
+
211
+              
204 212
               @endif
205 213
             </div>
206 214
 

+ 6
- 1
resources/views/issue/pdf.blade.php Ver arquivo

@@ -76,11 +76,16 @@
76 76
       <div style="height: 130px; width: 100%; position: fixed; left: 0; bottom: 0px;">
77 77
         <div class="box_sx">
78 78
           <h2>Firma tecnico</h2>
79
+          @if(config('database.default') == 'mysql')
80
+          <img src="data:image/png;base64,{!! base64_decode($firmaTecnico) !!}" style="width: 80%"/>
81
+          @else
79 82
           <img src="data:image/png;base64,{!! stream_get_contents($firmaTecnico) !!}" style="width: 80%"/>
83
+          @endif
84
+
80 85
         </div>
81 86
         <div class="box_dx">
82 87
           <h2>Firma cliente</h2>
83
-          <img src="data:image/png;base64,{{ chunk_split(base64_encode($firmaCliente)) }}" style="width: 80%"/>
88
+          <img src="data:image/png;base64,{{ base64_encode($firmaCliente) }}" style="width: 80%"/>
84 89
         </div>
85 90
       </div>
86 91
 

+ 1
- 1
resources/views/testata_pdf.blade.php Ver arquivo

@@ -96,7 +96,7 @@
96 96
     @if(session('azienda') != null && session('azienda')->path_logo != null)
97 97
     <img src="{{ Storage::disk('azienda')->url(session('azienda')->path_logo) }}" style="height: 100%"/>
98 98
     @else
99
-    <img src="{{ assets('logo_rm.png') }}" style="height: 100%"/>
99
+    <img src="{{ asset('assets/logo_rm.png') }}" style="height: 100%"/>
100 100
     @endif
101 101
 
102 102
   </div>

+ 6
- 0
resources/views/user/profilo.blade.php Ver arquivo

@@ -47,8 +47,14 @@ use App\Models\Issue;
47 47
               @else
48 48
               {!! Form::label('', 'Firma salvata', ['style' => 'display: inline']) !!}
49 49
               <button type="submit" class="btn btn-sm btn-danger" name='elimina_firma'><i class="fas fa-trash"></i>Elimina</button>
50
+
51
+              @if(config('database.default') == 'mysql')
52
+              <img src="data:image/png;base64,{!! base64_decode($user->firma) !!}" />
53
+              @else
50 54
               <img src="data:image/png;base64,{!! stream_get_contents($user->firma) !!}" />
51 55
               @endif
56
+
57
+              @endif
52 58
             </div>
53 59
           </div>
54 60
 

Carregando…
Cancelar
Salvar