Altri fix

app/Http/Livewire/Reminder.php

@@ -46,7 +46,7 @@ class Reminder extends Component
             $member_cards = $member_cards->orderBy('expire_date')->get();
             foreach($member_cards as $member_card)
             {
-                $data[] = array('type' => 'Tessera', 'name' => $member_card->member->first_name . " " . $member_card->member->last_name, 'date' => $member_card->expire_date);
+                $data[] = array('type' => 'Tessera', 'first_name' => $member_card->member->first_name, "last_name" => $member_card->member->last_name, 'date' => $member_card->expire_date);
             }
         }
         if ($this->filterC)
@@ -59,63 +59,10 @@ class Reminder extends Component
             $member_certificates = $member_certificates->orderBy('expire_date')->get();
             foreach($member_certificates as $member_certificate)
             {
-                $data[] = array('type' => 'Certificato', 'name' => $member_certificate->member->first_name . " " . $member_certificate->member->last_name, 'date' => $member_certificate->expire_date);
+                $data[] = array('type' => 'Certificato', 'first_name' => $member_certificate->member->first_name, "last_name" => $member_certificate->member->last_name, 'date' => $member_certificate->expire_date);
             }
         }
-        /*
-        if ($this->hasFilter)
-        {
-            if ($this->filterT)
-            {
-                $member_cards = \App\Models\MemberCard::with('member')->where('expire_date', '>', date("y-m-d"));
-                if ($this->filterFrom != '')
-                    $member_cards = $member_cards->where('expire_date', '>=', $this->filterFrom);
-                if ($this->filterTo != '')
-                    $member_cards = $member_cards->where('expire_date', '<=', $this->filterTo);
-                $member_cards = $member_cards->orderBy('expire_date')->get();
-                foreach($member_cards as $member_card)
-                {
-                    $this->records[] = array('type' => 'Tessera', 'name' => $member_card->member->first_name . " " . $member_card->member->last_name, 'date' => $member_card->expire_date);
-                }
-            }
 
-            if ($this->filterC)
-            {
-                $member_certificates = \App\Models\MemberCertificate::with('member')->where('expire_date', '>', date("y-m-d"));
-                if ($this->filterFrom != '')
-                    $member_certificates = $member_certificates->where('expire_date', '>=', $this->filterFrom);
-                if ($this->filterTo != '')
-                    $member_certificates = $member_certificates->where('expire_date', '<=', $this->filterTo);
-                $member_certificates = $member_certificates->orderBy('expire_date')->get();
-                foreach($member_certificates as $member_certificate)
-                {
-                    $this->records[] = array('type' => 'Certificato', 'name' => $member_certificate->member->first_name . " " . $member_certificate->member->last_name, 'date' => $member_certificate->expire_date);
-                }
-            }
-        }
-        else
-        {
-            $member_cards = \App\Models\MemberCard::with('member')->where('expire_date', '>', date("y-m-d"));
-            if ($this->filterFrom != '')
-                $member_cards = $member_cards->where('expire_date', '>=', $this->filterFrom);
-            if ($this->filterTo != '')
-                $member_cards = $member_cards->where('expire_date', '<=', $this->filterTo);
-            $member_cards = $member_cards->orderBy('expire_date')->get();
-            foreach($member_cards as $member_card)
-            {
-                $this->records[] = array('type' => 'Tessera', 'name' => $member_card->member->first_name . " " . $member_card->member->last_name, 'date' => $member_card->expire_date);
-            }
-            $member_certificates = \App\Models\MemberCertificate::with('member')->where('expire_date', '>', date("y-m-d"));
-            if ($this->filterFrom != '')
-                $member_certificates = $member_certificates->where('expire_date', '>=', $this->filterFrom);
-            if ($this->filterTo != '')
-                $member_certificates = $member_certificates->where('expire_date', '<=', $this->filterTo);
-            $member_certificates = $member_certificates->orderBy('expire_date')->get();
-            foreach($member_certificates as $member_certificate)
-            {
-                $this->records[] = array('type' => 'Certificato', 'name' => $member_certificate->member->first_name . " " . $member_certificate->member->last_name, 'date' => $member_certificate->expire_date);
-            }
-        }*/
         if ($data)
         {
             $key_values = array_column($data, 'date');

resources/views/livewire/course_list.blade.php

@@ -375,6 +375,7 @@
                         ]
                     }
                 },
+                order: [[0, 'asc'], [1, 'asc']],
                 pagingType: 'numbers',
                 "language": {
                     "url": "/assets/js/Italian.json"

resources/views/livewire/course_member.blade.php

@@ -295,6 +295,7 @@
                     }
                 },
                 pagingType: 'numbers',
+                order: [[1, 'asc'], [2, 'asc']],
                 "language": {
                     "url": "/assets/js/Italian.json"
                 }

resources/views/livewire/receipt.blade.php

@@ -73,7 +73,8 @@
                 <tr>
                     <th scope="col">Anno</th>
                     <th scope="col">Numero</th>
