roberto.santini
/
rapportinoRedmineBGWorld
Volgen 1
Ster 0
Vork 0
Code Kwesties 0 Pull-aanvragen 0 Publicaties 0 Wiki Activiteit
Bladeren bron

firma remota

Roberto Santini 1 jaar geleden
bovenliggende
b696b1609c
commit
9699c0208c
4 gewijzigde bestanden met toevoegingen van 85 en 107 verwijderingen
Zij-aan-zij weergave Toon Diff Stats
  1. 1
    15
      app/Http/Controllers/IssueController.php
  2. 6
    2
      app/Models/Config.php
  3. 4
    12
      resources/views/footer_pdf.blade.php
  4. 74
    78
      resources/views/issue/pdf.blade.php

+ 1
- 15
app/Http/Controllers/IssueController.php Bestand weergeven 

@@ -279,21 +279,6 @@ class IssueController extends Controller
279 279 
     }
280 280
281 281 
     // Genero il PDF
282 
-    // return view('issue.pdf', [
283 
-    //   'issue' => $issue,
284 
-    //   'dataIntervento' => $dataIntervento,
285 
-    //   'note' => $request->note,
286 
-    //   'firmaTecnico' => $sign_tecnico,
287 
-    //   'firmaCliente' => $sign_cliente,
288 
-    //   'materiale_utilizzato' => $request->materiale_utilizzato,
289 
-    //   'merce_ritirata' => $request->merce_ritirata,
290 
-    //   'merce_consegnata' => $request->merce_consegnata,
291 
-    //   'tecnici' => $tecnici,
292 
-    //   'inizio' => $inizio,
293 
-    //   'fine' => $fine,
294 
-    //   'persona_riferimento' => $request->persona_riferimento,
295 
-    //   'cliente' => $cliente
296 
-    // ]);
297 282 
     $hours = floor($durata / 60);
298 283 
     $minutes = ($durata % 60);
299 284 
 
@@ -311,6 +296,7 @@ class IssueController extends Controller
311 296 
       'persona_riferimento' => $request->persona_riferimento,
312 297 
       'cliente' => $cliente,
313 298 
       'user' => $user,
299 
+      'azienda' => $azienda,
314 300 
       'sedeCliente' => $request->sedeCliente,
315 301 
       'durata' => $hours.'h '.$minutes.'min'
316 302 
     ]);

+ 6
- 2
app/Models/Config.php Bestand weergeven 

@@ -24,9 +24,13 @@ class Config extends \App\Models\AbstractModels\AbstractConfig
24 24 
     return $config;
25 25 
   }
