firma remota ciack 2

app/Http/Controllers/IssueController.php

@@ -566,7 +566,9 @@ class IssueController extends Controller
 
   public function firma_remota(Request $request, $token){
     $issue = Issue::where('token', $token)->first();
-    if($issue == null) return;
+    if($issue == null){
+      return view('issue.error_remoto');
+    }
 
     return view('issue.firma_remota')->with(['issue' => json_decode($issue->campi), 'user' => $issue->user, 'token' => $issue->token]);
   }
@@ -586,4 +588,54 @@ class IssueController extends Controller
       return redirect()->route('home');
     }
   }
+
+  // public function pdf($id){
+  //   $redmineUser = session('redmine_user');
+  //   $user = User::where('redmine_id', $redmineUser->id)->first();
+  //   // dd($user->getFirma());
+  //
+  //   $response_issue = Http::get(session('azienda')->redmine_url.'/issues/'.$id.'.json?include=attachments,relations,custom_fields', [
+  //     'key' => $redmineUser->api_key,
+  //     'include' => 'journals'
+  //   ]);
+  //   $issue = $response_issue->object()->issue;
+  //
+  //   // return view('issue.pdf', [
+  //   //   'issue' => $issue,
+  //   //   'dataIntervento' => Carbon::now(),
+  //   //   'note' => null,
+  //   //   'firmaCliente' => null,
+  //   //   'materiale_utilizzato' => '',
+  //   //   'merce_ritirata' => '',
+  //   //   'merce_consegnata' => '',
+  //   //   'tecnici' => ['Roberto'],
+  //   //   'inizio' => Carbon::now(),
+  //   //   'fine' => Carbon::now(),
+  //   //   'persona_riferimento' => '',
+  //   //   'cliente' => '',
+  //   //   'user' => $user,
+  //   //   'sedeCliente' => '',
+  //   //   'durata' => ''
+  //   // ]);
+  //
+  //   $pdf = PDF::loadView('issue.pdf', [
+  //     'issue' => $issue,
+  //     'dataIntervento' => Carbon::now(),
+  //     'note' => null,
+  //     'firmaCliente' => null,
+  //     'materiale_utilizzato' => '',
+  //     'merce_ritirata' => '',
+  //     'merce_consegnata' => '',
+  //     'tecnici' => ['Roberto'],
+  //     'inizio' => Carbon::now(),
+  //     'fine' => Carbon::now(),
+  //     'persona_riferimento' => '',
+  //     'cliente' => '',
+  //     'user' => $user,
+  //     'sedeCliente' => '',
+  //     'durata' => ''
+  //   ]);
+  //
+  //   return $pdf->stream();
+  // }
 }

app/Http/Controllers/UserController.php

@@ -5,7 +5,10 @@ namespace App\Http\Controllers;
 use Illuminate\Http\Request;
 use App\Models\Config;
 use App\Models\User;
+use App\Models\Issue;
 use Session;
