fix prima nota e scritte blu

app/Http/Livewire/Profile.php

@@ -62,7 +62,7 @@ class Profile extends Component
     public function cancel()
     {
         $this->editMode = false;
-        $this->resetInputFields();
+        $this->password = '';
     }
 
     private function resetInputFields(){

app/Http/Livewire/Record.php

@@ -133,8 +133,8 @@ class Record extends Component
         }
         */
         $datas = \App\Models\Record::with('member', 'supplier', 'payment_method')
+                    ->select('records.*', 'records_rows.*') // Ensure all columns are selected
                     ->join('records_rows', 'records.id', '=', 'records_rows.record_id')
-                    //->where('records_rows.when', 'like', '%' . date("m-Y") . '%')
                     ->whereBetween('date', [$this->fromDate, $this->toDate])
                     ->where(function ($query)  {
                         $query->where('type', 'OUT')
@@ -151,7 +151,8 @@ class Record extends Component
                               ->orWhere(function ($subquery) use ($exclude_from_records) {
                                   $subquery->whereNotIn('member_id', $exclude_from_records);
                               });
-                    });                    if ($this->filterCausals != null && sizeof($this->filterCausals) > 0)
+                    });
+                    if ($this->filterCausals != null && sizeof($this->filterCausals) > 0)
                     {
                         $causals = array();
                         foreach($this->filterCausals as $z)
@@ -175,7 +176,9 @@ class Record extends Component
                     {
                         $datas->where('member_id', $this->filterMember);
                     }
-                    $datas = $datas->orderBy('date', 'ASC')->orderBy('records.created_at', 'ASC')
+                    $datas = $datas->orderBy('date', 'ASC')
+                    ->orderBy('records.created_at', 'ASC')
+                    ->orderBy('records_rows.id', 'ASC') // Important to maintain row order
                     ->get();
 
         foreach($datas as $idx => $data)
@@ -211,31 +214,27 @@ class Record extends Component
 
                 // aggiungere il nome * * *
                 //$causal = $prefix . $data->date . "§" . $causalCheck->getTree();
-                $causal = $prefix . $data->date . "§" . $causalCheck->getTree() . "§" . ($data->type == "IN" ? ($data->member ? ($data->member->last_name . " " . $data->member->first_name) : "")  : $data->supplier->name ?? "") . "§" . $data->note . "§" . ($data->deleted ? 'DELETED' : '');
-
-                if (isset($this->records[$causal]))
-                {
-                    if (isset($this->records[$causal][$data->payment_method->name]))
-                    {
-                        if ($data->commercial)
-                        {
-                            if ($data->deleted && $this->records[$causal][$data->payment_method->name][$data->type])
-                                $amount += $this->records[$causal][$data->payment_method->name][$data->type];
-                        }
-                    }
+                $causal = $prefix . $data->date . "§" . $causalCheck->getTree() . "§" .
+                ($data->type == "IN" ? ($data->member ? ($data->member->last_name . " " . $data->member->first_name) : "") :
+                $data->supplier->name ?? "") . "§" . $data->note . "§" . ($data->deleted ? 'DELETED' : '') .
+                "§" . $data->numero_linea;
 
+                if (!isset($this->records[$causal][$data->payment_method->name][$data->type])) {
+                    $this->records[$causal][$data->payment_method->name][$data->type] = 0;
                 }
 
-                if (!isset($this->totals[$data->payment_method->name]))
-                {
+                // Add to the records array
+                $this->records[$causal][$data->payment_method->name][$data->type] += $amount;
+
+                // Initialize totals if needed
+                if (!isset($this->totals[$data->payment_method->name])) {
                     $this->totals[$data->payment_method->name]["IN"] = 0;
                     $this->totals[$data->payment_method->name]["OUT"] = 0;
                 }
 
-                $this->records[$causal][$data->payment_method->name][$data->type] = $amount;
-
+                // Update totals if not deleted
                 if (!$data->deleted)
-                    $this->totals[$data->payment_method->name][$data->type] += $amount; // $data->amount;//$this->records[$causal][$data->payment_method->name][$data->type];
+                    $this->totals[$data->payment_method->name][$data->type] += $amount;// $data->amount;//$this->records[$causal][$data->payment_method->name][$data->type];
 
             }
 

resources/views/livewire/azienda.blade.php

@@ -74,7 +74,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <h5 class="mb-3 blu-text">Sede legale</h5>
+                            <h5 class="mb-3">Sede legale</h5>
                             <div class="row">
                                 <div class="col-md-3 mb-3">
                                     <label class="form-label blu-text">Nazione</label>
@@ -135,7 +135,7 @@
                                 </div>
                             @endif
 
-                            <h5 class="mb-3 blu-text">Contatti</h5>
+                            <h5 class="mb-3">Contatti</h5>
                             <div class="row">
                                 <div class="col-md-6 mb-3">
                                     <label class="form-label blu-text">Email*</label>
@@ -163,7 +163,7 @@
                                 </div>
                             </div>
 
-                            <h5 class="mb-3 blu-text">Dati fiscali</h5>
+                            <h5 class="mb-3">Dati fiscali</h5>
                             <div class="row">
                                 <div class="col-md-3 mb-3">
                                     <label class="form-label blu-text">Partita IVA</label>

resources/views/livewire/profile.blade.php

@@ -14,20 +14,21 @@
                 <form wire:submit.prevent="save">
 
                     <div class="row mb-3 mt-4">
+                        <h5 class="mb-3 mt-3">Anagrafica</h5>
                         <div class="row">
                             <div class="col-md-6">
-                                <label for="inputName" class="form-label blu-text"><b>Nome</b></label>
+                                <label for="inputName" class="form-label blu-text">Nome</label>
                                 <input class="form-control " type="text" id="name" placeholder="Nome"
                                     wire:model="name" {{ $editMode ? '' : 'disabled' }}>
                             </div>
 
                             <div class="col-md-6">
-                                <label for="inputName" class="form-label blu-text"><b>Cognome</b></label>
+                                <label for="inputName" class="form-label blu-text">Cognome</label>
                                 <input class="form-control" type="text" id="cognome" placeholder="Cognome"
                                     wire:model="cognome" {{ $editMode ? '' : 'disabled' }}>
                             </div>
                         </div>
-                        <h5 class="mb-3 mt-3" style="color:#0C6197;">Contatti</h5>
+                        <h5 class="mb-3 mt-3">Contatti</h5>
                         <div class="row">
                             <div class="col-md-6 mb-3">
                                 <label class="form-label blu-text">Telefono</label>
@@ -42,7 +43,7 @@
                             </div>
                         </div>
 
-                        <h5 class="mb-3" style="color:#0C6197;">Credenziali Accesso</h5>
+                        <h5 class="mb-3">Credenziali Accesso</h5>
                         <div class="row">
                             <div class="col-md-6 mb-3">
                                 <label class="form-label blu-text">Email</label>