-                    <th scope="col">Destinatario</th>
+                    <th scope="col">Nome</th>
+                    <th scope="col">Cognome</th>
                     <th scope="col">Stato</th>
                     <th scope="col">Data</th>
                     <th scope="col">...</th>
@@ -84,7 +85,8 @@
                     <tr>
                         <td>{{$record->year}}</td>
                         <td>{{$record->number}}</td>
-                        <td>{{$record->type == 'IN' ? ($record->member->first_name . " " . $record->member->last_name) : 'Uscita'}}</td>
+                        <td>{{$record->type == 'IN' ? ($record->member->last_name) : 'Uscita'}}</td>
+                        <td>{{$record->type == 'IN' ? ($record->member->first_name) : ''}}</td>
                         <td>
                             <span class="tablesaw-cell-content">
                                 <span class="badge tessera-badge {{$record->status == 1 ? 'active' : 'suspended'}}">{{$record->status == 1 ? 'Attivo' : 'Annullata'}}</span>

resources/views/livewire/records_in.blade.php

@@ -139,8 +139,8 @@
                                 <!--<th scope="col"></th>-->
                                 <th scope="col">Data pagamento</th>
                                 <th scope="col">Importo</th>
-                                <th scope="col">Nome</th>
                                 <th scope="col">Cognome</th>
+                                <th scope="col">Nome</th>
                                 <th scope="col">Commerciale</th>
                                 <th scope="col">Causale</th>
                                 <th scope="col">Pagamento</th>
@@ -151,9 +151,14 @@
 
                         <tbody id="checkall-target">
                         </tbody>
+                        <tfoot>
+                            <tr id="tfooter">
+                                <td colspan="9"><span class="total"></span></td>
+                            </tr>
+                        </tfoot>
                     </table>
 
-                    <br><b class="totalDiv"></b>
+                    <!--<br><b class="totalDiv"></b>-->
 
                 </section>
 
@@ -240,17 +245,19 @@
                                     </div>
                                 </div>
 
-                                <br>
-                                <div class="col-md-12">
-                                    <div class="input-group mb-12">
-                                        <div class="check--invoice d-flex align-items-center">
-                                            <div class="form-check me-3">
-                                                <input class="form-check-input" id="financial_movement" type="checkbox" wire:model="financial_movement" {{$this->dataId > 0 && !$isDuplicate ? 'disabled' : ''}}>
-                                                <label class="form-check-label" for="flexCheckChecked">&nbsp;&nbsp;&nbsp;Movimento finanziario</label>
+                                @if(false)
+                                    <br>
+                                    <div class="col-md-12">
+                                        <div class="input-group mb-12">
+                                            <div class="check--invoice d-flex align-items-center">
+                                                <div class="form-check me-3">
+                                                    <input class="form-check-input" id="financial_movement" type="checkbox" wire:model="financial_movement" {{$this->dataId > 0 && !$isDuplicate ? 'disabled' : ''}}>
+                                                    <label class="form-check-label" for="flexCheckChecked">&nbsp;&nbsp;&nbsp;Movimento finanziario</label>
+                                                </div>
                                             </div>
                                         </div>
                                     </div>
-                                </div>
+                                @endif
 
                                 @if($commercial)
 
@@ -938,7 +945,7 @@
         $(document).ready(function() {
 
             // Carico i dati dal local storage
-            var filterCommercial = localStorage.getItem("filterCommercial");
+            /*var filterCommercial = localStorage.getItem("filterCommercial");
             if (filterCommercial)
             {
                 //$('input[name="filterCommercial"]').val(filterCommercial);
@@ -973,6 +980,7 @@
             {
                 $('.filterTo').val(filterTo);
             }
+            */
 
             loadDataTable();
         } );
@@ -1051,6 +1059,8 @@
             localStorage.setItem("filterFrom", filterFrom);
             localStorage.setItem("filterTo", filterTo);
 
+            var totalString = "";
+
             $('#tablesaw-350').DataTable({
                 //searching: false,
                 //serverSide: true,
@@ -1073,8 +1083,8 @@
                         }
                     },
                     { data: 'total' },
-                    { data: 'first_name' },
                     { data: 'last_name' },
+                    { data: 'first_name' },
                     { data: 'commercial' },
                     { data: 'causals' },
                     { data: 'payment' },
@@ -1086,6 +1096,8 @@
                                 return "";
                             const j = data.split("|");
                             $(".totalDiv").html('Totale&nbsp;:&nbsp;<b>' + j[1] + '</b>');
+                            $(".total").html('Totale&nbsp;:&nbsp;<b>' + j[1] + '</b>');
+                            totalString = j[1];
                             var ret = '';
                             if (j[2] != 'x')
                             {
@@ -1097,6 +1109,14 @@
                         }
                     },
                 ],
