浏览代码

Modifiche

Roberto Santini 3 年前
父节点
当前提交
3a59b5b195

+ 4
- 3
app/Http/Controllers/IssueController.php 查看文件

42
 
42
 
43
     if($response_issue->ok()){
43
     if($response_issue->ok()){
44
       $issue = $response_issue->object()->issue;
44
       $issue = $response_issue->object()->issue;
45
-      $helpdesk = $response_helpesk->object()->helpdesk_ticket;
46
 
45
 
47
       try{
46
       try{
47
+        $helpdesk = $response_helpesk->object()->helpdesk_ticket;
48
         $author = $helpdesk->contact->name." (".$helpdesk->from_address.")";
48
         $author = $helpdesk->contact->name." (".$helpdesk->from_address.")";
49
       }catch(\Exception $e){
49
       }catch(\Exception $e){
50
         $author = $issue->author->name;
50
         $author = $issue->author->name;
116
 
116
 
117
     $collectionAltreSegnalazioni = new Collection();
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
     // foreach($collectionAltreSegnalazioni as $t){
123
     // foreach($collectionAltreSegnalazioni as $t){
172
       $sign_tecnico = $user->firma;
172
       $sign_tecnico = $user->firma;
173
     }
173
     }
174
 
174
 
175
+    $sign_path_cliente = 'sign_cliente_'.time().'.png';
175
     if($request->has('signature_image_cliente')){
176
     if($request->has('signature_image_cliente')){
176
       $encoded_image = explode(",", $request->signature_image_cliente)[1];
177
       $encoded_image = explode(",", $request->signature_image_cliente)[1];
177
       $sign_cliente = base64_decode($encoded_image);
178
       $sign_cliente = base64_decode($encoded_image);

+ 13
- 4
app/Http/Controllers/UserController.php 查看文件

25
       return redirect()->route('user.profilo');
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
     Session::flash('flash_message', 'Profilo aggiornato');
42
     Session::flash('flash_message', 'Profilo aggiornato');
34
     return redirect()->route('user.profilo');
43
     return redirect()->route('user.profilo');

+ 1
- 1
resources/views/components/application-logo.blade.php 查看文件

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

+ 9
- 1
resources/views/issue/firma.blade.php 查看文件

200
               <canvas id="signature-pad_tecnico" class="signature-pad"></canvas>
200
               <canvas id="signature-pad_tecnico" class="signature-pad"></canvas>
201
               {!! Form::hidden('signature_image_tecnico', null, ['id' => 'signature_image_tecnico']) !!}
201
               {!! Form::hidden('signature_image_tecnico', null, ['id' => 'signature_image_tecnico']) !!}
202
               @else
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
               @endif
212
               @endif
205
             </div>
213
             </div>
206
 
214
 

+ 6
- 1
resources/views/issue/pdf.blade.php 查看文件

76
       <div style="height: 130px; width: 100%; position: fixed; left: 0; bottom: 0px;">
76
       <div style="height: 130px; width: 100%; position: fixed; left: 0; bottom: 0px;">
77
         <div class="box_sx">
77
         <div class="box_sx">
78
           <h2>Firma tecnico</h2>
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
           <img src="data:image/png;base64,{!! stream_get_contents($firmaTecnico) !!}" style="width: 80%"/>
82
           <img src="data:image/png;base64,{!! stream_get_contents($firmaTecnico) !!}" style="width: 80%"/>
83
+          @endif
84
+
80
         </div>
85
         </div>
81
         <div class="box_dx">
86
         <div class="box_dx">
82
           <h2>Firma cliente</h2>
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
         </div>
89
         </div>
85
       </div>
90
       </div>
86
 
91
 

+ 1
- 1
resources/views/testata_pdf.blade.php 查看文件

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

+ 6
- 0
resources/views/user/profilo.blade.php 查看文件

47
               @else
47
               @else
48
               {!! Form::label('', 'Firma salvata', ['style' => 'display: inline']) !!}
48
               {!! Form::label('', 'Firma salvata', ['style' => 'display: inline']) !!}
49
               <button type="submit" class="btn btn-sm btn-danger" name='elimina_firma'><i class="fas fa-trash"></i>Elimina</button>
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
               <img src="data:image/png;base64,{!! stream_get_contents($user->firma) !!}" />
54
               <img src="data:image/png;base64,{!! stream_get_contents($user->firma) !!}" />
51
               @endif
55
               @endif
56
+
57
+              @endif
52
             </div>
58
             </div>
53
           </div>
59
           </div>
54
 
60
 

正在加载...
取消
保存