+use Storage;
+use Auth;
 
 class UserController extends Controller{
 
@@ -19,7 +22,9 @@ class UserController extends Controller{
     $user = User::find($request->user_id);
 
     if($request->has('elimina_firma')){
+      Storage::disk('tecnici')->delete($user->path_firma);
       $user->firma = null;
+      $user->path_firma = null;
       $user->save();
       Session::flash('flash_message', 'Firma eliminata');
       return redirect()->route('user.profilo');
@@ -28,14 +33,11 @@ class UserController extends Controller{
     try{
       $sign_path_tecnico = 'sign_tecnico_'.time().'.png';
       $encoded_image = explode(",", $request->signature_image_tecnico)[1];
-      if(config('database.default') == 'mysql'){
-        $user->firma = base64_encode($encoded_image);
-      }else{
-        $user->firma = pg_escape_bytea($encoded_image);
-      }
+      $sign_path_padre = Storage::disk('tecnici')->put($sign_path_tecnico, base64_decode($encoded_image));
+      $user->path_firma = $sign_path_tecnico;
       $user->save();
     }catch(\Exception $e){
-      
+
     }
 
 
@@ -43,4 +45,21 @@ class UserController extends Controller{
     return redirect()->route('user.profilo');
   }
 
+  public function getFirma(Request $request){
+    if($request->has('token')){
+      $issue = Issue::where('token', $request->token)->first();
+      $user = $issue->user;
+    }else{
+      $redmineUser = session('redmine_user');
+      $user = User::where('redmine_id', $redmineUser->id)->first();
+    }
+
+    if(Storage::disk('tecnici')->exists($user->path_firma)){
+      $storagePath  = Storage::disk('tecnici')->path($user->path_firma);
+      return response()->file($storagePath);
+    }else{
+      return null;
+    }
+  }
+
 }

app/Models/AbstractModels/AbstractUser.php

@@ -34,6 +34,7 @@ abstract class AbstractUser extends Model
         'redmine_id' => 'integer',
         'azienda_id' => 'integer',
         'firma' => 'string',
+        'path_firma' => 'string',
         'created_at' => 'datetime',
         'updated_at' => 'datetime'
     ];
@@ -48,6 +49,7 @@ abstract class AbstractUser extends Model
         'redmine_id',
         'azienda_id',
         'firma',
+        'path_firma',
         'created_at',
         'updated_at'
     ];

app/Models/User.php

@@ -1,6 +1,8 @@
 <?php
 namespace App\Models;
 
+use Storage;
+
 class User extends \App\Models\AbstractModels\AbstractUser
 {
 }

app/Providers/AppServiceProvider.php

@@ -6,23 +6,24 @@ use Illuminate\Support\ServiceProvider;
 
 class AppServiceProvider extends ServiceProvider
 {
-    /**
-     * Register any application services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        //
-    }
+  /**
+  * Register any application services.
+  *
+  * @return void
+  */
+  public function register()
+  {
+    //
+  }
 
-    /**
-     * Bootstrap any application services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        \App\Models\Issue::observe(\App\Observers\IssueObserver::class);
-    }
+  /**
+  * Bootstrap any application services.
+  *
+  * @return void
+  */
+  public function boot()
+  {
+    // \URL::forceScheme('https');
+    \App\Models\Issue::observe(\App\Observers\IssueObserver::class);
+  }
 }

config/filesystems.php

@@ -59,6 +59,12 @@ return [
             'url' => env('APP_URL').'/allegati',
             'visibility' => 'public',
         ],
+        'tecnici' => [
+            'driver' => 'local',
+            'root' => storage_path('app/tecnici'),
+            'url' => env('APP_URL').'/tecnici',
+            'visibility' => 'public',
+        ],
 
     ],
 

database/migrations/2024_02_22_114416_skipper_migrations_2024022211441668.php

@@ -0,0 +1,36 @@
+<?php
+/* 
+ * Migrations generated by: Skipper (http://www.skipper18.com)
+ * Migration id: 0ad592d9-d55f-4836-ae7d-33fec1d7c9a2
+ * Migration datetime: 2024-02-22 11:44:16.684052
+ */ 
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class SkipperMigrations2024022211441668 extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('user', function (Blueprint $table) {
+            $table->string('path_firma')->nullable(true)->after('firma');
+        });
+    }
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('user', function (Blueprint $table) {
+            $table->dropColumn('path_firma');
+        });
+    }
+}

resources/views/issue/error_remoto.blade.php

@@ -0,0 +1,32 @@
+<?php
+use Carbon\Carbon;
+use App\Models\Config;
+?>
+
+<style>
+</style>
+
+<x-guest-layout>
+  <div class="row justify-content-center mb-4">
+    <div class="col-xl-6 col-lg-6 col-md px-md-3 px-2 mt-4">
+      <div class="card">
+        <div class="card-body" style="text-align: center">
+          Il rapportino è già stato firmato
+        </div>
+      </div>
+    </div>
+  </div>
+
+</x-app-layout>
+
+<script>
+$(document).ready(function(){
+  $.ajaxSetup({
+    headers: {
+      'X-CSRF-TOKEN': '{{csrf_token()}}'
+    }
+  });
+
+});
+
+</script>

resources/views/issue/firma.blade.php

@@ -227,13 +227,9 @@ use App\Models\Config;
             <div class="form-group col-md-6">
               {!! Form::label('firma_tecnico', 'Firma tecnico') !!}
 
-              @if($user->firma != null)
+              @if($user->path_firma != null)
 
-              @if(config('database.default') == 'mysql')
-              <img src="data:image/png;base64,{!! base64_decode($user->firma) !!}" />
-              @else
-              <img src="data:image/png;base64,{!! stream_get_contents($user->firma) !!}" />
-              @endif
+              <img src="{{ route('user.getFirma') }}" />
 
               @endif
             </div>

resources/views/issue/firma_remota.blade.php

@@ -228,13 +228,9 @@ use App\Models\Config;
             <div class="form-group col-md-6">
               {!! Form::label('firma_tecnico', 'Firma tecnico') !!}
 
-              @if($user->firma != null)
+              @if($user->path_firma != null)
 
-              @if(config('database.default') == 'mysql')
-              <img src="data:image/png;base64,{!! base64_decode($user->firma) !!}" />
-              @else
-              <img src="data:image/png;base64,{!! stream_get_contents($user->firma) !!}" />
-              @endif
+              <img src="{{ route('user.getFirma', ['token' => $token]) }}" />
 
               @endif
             </div>

