Fix

app/Http/Livewire/RecordIN.php

@@ -20,6 +20,8 @@ class RecordIN extends Component
 
     public $typeIN = "IN";
 
+    public $fromPage = '';
+
     public $isDuplicate = false;
     public $multiP = false;
     public $from, $to;
@@ -293,6 +295,11 @@ class RecordIN extends Component
     public function mount()
     {
 
+        if (isset($_GET["from"]))
+        {
+            $this->fromPage = $_GET["from"];
+        }
+
         $this->causals = array();
 
         $this->multiMonthFrom = date("n");
@@ -644,6 +651,8 @@ class RecordIN extends Component
     }
 
     public function edit($id){
+        if (!isset($_GET["from"]) && $this->fromPage == '')
+            $this->fromPage = 'in';
         $this->emit('setEdit', true);
         //if ($this->hasFilter)
             $this->emit('hide-search');
@@ -787,6 +796,7 @@ class RecordIN extends Component
         $this->update = false;
         $this->resetFields();
         $this->emit('setEdit', false);
+        return redirect()->to('/' . $this->fromPage . "?showFilters=1");
     }
 
     public function delete($id)
@@ -1199,8 +1209,8 @@ class RecordIN extends Component
 
     public function setYear($idx, $xxx)
     {
-        $m = $this->rows[$idx]["when"][$xxx]["month"]; 
-        $this->rows[$idx]["when"][$xxx]["year"] = $m < env('FISCAL_YEAR_MONTH_FROM', 1) ? (date("Y") + 1) : date("Y");        
+        $m = $this->rows[$idx]["when"][$xxx]["month"];
+        $this->rows[$idx]["when"][$xxx]["year"] = $m < env('FISCAL_YEAR_MONTH_FROM', 1) ? (date("Y") + 1) : date("Y");
     }
 
 }

app/Http/Livewire/RecordOUT.php

@@ -13,6 +13,8 @@ class RecordOUT extends Component
 
     public $typeOUT = "OUT";
 
+    public $fromPage = '';
+
     public $multiP = false;
 
     public $multiMonthTo = 0;