+                rowCallback: function( row, data, index ) {
+
+                    if (data["last_name"] == '') {
+                        console.log("QUA" + data["date"]);
+                        $(row).hide();
+                        $(row).remove();
+                    }
+                },
                 fixedHeader: false,
                 order: [[0, 'desc']],
                 thead: {
@@ -1118,6 +1138,7 @@
                                 exportOptions: {
                                     columns: ":not(':last')"
                                 }
+
                             },
                             {
                                 extend: 'print',
@@ -1125,7 +1146,12 @@
                                 title: 'Entrate',
                                 exportOptions: {
                                     columns: ":not(':last')"
-                                }
+                                }/*,
+                                customize: function ( win ) {
+                                    $(win.document.body)
+                                        .css( 'font-size', '20pt' )
+                                        .append("Totale : " + totalString);
+                                }*/
                             }
                         ]
                     }

resources/views/livewire/records_out.blade.php

@@ -167,9 +167,14 @@
 
                         <tbody id="checkall-target">
                         </tbody>
+                        <tfoot>
+                            <tr id="tfooter">
+                                <td colspan="6"><span class="total"></span></td>
+                            </tr>
+                        </tfoot>
                     </table>
 
-                    <br><b class="totalDiv"></b>
+
                     <!--
                     <div class="paginator d-flex justify-content-center">
                         <nav aria-label="Page navigation example">
@@ -664,6 +669,7 @@
 
         $(document).ready(function() {
 
+            /*
             var filterSupplier = localStorage.getItem("filterSupplier");
             if (filterSupplier)
             {
@@ -692,7 +698,7 @@
             {
                 $('.filterTo').val(filterTo);
             }
-
+            */
             loadDataTable();
         } );
 
@@ -786,6 +792,7 @@
                                 return "";
                             const j = data.split("|");
                             $(".totalDiv").html('Totale&nbsp;:&nbsp;<b>' + j[1] + '</b>');
+                            $(".total").html('Totale&nbsp;:&nbsp;<b>' + j[1] + '</b>');
                             var ret = '<button type="button" class="btn btn-outline-primary btn-sm" onclick="editData(' + j[0] + ')">Modifica</button>&nbsp;';
                             ret += '<button type="button" class="btn btn-outline-danger btn-sm" onclick="deleteData(' + j[0] + ')">Elimina</button>';
                             return ret;

resources/views/livewire/reminders.blade.php

@@ -72,7 +72,8 @@
                 <tr>
                     <th scope="col" >Tipologia</th>
                     <th scope="col" >Data</th>
-                    <th scope="col" >Persona</th>
+                    <th scope="col" >Cognome</th>
+                    <th scope="col" >Nome</th>
                 </tr>
             </thead>
             <tbody id="checkall-target">
@@ -80,7 +81,8 @@
                     <tr>
                         <td>{{$record["type"]}}</td>
                         <td>{{date("d/m/Y", strtotime($record["date"]))}}</td>
-                        <td>{{$record["name"]}}</td>
+                        <td>{{$record["last_name"]}}</td>
+                        <td>{{$record["first_name"]}}</td>
                     </tr>
                 @endforeach
             </tbody>

routes/web.php

@@ -140,8 +140,8 @@ Route::get('/get_members', function(){
     {
         $v = $_GET["search"]["value"];
         $x = $x->where(function ($query) use ($v) {
-            $query->where('first_name', 'like', '%' . $v . '%')
-                  ->orWhere('last_name', 'like', '%' . $v . '%');
+            $query->whereRaw("CONCAT(first_name, ' ', last_name) like '%" . $v . "%'")
+                  ->orWhereRaw("CONCAT(last_name, ' ', first_name) like '%" . $v . "%'");
         });
         //where('first_name', 'like', '%' . $_GET["search"]["value"] . '%');
     }
@@ -231,6 +231,8 @@ Route::get('/get_members', function(){
 
     $count = $x->count();
 
+    $x = $x->orderBy('last_name', 'ASC')->orderBy('first_name', 'ASC');
+
     if (isset($_GET["start"]))
         $x = $x->offset($_GET["start"])->limit($_GET["length"])->get();
     else
@@ -275,8 +277,8 @@ Route::get('/get_members', function(){
         $datas[] = array(
             //'c' => $idx + 1,
             'id' => "ID" . str_pad($r->id, 5, "0", STR_PAD_LEFT),
-            'first_name' => $r->first_name . "|" . $r->id,
             'last_name' => $r->last_name . "|" . $r->id,
+            'first_name' => $r->first_name . "|" . $r->id,
             'phone' => $r->phone,
             'age' => $r->getAge(),
             'status' => $class . "|" . $text,
@@ -416,7 +418,7 @@ Route::get('/get_record_in', function(){
 
     }
 
-    $datas[] = array(
+    /*$datas[] = array(
         //'id' => $r->id,
         'date' => '',
         'total' => formatPrice($total),
@@ -427,7 +429,7 @@ Route::get('/get_record_in', function(){
         'payment' => '',
         'status' => '',
         'action' => ''
-    );
+    );*/
 
     return json_encode(array("data" => $datas));
 
@@ -494,7 +496,7 @@ Route::get('/get_record_out', function(){
         );
 
     }
-
+    /*
     $datas[] = array(
         //'id' => $r->id,
         'date' => '',
@@ -504,7 +506,7 @@ Route::get('/get_record_out', function(){
         'payment' => '',
         'action' => ''
     );
-
+    */
     return json_encode(array("data" => $datas));
 
 });