resources/views/issue/pdf.blade.php

@@ -8,7 +8,7 @@
         @if(session('azienda') != null && session('azienda')->path_logo != null)
         <img src="{{ Storage::disk('azienda')->url(session('azienda')->path_logo) }}" style="height: 100%"/>
         @else
-        <img src="{{ asset('assets/logo_rm.png') }}" style="height: 100%"/>
+        <img src="{{ public_path('assets/logo_rm.png') }}" style="height: 100%"/>
         @endif
 
       </div>
@@ -20,110 +20,106 @@
 
     <div style="width: 100%; margin-bottom: 30px">
       <!-- <div style="width: 100%">
-      </div> -->
-
-      <div style="height: 130px; width: 100%">
-        <div class="box_sx">
-          <h3 style="font-weight: bold;">Segnalazione n. {{ $issue->id }} </h3>
-          <h3 style="font-weight: bold;">Data intervento: {{ $dataIntervento->format('d/m/Y') }}</h3>
-        </div>
-        <div class="box_dx">
-          <h3 style="font-weight: bold;">Cliente</h3>
-          {{ $cliente }}
-          @if($persona_riferimento != null && $persona_riferimento != '')
-          <br>Referente cliente: {{ $persona_riferimento }}
-          @endif
-
-          @if($sedeCliente != null && $sedeCliente != '')
-          <br>Sede intervento: {{ $sedeCliente }}
-          @endif
-        </div>
-      </div>
+    </div> -->
 
-      <div style="width: 100%; margin-bottom: 20px;">
+    <div style="height: 130px; width: 100%">
+      <div class="box_sx">
+        <h3 style="font-weight: bold;">Segnalazione n. {{ $issue->id }} </h3>
+        <h3 style="font-weight: bold;">Data intervento: {{ $dataIntervento->format('d/m/Y') }}</h3>
+      </div>
+      <div class="box_dx">
+        <h3 style="font-weight: bold;">Cliente</h3>
+        {{ $cliente }}
+        @if($persona_riferimento != null && $persona_riferimento != '')
+        <br>Referente cliente: {{ $persona_riferimento }}
+        @endif
 
+        @if($sedeCliente != null && $sedeCliente != '')
+        <br>Sede intervento: {{ $sedeCliente }}
+        @endif
       </div>
+    </div>
+
+    <div style="width: 100%; margin-bottom: 20px;">
 
-      <div style="width: 100%; margin-top: 20px;">
-        <div class="divData">
-          Tecnici
-        </div>
-        @foreach($tecnici as $tecnico)
-        {{ $tecnico }}, dalle {{ $inizio->format('H:i') }} alle {{ $fine->format('H:i') }} - Ore lavorate: {{ $durata }}<br>
-        @endforeach
+    </div>
 
+    <div style="width: 100%; margin-top: 20px;">
+      <div class="divData">
+        Tecnici
       </div>
+      @foreach($tecnici as $tecnico)
+      {{ $tecnico }}, dalle {{ $inizio->format('H:i') }} alle {{ $fine->format('H:i') }} - Ore lavorate: {{ $durata }}<br>
+      @endforeach
+
+    </div>
 
 
-      @if($note != '' && $note != null)
-      <div style="width: 100%; margin-top: 20px;">
-        <div class="divData">
-          Descrizione
-        </div>
-        {!! $note !!}
+    @if($note != '' && $note != null)
+    <div style="width: 100%; margin-top: 20px;">
+      <div class="divData">
+        Descrizione
       </div>
-      @endif
-
-      @if($materiale_utilizzato != '' && $materiale_utilizzato != null)
-      <div style="width: 100%; margin-top: 20px;">
-        <div class="divData">
-          Materiale utilizzato
-        </div>
-        {!! $materiale_utilizzato !!}
+      {!! $note !!}
+    </div>
+    @endif
+
+    @if($materiale_utilizzato != '' && $materiale_utilizzato != null)
+    <div style="width: 100%; margin-top: 20px;">
+      <div class="divData">
+        Materiale utilizzato
       </div>
-      @endif
-
-      @if($merce_ritirata != '' && $merce_ritirata != null)
-      <div style="width: 100%; margin-top: 20px;">
-        <div class="divData">
-          Merce ritirata
-        </div>
-        {!! $merce_ritirata !!}
+      {!! $materiale_utilizzato !!}
+    </div>
+    @endif
+
+    @if($merce_ritirata != '' && $merce_ritirata != null)
+    <div style="width: 100%; margin-top: 20px;">
+      <div class="divData">
+        Merce ritirata
       </div>