@@ -133,6 +135,11 @@ class RecordOUT extends Component
     public function mount()
     {
 
+        if (isset($_GET["from"]))
+        {
+            $this->fromPage = $_GET["from"];
+        }
+
         if(\Auth::user()->level != env('LEVEL_ADMIN', 0))
             return redirect()->to('/dashboard');
 
@@ -292,6 +299,7 @@ class RecordOUT extends Component
 
     public function add()
     {
+        $this->fromPage = 'out';
         $this->emit('load-select');
         //if ($this->hasFilter)
             $this->emit('hide-search');
@@ -352,6 +360,8 @@ class RecordOUT extends Component
     }
 
     public function edit($id){
+        if (!isset($_GET["from"]) && $this->fromPage == '')
+            $this->fromPage = 'out';
         $this->emit('setEdit', true);
         $this->emit('load-select');
         //if ($this->hasFilter)

resources/views/livewire/member.blade.php

@@ -191,7 +191,8 @@
             </div>
 
             <div class="service--button d-md-flex align-items-center " style="margin-bottom:30px">
-                <button class="btn--ui lightGrey"  type="submit" wire:click.prevent="cancel()" style="margin-right:10px">annulla</button>
+                <a class="btn--ui lightGrey" href="/{{$from}}?showFilters=1" style="margin-right:10px">annulla</a>
+
                 <!--<button class="btn--ui_outline btn-large" style="margin-right:10px"><i class="ico--ui utenti"></i>stampa profilo</button>-->
                 <div class="payment_btn">
                     <a href="/in?new=1&memberId={{$currentMember->id}}" class="btn--ui primary">NUOVA ENTRATA</a>
@@ -200,7 +201,7 @@
             </div>
         </div>
 
-            
+
 
         @else
 
@@ -487,11 +488,11 @@
             @else
 
                 <a name="top"></a>
-                
+
                 @if($from != '')
                     <a class="btn--ui lightGrey" href="/{{$from}}?showFilters=1"><i class="fa-solid fa-arrow-left"></i></a><br>
                 @endif
-                
+
                 @if (session()->has('success'))
                     <div class="alert alert-success" role="alert">
                         {{ session()->get('success') }}
@@ -1601,7 +1602,7 @@
                                     <button class="btn--ui primary d-flex order-1 me-2" onclick="updateAction(false)">continua</button>
                                     <button class="btn--ui primary d-flex order-3 ms-auto" onclick="updateAction(true)">salva e chiudi</button>
                                 @endif
-                                <button class="btn--ui lightGrey d-flex order-2"  type="button" onclick="cancelAction()">annulla</button>
+                                <a class="btn--ui lightGrey d-flex order-2" href="/{{$from}}?showFilters=1" >annulla</a>
                             </div>
                             <div class="col-md-5 col-xl-4"></div>
                         </div>
@@ -2216,7 +2217,7 @@
             {
                 $('input[name="txtToYearYear"]').val(toYearYear);
             }
-        
+
         @endif
 
 
@@ -2286,7 +2287,7 @@
 
             var fromYear = $('input[name="txtFromYear"]').val();
             localStorage.setItem("fromYearMember", fromYear);
-            
+
             var toYear = $('input[name="txtToYear"]').val();
             localStorage.setItem("toYearMember", toYear);
 
@@ -2301,13 +2302,13 @@
 
             var filterStatus = $('.filterStatus').val();
             localStorage.setItem("filterStatusMember", filterStatus);
-            
+
             var filterScadenza = $('.filterScadenza').val();
             localStorage.setItem("filterScadenzaMember", filterScadenza);
-            
+
             var filterCertificateType = $('.filterCertificateType').val();
             localStorage.setItem("filterCertificateTypeMember", filterCertificateType);
-            
+
             var filterCategories = $('.filterCategories').val();
             localStorage.setItem("filterCategoriesMember", filterCategories);
 

resources/views/livewire/receipt.blade.php

@@ -25,10 +25,10 @@
                         <b>Periodo</b>
                     </div>
                     <div class="col-12 mb-2">
-                        <input id="dateFrom" type="date" class="form-control filterFrom">
+                        <input id="dateFrom" type="date" class="form-control filterFrom" name="txtFrom">
                     </div>
                     <div class="col-12">
-                        <input id="dateTo" type="date" class="form-control filterTo" >
+                        <input id="dateTo" type="date" class="form-control filterTo" name="txtTo">
                     </div>
                     <div class="col-6 mt-2">
                         <button class="btn--ui lightGrey todayButton" style="width:100%" onclick="setToday('{{date("Y-m-d")}}')">OGGI</button>
@@ -246,6 +246,24 @@
             });
         }
 
+        @if(isset($_GET["showFilters"]))
+            var filterStatus = localStorage.getItem("filterStatusReceipt");
+            if (filterStatus)
+            {
+                $('.filterStatus').val(filterStatus).trigger('change');
+            }
+            var filterFrom = localStorage.getItem("filterFromReceipt");
+            if (filterFrom)
+            {
+                $('input[name="txtFrom"]').val(filterFrom);
+            }
+            var filterTo = localStorage.getItem("filterToReceipt");
+            if (filterTo)
+            {
+                $('input[name="txtTo"]').val(filterFrom);
+            }
+        @endif
+
         function reset()
         {
             $(".todayButton").addClass("lightGrey");
@@ -264,8 +282,13 @@
             }
 
             var filterStatus = $('.filterStatus').val();
+            localStorage.setItem("filterStatusReceipt", filterStatus);
+
             var filterFrom = $('.filterFrom').val();
+            localStorage.setItem("filterFromReceipt", filterFrom);
+
             var filterTo = $('.filterTo').val();