26 26
27 
-  public static function getValue($key){
27 
+  public static function getValue($key, Azienda $azienda = null){
28 
+    if($azienda == null){
29 
+      $azienda = session('azienda');
30 
+    }
31 
+
28 32 
     try{
29 
-      return Config::where([['key', $key], ['azienda_id', session('azienda')->id]])->first()->value;
33 
+      return Config::where([['key', $key], ['azienda_id', $azienda->id]])->first()->value;
30 34 
     }catch(\Exception $e){
31 35 
       return 0;
32 36 
     }

+ 4
- 12
resources/views/footer_pdf.blade.php Bestand weergeven 

@@ -1,18 +1,10 @@
1 
-<!-- <div style="position: fixed; left: 0; bottom: 0; height: 0px; width: 100%; background-color: black; padding-top: 0px;">
2 
-  <script type="text/php">
3 
-  if ( isset($pdf) ) {
4 
-    $font = $fontMetrics->getFont("helvetica", "bold");
5 
-    $pdf->page_text(35, $pdf->get_height()-25, "{PAGE_NUM} / {PAGE_COUNT}", $font, 6, array(0,0,0));
6 
-  }
7 
-</script>
8 
-</div> -->
1 
+<div style="position: fixed; bottom: 0; height: 100px; width: 100%; padding-top: 0px; padding-right: 0px; text-align: left; border-top: 1px solid black;">
9 2
10 
-<div style="position: fixed; bottom: 0; height: 100px; width: 100%; padding-top: 0px; padding-right: 0px; text-align: left; border-top: 1px solid black; ">
11 3 
   <p style="font-size: 10px; text-align: justify;">
12 
-    @if(session('azienda') != null && session('azienda')->intestazione != null)
13 
-    {!! session('azienda')->intestazione !!}
4 
+    @if($azienda != null && $azienda->intestazione != null)
5 
+    {!! $azienda->intestazione !!}
14 6 
     @endif
15 7
16 
-    <br>{!! \App\Models\Config::getValue(\App\Models\Config::TESTO_PRIVACY) !!}
8 
+    <br>{!! \App\Models\Config::getValue(\App\Models\Config::TESTO_PRIVACY, $azienda) !!}
17 9 
   </p>
18 10 
 </div>

+ 74
- 78
resources/views/issue/pdf.blade.php Bestand weergeven 

@@ -1,12 +1,13 @@
1 1 
 <html>
2 2 
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
3 3 
 @include('testata_pdf')
4 
+@include('footer_pdf')
4 5 
 <body>
5 6 
   <div style="width: 100%;">
6 7 
     <div style="width: 100%; padding-top: 0px; height: 100px; margin-bottom: 15px;" >
7 8 
       <div style="width: 40%; float: left;">
8 
-        @if(session('azienda') != null && session('azienda')->path_logo != null)
9 
-        <img src="{{ Storage::disk('azienda')->url(session('azienda')->path_logo) }}" style="height: 100%"/>
9 
+        @if($azienda != null && $azienda->path_logo != null)
10 
+        <img src="{{ Storage::disk('azienda')->url($azienda->path_logo) }}" style="height: 100%"/>
10 11 
         @else
11 12 
         <img src="{{ public_path('assets/logo_rm.png') }}" style="height: 100%"/>
12 13 
         @endif
 
@@ -18,108 +19,103 @@
18 19 
       </div>
19 20 
     </div>
20 21
21 
-    <div style="width: 100%; margin-bottom: 30px">
22 
-      <!-- <div style="width: 100%">
23 
-    </div> -->
24 
-
25 
-    <div style="height: 130px; width: 100%">
26 
-      <div class="box_sx">
27 
-        <h3 style="font-weight: bold;">Segnalazione n. {{ $issue->id }} </h3>
28 
-        <h3 style="font-weight: bold;">Data intervento: {{ $dataIntervento->format('d/m/Y') }}</h3>
22 
+    <div style="width: 100%; margin-bottom: 30px;">
23 
+
24 
+      <div style="height: 130px; width: 100%">
25 
+        <div class="box_sx">
26 
+          <h3 style="font-weight: bold;">Segnalazione n. {{ $issue->id }} </h3>
27 
+          <h3 style="font-weight: bold;">Data intervento: {{ $dataIntervento->format('d/m/Y') }}</h3>
28 
+        </div>
29 
+        <div class="box_dx">
30 
+          <h3 style="font-weight: bold;">Cliente</h3>
31 
+          {{ $cliente }}
32 
+          @if($persona_riferimento != null && $persona_riferimento != '')
33 
+          <br>Referente cliente: {{ $persona_riferimento }}
34 
+          @endif
35 
+
36 
+          @if($sedeCliente != null && $sedeCliente != '')
37 
+          <br>Sede intervento: {{ $sedeCliente }}
38 
+          @endif
39 
+        </div>
29 40 
       </div>
30 
-      <div class="box_dx">
31 
-        <h3 style="font-weight: bold;">Cliente</h3>
32 
-        {{ $cliente }}
33 
-        @if($persona_riferimento != null && $persona_riferimento != '')
34 
-        <br>Referente cliente: {{ $persona_riferimento }}
35 
-        @endif
36 41
37 
-        @if($sedeCliente != null && $sedeCliente != '')
38 
-        <br>Sede intervento: {{ $sedeCliente }}
39 
-        @endif
42 
+      <div style="width: 100%; margin-bottom: 20px;">
43 
+
40 44 
       </div>
41 
-    </div>
42 45
43 
-    <div style="width: 100%; margin-bottom: 20px;">
46 
+      <div style="width: 100%; margin-top: 20px;">
47 
+        <div class="divData">
48 
+          Tecnici
49 
+        </div>
50 
+        @foreach($tecnici as $tecnico)
51 
+        {{ $tecnico }}, dalle {{ $inizio->format('H:i') }} alle {{ $fine->format('H:i') }} - Ore lavorate: {{ $durata }}<br>
52 
+        @endforeach
44 53
45 
-    </div>
46 
-
47 
-    <div style="width: 100%; margin-top: 20px;">
48 
-      <div class="divData">
49 
-        Tecnici
50 54 
       </div>
51 
-      @foreach($tecnici as $tecnico)
52 
-      {{ $tecnico }}, dalle {{ $inizio->format('H:i') }} alle {{ $fine->format('H:i') }} - Ore lavorate: {{ $durata }}<br>
53 
-      @endforeach
54 
-
55 
-    </div>
56 55
57 56
58 
-    @if($note != '' && $note != null)
59 
-    <div style="width: 100%; margin-top: 20px;">
60 
-      <div class="divData">
61 
-        Descrizione
57 
+      @if($note != '' && $note != null)
58 
+      <div style="width: 100%; margin-top: 20px;">
59 
+        <div class="divData">
60 
+          Descrizione
61 
+        </div>
62 
+        {!! $note !!}
62 63 
       </div>
63 
-      {!! $note !!}
64 
-    </div>
65 
-    @endif
66 
-
67 
-    @if($materiale_utilizzato != '' && $materiale_utilizzato != null)
68 
-    <div style="width: 100%; margin-top: 20px;">
69 
-      <div class="divData">
70 
-        Materiale utilizzato
64 
+      @endif
65 
+
66 
+      @if($materiale_utilizzato != '' && $materiale_utilizzato != null)
67 
+      <div style="width: 100%; margin-top: 20px;">
68 
+        <div class="divData">
69 
+          Materiale utilizzato
70 
+        </div>
71 
+        {!! $materiale_utilizzato !!}
71 72 
       </div>
72 
-      {!! $materiale_utilizzato !!}
73 
-    </div>
74 
-    @endif
75 
-
76 
-    @if($merce_ritirata != '' && $merce_ritirata != null)
77 
-    <div style="width: 100%; margin-top: 20px;">
78 
-      <div class="divData">
79 
-        Merce ritirata
73 
+      @endif
74 
+
75 
+      @if($merce_ritirata != '' && $merce_ritirata != null)
76 
+      <div style="width: 100%; margin-top: 20px;">
77 
+        <div class="divData">
78 
+          Merce ritirata
79 
+        </div>
80 
+        {!! $merce_ritirata !!}
80 81 
       </div>
81 
-      {!! $merce_ritirata !!}
82 
-    </div>
83 
-    @endif
84 
-
85 
-    @if($merce_consegnata != '' && $merce_consegnata != null)
86 
-    <div style="width: 100%; margin-top: 20px;">
87 
-      <div class="divData">
88 
-        Merce consegnata
82 
+      @endif
83 
+
84 
+      @if($merce_consegnata != '' && $merce_consegnata != null)
85 
+      <div style="width: 100%; margin-top: 20px;">
86 
+        <div class="divData">
87 
+          Merce consegnata
88 
+        </div>
89 
+        {!! $merce_consegnata !!}
89 90 
       </div>
90 
-      {!! $merce_consegnata !!}
91 
-    </div>
92 
-    @endif
91 
+      @endif
93 92
94 93
95 94
96 
-    <div style="height: 130px; width: 100%; position: fixed; left: 0; bottom: 130px;">
97 
-      <div class="box_sx">
98 
-        <h2>Firma tecnico</h2>
99 
-        @if($user->path_firma != null)
95 
+      <div style="height: 130px; width: 100%; position: fixed; left: 0; bottom: 110px;">
96 
+        <div class="box_sx">
97 
+          <h2 style="font-size: 16px">Firma tecnico</h2>
98 
+          @if($user->path_firma != null)
100 99
101 
-        <img src="{{ storage_path('app/tecnici/'.$user->path_firma) }}" width="100%"/>
100 
+          <img src="{{ storage_path('app/tecnici/'.$user->path_firma) }}" width="100%"/>
102 101
103 
-        @endif
102 
+          @endif
104 103
104 
+        </div>
105 
+        <div class="box_dx">
106 
+          <h2 style="font-size: 16px">Firma cliente per presa visione</h2>
107 
+          <img src="data:image/png;base64,{{ base64_encode($firmaCliente) }}" style="width: 80%"/>
108 
+        </div>
105 109 
       </div>
106 
-      <div class="box_dx">
107 
-        <h2>Firma cliente per presa visione</h2>
108 
-        <img src="data:image/png;base64,{{ base64_encode($firmaCliente) }}" style="width: 80%"/>
109 
-      </div>
110 
-    </div>
111 
-
112 
-
113 110
114 111
112 
+    </div>
115 113
116 
-  </div>
117 114
118 115
119 116
117 
+  </div>
120 118
121 
-</div>
122 119
123 
-@include('footer_pdf')
124 120 
 </body>
125 121 
 </html>

Schrijf Voorbeeld
Laden…
Annuleren
Opslaan