-      @endif
-
-      @if($merce_consegnata != '' && $merce_consegnata != null)
-      <div style="width: 100%; margin-top: 20px;">
-        <div class="divData">
-          Merce consegnata
-        </div>
-        {!! $merce_consegnata !!}
+      {!! $merce_ritirata !!}
+    </div>
+    @endif
+
+    @if($merce_consegnata != '' && $merce_consegnata != null)
+    <div style="width: 100%; margin-top: 20px;">
+      <div class="divData">
+        Merce consegnata
       </div>
-      @endif
+      {!! $merce_consegnata !!}
+    </div>
+    @endif
+
 
 
+    <div style="height: 130px; width: 100%; position: fixed; left: 0; bottom: 130px;">
+      <div class="box_sx">
+        <h2>Firma tecnico</h2>
+        @if($user->path_firma != null)
 
-      <div style="height: 130px; width: 100%; position: fixed; left: 0; bottom: 130px;">
-        <div class="box_sx">
-          <h2>Firma tecnico</h2>
-          @if($user->firma != null)
-          <!-- Firma nel db -->
-          @if(config('database.default') == 'mysql')
-          <img src="data:image/png;base64,{!! base64_decode($user->firma) !!}" style="width: 80%"/>
-          @else
-          <img src="data:image/png;base64,{!! stream_get_contents($user->firma) !!}" style="width: 80%"/>
-          @endif
+        <img src="{{ storage_path('app/tecnici/'.$user->path_firma) }}" width="100%"/>
 
-          @endif
+        @endif
 
-        </div>
-        <div class="box_dx">
-          <h2>Firma cliente per presa visione</h2>
-          <img src="data:image/png;base64,{{ base64_encode($firmaCliente) }}" style="width: 80%"/>
-        </div>
       </div>
+      <div class="box_dx">
+        <h2>Firma cliente per presa visione</h2>
+        <img src="data:image/png;base64,{{ base64_encode($firmaCliente) }}" style="width: 80%"/>
+      </div>
+    </div>
 
 
 
 
 
-    </div>
+  </div>
 
 
 
 
-  </div>
+</div>
 
-  @include('footer_pdf')
+@include('footer_pdf')
 </body>
 </html>

resources/views/user/profilo.blade.php

@@ -40,7 +40,7 @@ use App\Models\Issue;
 
           <div class="form-row">
             <div class="form-group col">
-              @if($user->firma == null)
+              @if($user->path_firma == null)
               {!! Form::label('', 'Nuova firma') !!}
               <canvas id="signature-pad_tecnico" class="signature-pad"></canvas>
               {!! Form::hidden('signature_image_tecnico', null, ['id' => 'signature_image_tecnico']) !!}
@@ -48,12 +48,8 @@ use App\Models\Issue;
               {!! Form::label('', 'Firma salvata', ['style' => 'display: inline']) !!}
               <button type="submit" class="btn btn-sm btn-danger" name='elimina_firma'><i class="fas fa-trash"></i>Elimina</button>
 
-              @if(config('database.default') == 'mysql')
-              <img src="data:image/png;base64,{!! base64_decode($user->firma) !!}" />
-              @else
-              <img src="data:image/png;base64,{!! stream_get_contents($user->firma) !!}" />
-              @endif
-
+              <img src="{{ route('user.getFirma') }}" />
+              
               @endif
             </div>
           </div>

routes/web.php

@@ -32,6 +32,7 @@ Route::get('issue/{token}/firma_remota', [IssueController::class, 'firma_remota'
 Route::post('issue/firma_rapporto', [IssueController::class, 'firma_rapporto'])->name('issue.firma_rapporto');
 Route::get('issue/success_remoto', [IssueController::class, 'success_remoto'])->name('issue.success_remoto');
 Route::get('issue/download_allegato', [IssueController::class, 'download_allegato'])->name('issue.download_allegato');
+Route::get('user/getFirma', [UserController::class, 'getFirma'])->name('user.getFirma');
 
 Route::middleware(['redmine_auth'])->group(function () {
   Route::get('home', [HomeController::class, 'home'])->name('home');
@@ -39,6 +40,7 @@ Route::middleware(['redmine_auth'])->group(function () {
   Route::get('issue/show', [IssueController::class, 'show'])->name('issue.show');
   Route::get('issue/{id}/firma', [IssueController::class, 'firma'])->name('issue.firma');
   Route::get('issue/success', [IssueController::class, 'success'])->name('issue.success');
+  // Route::get('issue/{id}/pdf', [IssueController::class, 'pdf'])->name('issue.pdf');
 
 
   Route::resource('azienda', AziendaController::class, ['only' => ['index', 'store']]);