+            localStorage.setItem("filterToReeipt", filterTo);
 
             $('#tablesaw-350').DataTable({
                 serverSide: true,
@@ -311,10 +334,11 @@
                     {
                         data: "action",
                         render: function (data){
+                            var ids = data.split("|");
                             // Split class and text
-                            var ret = '<button type="button" class="btn u" onclick="document.location.href=' + "'" + '/in?id=' + data + "'" + '" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Visualizza ricevuta"><i class="fa-regular fa-eye"></i></button>';
-                            ret += '<a target="_blank" class="btn  u" href="/receipt/' + data + '" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Stampa ricevuta"><i class="fa-regular fa-file-lines"></i></a>';
-                            ret += '<a target="_blank" class="btn u" onclick="sendMail(' + data + ')"><i class="fa-regular fa-envelope" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Invia email"></i></a>';
+                            var ret = '<button type="button" class="btn u" onclick="document.location.href=' + "'" + '/in?id=' + ids[1] + "&from=receipts'" + '" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Visualizza ricevuta"><i class="fa-regular fa-eye"></i></button>';
+                            ret += '<a target="_blank" class="btn  u" href="/receipt/' + ids[0] + '" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Stampa ricevuta"><i class="fa-regular fa-file-lines"></i></a>';
+                            ret += '<a target="_blank" class="btn u" onclick="sendMail(' + ids[0] + ')"><i class="fa-regular fa-envelope" data-bs-toggle="popover"  data-bs-trigger="hover focus" data-bs-placement="bottom" data-bs-content="Invia email"></i></a>';
                             return ret;
                         }
                     }

resources/views/livewire/records_in.blade.php

@@ -1,5 +1,8 @@
 <div class="col card--ui" id="card--dashboard">
 
+    @if($fromPage != '')
+        <a style="margin-top:20px" class="btn--ui lightGrey" href="/{{$fromPage}}?showFilters=1"><i class="fa-solid fa-arrow-left"></i></a><br><br>
+    @endif
 
         <header id="title--section" style="display:none !important"  class="d-flex align-items-center justify-content-between">
             <div class="title--section_name d-flex align-items-center justify-content-between">
@@ -536,7 +539,7 @@
 
 
                         <div class="accountingEntry--btn d-flex align-items-center justify-content-between mt-5">
-                            <button class="btn--ui lightGrey"  type="submit" wire:click.prevent="cancel()">annulla</button>
+                            <a class="btn--ui lightGrey" href="/{{$fromPage}}?showFilters=1">annulla</a>
                             @if(!$deleted)
                                 @if($canSave)
                                     @if($add)
@@ -1031,6 +1034,43 @@
             loadDataTable();
         } );
 
+        @if(isset($_GET["showFilters"]))
+            var filterCommercial = localStorage.getItem("filterCommercialRecordIn");
+            if (filterCommercial)
+            {
+                $('.filterCommercial').val(filterCommercial);
+                $('.filterCommercial').trigger('change');
+            }
+            var filterMember = localStorage.getItem("filterMemberRecordIn");
+            if (filterMember)
+            {
+                $('.filterMember').val(filterMember);
+                $('.filterMember').trigger('change');
+            }
+            var filterPaymentMethod = localStorage.getItem("filterPaymentMethodRecordIn");
+            if (filterPaymentMethod)
+            {
+                $('.filterPaymentMethod').val(filterPaymentMethod);
+                $('.filterPaymentMethod').trigger('change');
+            }
+            var filterCausals = localStorage.getItem("filterCausalsRecordIn");
+            if (filterCausals)
+            {
+                $('.filterCausals').val(filterCausals);
+                $('.filterCausals').trigger('change');
+            }
+            var filterFrom = localStorage.getItem("filterFromRecordIn");
+            if (filterFrom)
+            {
+                $('.filterFrom').val(filterFrom);
+            }
+            var filterTo = localStorage.getItem("filterToRecordIn");
+            if (filterTo)
+            {
+                $('.filterTo').val(filterTo);
+            }
+        @endif
+
         var isFilter = false;
         $(document).ready(function() {
             $(document).on("click",".showHideFilter",function() {
@@ -1090,7 +1130,7 @@
             $('.filterCausals').trigger('change');
             $('.filterFrom').val('');
             $('.filterTo').val('');
-            localStorage.clear();
+            //localStorage.clear();
             loadDataTable();
         }
 
@@ -1110,12 +1150,12 @@
             var filterTo = $('.filterTo').val();
 
             // Salvo i filtri della ricerca
-            localStorage.setItem("filterCommercial", filterCommercial);
-            localStorage.setItem("filterMember", filterMember);
-            localStorage.setItem("filterPaymentMethod", filterPaymentMethod);
-            localStorage.setItem("filterCausals", filterCausals);
-            localStorage.setItem("filterFrom", filterFrom);
-            localStorage.setItem("filterTo", filterTo);
+            localStorage.setItem("filterCommercialRecordIn", filterCommercial);
+            localStorage.setItem("filterMemberRecordIn", filterMember);
+            localStorage.setItem("filterPaymentMethodRecordIn", filterPaymentMethod);
+            localStorage.setItem("filterCausalsRecordIn", filterCausals);
+            localStorage.setItem("filterFromRecordIn", filterFrom);
+            localStorage.setItem("filterToRecordIn", filterTo);
 
             var totalString = "";
 

resources/views/livewire/records_out.blade.php

@@ -1,6 +1,7 @@
 <div class="col card--ui" id="card--dashboard">
 
 
+
     <header id="title--section" style="display:none !important"  class="d-flex align-items-center justify-content-between">
         <div class="title--section_name d-flex align-items-center justify-content-between">
             <i class="ico--ui title_section uscite me-2"></i>
@@ -175,6 +176,8 @@
 
     @else
 
+        <a style="margin-top:20px" class="btn--ui lightGrey" href="/{{$fromPage != '' ? ($fromPage . '?showFilters=1') : 'out'}}"><i class="fa-solid fa-arrow-left"></i></a><br><br>
+
         @if (session()->has('error'))
             <div class="alert alert-danger" role="alert">
                 {{ session()->get('error') }}
@@ -436,7 +439,8 @@
 
 
                         <div class="accountingExit--btn d-flex align-items-center justify-content-between">
-                        <button class="btn--ui lightGrey"  type="submit" wire:click.prevent="cancel()">annulla</button>
+
+                        <a class="btn--ui lightGrey" href="/{{$fromPage != '' ? ($fromPage . '?showFilters=1') : 'out'}}">annulla</a>
                             @if($add)
                                 <button class="btn--ui primary"  type="submit" wire:click.prevent="store()">inserisci</button>
                             @endif
@@ -644,39 +648,45 @@
     <script>
 
         $(document).ready(function() {
+            loadDataTable();
+        } );
 
-            /*
-            var filterSupplier = localStorage.getItem("filterSupplier");
-            if (filterSupplier)
+        @if(isset($_GET["showFilters"]))
+            var filterSupplier = localStorage.getItem("filterSupplierRecordOut");
+            if (filterSupplier && filterSupplier != "null" && filterSupplier != "undefined")
             {
+                console.log("1");
+                console.log(filterSupplier);
                 $('.filterSupplier').val(filterSupplier);
                 $('.filterSupplier').trigger('change');
             }
-            var filterPaymentMethod = localStorage.getItem("filterPaymentMethod");
-            if (filterPaymentMethod)
+            var filterPaymentMethod = localStorage.getItem("filterPaymentMethodRecordOut");
+            if (filterPaymentMethod && filterPaymentMethod != "null" && filterPaymentMethod != "undefined")
             {
+                console.log("2");
                 $('.filterPaymentMethod').val(filterPaymentMethod);
                 $('.filterPaymentMethod').trigger('change');
             }
-            var filterCausals = localStorage.getItem("filterCausals");
-            if (filterCausals)
+            var filterCausals = localStorage.getItem("filterCausalsRecordOut");
+            if (filterCausals && filterCausals != "null" && filterCausals != "undefined")
             {
+                console.log("3");
                 $('.filterCausals').val(filterCausals);
                 $('.filterCausals').trigger('change');
             }
-            var filterFrom = localStorage.getItem("filterFrom");
-            if (filterFrom)
+            var filterFrom = localStorage.getItem("filterFromRecordOut");
+            if (filterFrom && filterFrom != "" && filterFrom != "undefined")
             {
+                console.log("4");
                 $('.filterFrom').val(filterFrom);
             }
-            var filterTo = localStorage.getItem("filterTo");
-            if (filterTo)
+            var filterTo = localStorage.getItem("filterToRecordOut");
+            if (filterTo && filterTo != "" && filterTo != "undefined")
             {
+                console.log("5");
                 $('.filterTo').val(filterTo);
             }
-            */
-            loadDataTable();
-        } );
+        @endif
 
         var isFilter = false;
         $(document).ready(function() {
@@ -747,12 +757,11 @@
             var filterFrom = $('.filterFrom').val();
             var filterTo = $('.filterTo').val();
 
-            localStorage.setItem("filterSupplier", filterSupplier);
-            localStorage.setItem("filterPaymentMethod", filterPaymentMethod);
-            localStorage.setItem("filterCausals", filterCausals);
-            localStorage.setItem("filterFrom", filterFrom);
-            localStorage.setItem("filterTo", filterTo);
-
+            localStorage.setItem("filterSupplierRecordOut", filterSupplier);
+            localStorage.setItem("filterPaymentMethodRecordOut", filterPaymentMethod);
+            localStorage.setItem("filterCausalsRecordOut", filterCausals);
+            localStorage.setItem("filterFromRecordOut", filterFrom);
+            localStorage.setItem("filterToRecordOut", filterTo);
 
             $('#tablesaw-350').DataTable({
                 //searching: false,

routes/web.php

@@ -449,7 +449,7 @@ Route::group(['middleware' => 'auth'],function(){
         $causals = [];
         if ($_GET["filterCausals"] != "null")
             $causals = explode(",", $_GET["filterCausals"]);
-        
+
         foreach($y->get() as $r)
         {
 
@@ -464,10 +464,10 @@ Route::group(['middleware' => 'auth'],function(){
                             $total += getVatValue($r->amount, $r->vat_id);
                     }
                 }
-                
+
             }
         }
-        
+
         $count = $x->count();
 
 
@@ -1097,7 +1097,7 @@ Route::group(['middleware' => 'auth'],function(){
         $datas = [];
         foreach($x as $idx => $r)
         {
-
+            $ids = $r->id . "|" . $r->record_id;
             $datas[] = array(
                 'year' => $r->year,
                 'number' => $r->number,
@@ -1106,7 +1106,7 @@ Route::group(['middleware' => 'auth'],function(){
                 'status' => $r->status,
                 'date' => date("d/m/Y", strtotime($r->date)),
                 'totals' => formatPrice($r->rows->sum('amount')),
-                'action' => $r->id
+                'action' => $ids
             );
 
         }
@@ -1160,13 +1160,13 @@ Route::get('/seed', function()
 
 
 Route::get('/updateCourseCausal', function(){
-    
+
     $member_courses = \App\Models\MemberCourse::all();
     foreach($member_courses as $x)
     {
 
         $records = \App\Models\Record::where('member_course_id', $x->id)->get();
-        
+
         foreach ($records as $record)
         {
             foreach ($record->rows as $row)
@@ -1181,4 +1181,4 @@ Route::get('/updateCourseCausal', function(){
             }
         }
     }
-});
+});