Vari fix

app/Http/Livewire/Member.php

@@ -783,6 +783,8 @@ class Member extends Component
 
         $this->emit('load-select');
 
+        $this->emit('goToTop');
+
         $rules = [
             'first_name' => 'required',
             'last_name' => 'required',
@@ -1010,6 +1012,8 @@ class Member extends Component
     public function updateAAA($close)
     {
 
+        $this->emit('goToTop');
+
         $this->isSaving = true;
 
         $this->emit('load-select');

app/helpers.php

@@ -170,3 +170,74 @@ function updateMemberData($member_id)
     $member->certificate_date = $certificate_date;
     $member->save();
 }
+
+function getMonthName($m)
+{
+    $ret = '';
+    switch ($m) {
+        case 1:
+            $ret = 'Gennaio';
+            break;
+        case 2:
+            $ret = 'Febbraio';
+            break;
+        case 3:
+            $ret = 'Marzo';
+            break;
+        case 4:
+            $ret = 'Aprile';
+            break;
+        case 5:
+            $ret = 'Maggio';
+            break;
+        case 6:
+            $ret = 'Giugno';
+            break;
+        case 7:
+            $ret = 'Luglio';
+            break;
+        case 8:
+            $ret = 'Agosto';
+            break;
+        case 9:
+            $ret = 'Settembre';
+            break;
+        case 10:
+            $ret = 'Ottobre';
+            break;
+        case 11:
+            $ret = 'Novembre';
+            break;
+        case 12:
+            $ret = 'Dicembre';
+            break;
+        default:
+            $ret = '';
+            break;
+    }
+    return $ret;
+}
+
+function getMonthList()
+{
+    $months = [];
+    if (env('FISCAL_YEAR_MONTH_FROM', 1) > 1)
+    {
+        for($x=env('FISCAL_YEAR_MONTH_FROM', 1); $x<=12; $x++)
+        {
+            $months[$x] = getMonthName($x);
+        }
+        for($x=1; $x<env('FISCAL_YEAR_MONTH_FROM', 1); $x++)
+        {
+            $months[$x] = getMonthName($x);
+        }
+    }
+    else
+    {
+        for($x=1; $x<=12; $x++)
+        {
+            $months[$x] = getMonthName($x);
+        }
+    }
+    return $months;
+}

resources/views/livewire/bank.blade.php

@@ -95,6 +95,8 @@
 
         <div class="container">
 
+            <a class="btn--ui lightGrey" href="/banks"><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') }}

resources/views/livewire/card.blade.php

@@ -104,6 +104,8 @@
 
         <div class="container">
 
+            <a class="btn--ui lightGrey" href="/cards"><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') }}

resources/views/livewire/category.blade.php

@@ -1,6 +1,8 @@
 <div class="col card--ui" id="card--dashboard">
 
-    <a class="btn--ui lightGrey" href="/settings?type=anagrafica"><i class="fa-solid fa-arrow-left"></i></a><br><br>
+    @if(!$add && !$update)
+
+    <a class="btn--ui lightGrey" href="/settings?type=anagrafica"><i class="fa-solid fa-arrow-left"></i></a><br>
 
     <header id="title--section"  class="d-flex align-items-center justify-content-between">
         <div class="title--section_name d-flex align-items-center justify-content-between" style="display:none !important" >
@@ -9,7 +11,7 @@
         </div>
 
         @if(!$add && !$update)
-            <div class="title--section_addButton text-right "  wire:click="add()" style="cursor: pointer;">
+            <div class="title--section_addButton text-right "  wire:click="add()" style="cursor: pointer;margin-top:20px;">
                 <div class="btn--ui entrata d-flex justify-items-between">
                     <a href="#" wire:click="add()" style="color:white">AGGIUNGI</a>
                 </div>
@@ -20,9 +22,8 @@
     </header>
 
 
-    @if(!$add && !$update)
-
-
+    
+    
         <section id="resume-table">
             <div class="compare--chart_wrapper d-none"></div>
 
@@ -57,6 +58,8 @@
 
         <div class="container">
 
+            <a class="btn--ui lightGrey" href="/categories"><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') }}

resources/views/livewire/causal.blade.php

@@ -1,5 +1,7 @@
 <div class="col card--ui" id="card--dashboard">
 
+    @if(!$add && !$update)
+
     <a class="btn--ui lightGrey" href="/settings?type=contabilita"><i class="fa-solid fa-arrow-left"></i></a><br><br>
 
     <header id="title--section" class="d-flex align-items-center justify-content-between">
@@ -19,8 +21,6 @@
 
     </header>
 
-    @if(!$add && !$update)
-
         <section id="resume-table">
             <div class="compare--chart_wrapper d-none"></div>
 
@@ -95,6 +95,8 @@
 
         <div class="container">
 
+            <a class="btn--ui lightGrey" href="/causals"><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') }}

resources/views/livewire/course.blade.php

@@ -20,7 +20,7 @@
     @if(!$add && !$update)
 
 
-<a class="btn--ui lightGrey" href="/settings?type=corsi"><i class="fa-solid fa-arrow-left"></i></a><br>
+        <a class="btn--ui lightGrey" href="/settings?type=corsi"><i class="fa-solid fa-arrow-left"></i></a><br>
 
         <section id="resume-table">
             <div class="compare--chart_wrapper d-none"></div>
@@ -63,6 +63,8 @@
 
     @else
 
+        <a class="btn--ui lightGrey" href="/courses?showFilters=1"><i class="fa-solid fa-arrow-left"></i></a><br>
+
         <div class="container">
 
             @if (session()->has('error'))
@@ -263,7 +265,7 @@
                             @if($update)
                                 <button type="submit" class="btn--ui" wire:click.prevent="update()">Salva</button>
                             @endif
-                            <button type="button" class="btn--ui lightGrey" wire:click="cancel()">Annulla</button>
+                            <button type="button" class="btn--ui lightGrey" onclick="annulla()">Annulla</button>
                         </div>
 
                     </form>
@@ -301,6 +303,12 @@
             console.log(isEdit);
         });
 
+        function annulla()
+        {
+            window.onbeforeunload = null;
+            document.location.href = '/courses';
+        }
+
         window.onbeforeunload = function(){
             if (isEdit)
                 return 'Cambiando pagina le eventuali modifiche andranno perse';

resources/views/livewire/course_duration.blade.php

@@ -51,6 +51,8 @@
 
         <div class="container">
 
+            <a class="btn--ui lightGrey" href="/course_durations"><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') }}

resources/views/livewire/course_frequency.blade.php

@@ -49,6 +49,8 @@
 
         <div class="container">
 
+            <a class="btn--ui lightGrey" href="/course_frequencies"><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') }}

resources/views/livewire/course_level.blade.php

@@ -49,6 +49,8 @@
 
         <div class="container">
 
+            <a class="btn--ui lightGrey" href="/course_levels"><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') }}

resources/views/livewire/course_subscription.blade.php

@@ -49,6 +49,8 @@
 
         <div class="container">
 
+            <a class="btn--ui lightGrey" href="/course_subscriptions"><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') }}

resources/views/livewire/course_type.blade.php

@@ -49,6 +49,8 @@
 
         <div class="container">
 
+            <a class="btn--ui lightGrey" href="/course_types"><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') }}

resources/views/livewire/discipline.blade.php

@@ -49,6 +49,8 @@
 
         <div class="container">
 
+            <a class="btn--ui lightGrey" href="/disciplines"><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') }}

resources/views/livewire/member.blade.php

@@ -23,7 +23,7 @@
                             <header class="title d-flex align-items-center mb-4"><i class="ico--ui borsellino fill me-2"></i>Borsellino</header>
                             <div class="credito d-flex align-items-center justify-content-between">
                                 <div class="credito_title">
-                                    <span>Credito Residuo: <br></span><span class="value">{{formatPrice($currentMember->getMoney())}}</span>
+                                    <span>Borsellino MAD: <br></span><span class="value">{{formatPrice($currentMember->getMoney())}}</span>
                                 </div>
                                 <a href="/in?new=1&memberId={{$currentMember->id}}&causalId={{$causalId}}" class="btn--ui white small" style="width:100px">ricarica</a>
 
@@ -189,7 +189,7 @@
             </div>
 
             <div class="service--button d-md-flex align-items-center " style="margin-bottom:30px">
-                <a class="btn--ui lightGrey" href="/{{$from}}?showFilters=1" style="margin-right:10px">annulla</a>
+                <button class="btn--ui lightGrey" onclick="annulla()" style="margin-right:10px">annulla</button>
 
                 <!--<button class="btn--ui_outline btn-large" style="margin-right:10px"><i class="ico--ui utenti"></i>stampa profilo</button>-->
                 <div class="payment_btn">
@@ -1591,14 +1591,14 @@
                         <div class="row">
                             <div class="col-md-7 col-xl-8 d-flex gx-0">
                                 @if($add)
-                                    <button class="btn--ui primary d-flex order-1 me-2" onclick="storeAction(false)">continua</button>
-                                    <button class="btn--ui primary d-flex order-3 ms-auto" onclick="storeAction(true)">salva e chiudi</button>
+                                    <button class="btn--ui primary d-flex order-1 me-2" wire:click="store(false)">continua</button>
+                                    <button class="btn--ui primary d-flex order-3 ms-auto" wire:onclick="store(true)">salva e chiudi</button>
                                 @endif
                                 @if($update)
-                                    <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>
+                                    <button class="btn--ui primary d-flex order-1 me-2" wire:click="updateAAA(false)">continua</button>
+                                    <button class="btn--ui primary d-flex order-3 ms-auto" wire:click="updateAAA(true)">salva e chiudi</button>
                                 @endif
-                                <a class="btn--ui lightGrey d-flex order-2" href="/{{$from != '' ? ($from . '?showFilters=1') : 'members'}}"><i class="fa-solid fa-arrow-left"></i></a><br><br>
+                                <button class="btn--ui lightGrey" onclick="annulla()" style="margin-right:10px">annulla</button><br><br>
                             </div>
                             <div class="col-md-5 col-xl-4"></div>
                         </div>
@@ -2502,7 +2502,6 @@
 
         Livewire.on('setErrorMsg', (errors) =>
         {
-            errors.forEach(msg);
 
             function msg(value)
             {
@@ -2511,6 +2510,8 @@
                     $("span").find("[aria-controls='select2-" + myArray[0] + "-container']").css('border', 'solid 3px #dc3545');
             }
             console.log(errors);
+            
+            //window.location.href = "#top";
             //$("span").find(`[aria-controls='select2-birth_nation_id-container']`).css('border', 'solid 3px red');
         });
 
@@ -2519,6 +2520,10 @@
             location.reload();
         });
 
+        Livewire.on('goToTop', () => {
+            document.body.scrollTop = document.documentElement.scrollTop = 0;
+        });
+
         function storeAction(type)
         {
             @this.change('dati');
@@ -2529,9 +2534,8 @@
             }
             else
             {
-                @this.store(type);
-
-                 window.location.href = "#top";
+                document.body.scrollTop = document.documentElement.scrollTop = 0;
+                //window.location.href = "#top";
             }
         }
 
@@ -2546,8 +2550,7 @@
             else
             {
                 @this.updateAAA(type);
-
-                window.location.href = "#top";
+                document.body.scrollTop = document.documentElement.scrollTop = 0;
             }
         }
 
@@ -2562,6 +2565,12 @@
                 @this.cancel();
         }
 
+        function annulla()
+        {
+            window.onbeforeunload = null;
+            document.location.href = '/members';
+        }
+
         window.onbeforeunload = function(){
             if (isEdit)
                 return 'Cambiando pagina le eventuali modifiche andranno perse';

resources/views/livewire/payment_method.blade.php

@@ -1,5 +1,9 @@
 <div class="col card--ui" id="card--dashboard">
 
+    
+
+    @if(!$add && !$update)
+
     <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 utenti me-2"></i>
@@ -18,8 +22,6 @@
 
     <a class="btn--ui lightGrey" href="/settings?type=contabilita"><i class="fa-solid fa-arrow-left"></i></a><br>
 
-    @if(!$add && !$update)
-
         <section id="resume-table">
             <div class="compare--chart_wrapper d-none"></div>
 
@@ -93,6 +95,8 @@
 
         <div class="container">
 
+            <a class="btn--ui lightGrey" href="/payment_methods"><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') }}

resources/views/livewire/records_in.blade.php

@@ -398,18 +398,10 @@
                                                         <span class="title-form d-block w-100">Dal mese</span>
                                                         <div class="input-group mb-3">
                                                             <select class="form-select form-select-lg me-1"  wire:model="multiMonthFrom" {{$this->dataId > 0 && !$isDuplicate ? 'disabled' : ''}}>
-                                                                <option value="1">Gennaio</option>
-                                                                <option value="2">Febbraio</option>
-                                                                <option value="3">Marzo</option>
-                                                                <option value="4">Aprile</option>
-                                                                <option value="5">Maggio</option>
-                                                                <option value="6">Giugno</option>
-                                                                <option value="7">Luglio</option>
-                                                                <option value="8">Agosto</option>
-                                                                <option value="9">Settembre</option>
-                                                                <option value="10">Ottobre</option>
-                                                                <option value="11">Novembre</option>
-                                                                <option value="12">Dicembre</option>
+                                                                @foreach(getMonthList() as $mid => $mname)
+                                                                    <option value="{{$mid}}">{{$mname}}</option>
+                                                                @endforeach
+                                                                
                                                             </select>
                                                         </div>
                                                     </div>
@@ -423,18 +415,9 @@
                                                         <span class="title-form d-block w-100">Dal mese</span>
                                                         <div class="input-group mb-3">
                                                             <select class="form-select form-select-lg me-1"  wire:model="multiMonthTo" {{$this->dataId > 0 && !$isDuplicate ? 'disabled' : ''}}>
-                                                                <option value="1">Gennaio</option>
-                                                                <option value="2">Febbraio</option>
-                                                                <option value="3">Marzo</option>
-                                                                <option value="4">Aprile</option>
-                                                                <option value="5">Maggio</option>
-                                                                <option value="6">Giugno</option>
-                                                                <option value="7">Luglio</option>
-                                                                <option value="8">Agosto</option>
-                                                                <option value="9">Settembre</option>
-                                                                <option value="10">Ottobre</option>
-                                                                <option value="11">Novembre</option>
-                                                                <option value="12">Dicembre</option>
+                                                                @foreach(getMonthList() as $mid => $mname)
+                                                                    <option value="{{$mid}}">{{$mname}}</option>
+                                                                @endforeach
                                                             </select>
                                                         </div>
                                                     </div>
@@ -465,18 +448,9 @@
                                                         <span class="title-form d-block w-100">Mese</span>
                                                         <div class="input-group mb-3">
                                                             <select class="form-select form-select-lg me-1"  wire:model="rows.{{$idx}}.when.{{$xxx}}.month" onchange="setYear({{$idx}}, {{$xxx}})" {{$this->dataId > 0 && !$isDuplicate ? 'disabled' : ''}}>
-                                                                <option value="1">Gennaio</option>
-                                                                <option value="2">Febbraio</option>
-                                                                <option value="3">Marzo</option>
-                                                                <option value="4">Aprile</option>
-                                                                <option value="5">Maggio</option>
-                                                                <option value="6">Giugno</option>
-                                                                <option value="7">Luglio</option>
-                                                                <option value="8">Agosto</option>
-                                                                <option value="9">Settembre</option>
-                                                                <option value="10">Ottobre</option>
-                                                                <option value="11">Novembre</option>
-                                                                <option value="12">Dicembre</option>
+                                                                @foreach(getMonthList() as $mid => $mname)
+                                                                    <option value="{{$mid}}">{{$mname}}</option>
+                                                                @endforeach
                                                             </select>
                                                         </div>
                                                     </div>
@@ -539,7 +513,7 @@
 
 
                         <div class="accountingEntry--btn d-flex align-items-center justify-content-between mt-5">
-                            <a class="btn--ui lightGrey" href="/{{$fromPage != '' ? ($fromPage . '?showFilters=1') : 'in'}}">annulla</a>
+                            <button class="btn--ui lightGrey" onclick="annulla()">annulla</button>
                             @if(!$deleted)
                                 @if($canSave)
                                     @if($add)
@@ -779,7 +753,7 @@
                     </div>
                 </div>
                 <div class="modal-footer">
-                    <a class="btn--ui lightGrey" href="/{{$fromPage != '' ? ($fromPage . '?showFilters=1') : 'in'}}">annulla</a>
+                    <button class="btn--ui lightGrey" onclick="annulla()">annulla</a>
                     <button type="button" class="btn--ui btn-primary" wire:click.prevent="createMember()">Salva</button>
                 </div>
                 </div>
@@ -1150,7 +1124,7 @@
             var filterFrom = $('.filterFrom').val();
             var filterTo = $('.filterTo').val();
 
-            // Salvo i filtri della ricerca
+                // Salvo i filtri della ricerca
             localStorage.setItem("filterCommercialRecordIn", filterCommercial);
             localStorage.setItem("filterMemberRecordIn", filterMember);
             localStorage.setItem("filterPaymentMethodRecordIn", filterPaymentMethod);
@@ -1174,7 +1148,11 @@
                     url : '/get_record_in?filterCommercial=' + filterCommercial + "&filterMember=" + filterMember + "&filterPaymentMethod=" + filterPaymentMethod + "&filterCausals=" + filterCausals + "&filterFrom=" + filterFrom + "&filterTo=" + filterTo,
                     dataSrc: function (json){
                         if(json.totals){
-                           $(".totalDiv").html('Totale&nbsp;:&nbsp;<b>' + json.totals + '</b>');
+                            $(".totalDiv").html('Totale&nbsp;:&nbsp;<b>' + json.totals + '</b>');
+                        }
+                        else
+                        {
+                            $(".totalDiv").html('');
                         }
                         return json.data;
                     }
@@ -1323,6 +1301,12 @@
             location.reload();
         });
 
+        function annulla()
+        {
+            window.onbeforeunload = null;
+            document.location.href = '/in';
+        }
+
 
         window.onbeforeunload = function(){
             if (isEdit)

resources/views/livewire/records_out.blade.php

@@ -310,18 +310,9 @@
                                                 <span class="title-form d-block w-100">Dal mese</span>
                                                 <div class="input-group mb-3">
                                                     <select class="form-select form-select-lg me-1"  wire:model="multiMonthFrom">
-                                                        <option value="1">Gennaio</option>
-                                                        <option value="2">Febbraio</option>
-                                                        <option value="3">Marzo</option>
-                                                        <option value="4">Aprile</option>
-                                                        <option value="5">Maggio</option>
-                                                        <option value="6">Giugno</option>
-                                                        <option value="7">Luglio</option>
-                                                        <option value="8">Agosto</option>
-                                                        <option value="9">Settembre</option>
-                                                        <option value="10">Ottobre</option>
-                                                        <option value="11">Novembre</option>
-                                                        <option value="12">Dicembre</option>
+                                                        @foreach(getMonthList() as $mid => $mname)
+                                                                    <option value="{{$mid}}">{{$mname}}</option>
+                                                                @endforeach
                                                     </select>
                                                 </div>
                                             </div>
@@ -335,18 +326,9 @@
                                                 <span class="title-form d-block w-100">Dal mese</span>
                                                 <div class="input-group mb-3">
                                                     <select class="form-select form-select-lg me-1"  wire:model="multiMonthTo">
-                                                        <option value="1">Gennaio</option>
-                                                        <option value="2">Febbraio</option>
-                                                        <option value="3">Marzo</option>
-                                                        <option value="4">Aprile</option>
-                                                        <option value="5">Maggio</option>
-                                                        <option value="6">Giugno</option>
-                                                        <option value="7">Luglio</option>
-                                                        <option value="8">Agosto</option>
-                                                        <option value="9">Settembre</option>
-                                                        <option value="10">Ottobre</option>
-                                                        <option value="11">Novembre</option>
-                                                        <option value="12">Dicembre</option>
+                                                        @foreach(getMonthList() as $mid => $mname)
+                                                            <option value="{{$mid}}">{{$mname}}</option>
+                                                        @endforeach
                                                     </select>
                                                 </div>
                                             </div>
@@ -376,18 +358,9 @@
                                                     <span class="title-form d-block w-100">Mese</span>
                                                     <div class="input-group mb-3">
                                                         <select class="form-select form-select-lg me-1"  wire:model="rows.{{$idx}}.when.{{$xxx}}.month">
-                                                            <option value="1">Gennaio</option>
-                                                            <option value="2">Febbraio</option>
-                                                            <option value="3">Marzo</option>
-                                                            <option value="4">Aprile</option>
-                                                            <option value="5">Maggio</option>
-                                                            <option value="6">Giugno</option>
-                                                            <option value="7">Luglio</option>
-                                                            <option value="8">Agosto</option>
-                                                            <option value="9">Settembre</option>
-                                                            <option value="10">Ottobre</option>
-                                                            <option value="11">Novembre</option>
-                                                            <option value="12">Dicembre</option>
+                                                            @foreach(getMonthList() as $mid => $mname)
+                                                                <option value="{{$mid}}">{{$mname}}</option>
+                                                            @endforeach
                                                         </select>
                                                     </div>
                                                 </div>
@@ -440,7 +413,7 @@
 
                         <div class="accountingExit--btn d-flex align-items-center justify-content-between">
 
-                        <a class="btn--ui lightGrey" href="/{{$fromPage != '' ? ($fromPage . '?showFilters=1') : 'out'}}">annulla</a>
+                        <button class="btn--ui lightGrey" onclick="annulla()">annulla</button>
                             @if($add)
                                 <button class="btn--ui primary"  type="submit" wire:click.prevent="store()">inserisci</button>
                             @endif
@@ -879,6 +852,12 @@
             console.log(isEdit);
         });
 
+        function annulla()
+        {
+            window.onbeforeunload = null;
+            document.location.href = '/out';
+        }
+
         window.onbeforeunload = function(){
             if (isEdit)
                 return 'Cambiando pagina le eventuali modifiche andranno perse';

resources/views/livewire/user.blade.php

@@ -53,6 +53,8 @@
 
         <div class="container">
 
+            <a class="btn--ui lightGrey" href="/users"><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') }}

resources/views/livewire/vat.blade.php

@@ -52,6 +52,8 @@
 
         <div class="container">
 
+            <a class="btn--ui lightGrey" href="/vats"><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') }}

routes/web.php

@@ -19,6 +19,11 @@ Route::get('/', function () {
     // return Redirect::to('/dashboard');
 })->name('login');
 
+Route::get('/login', function () {
+    return Redirect::to('/');
+    // return Redirect::to('/dashboard');
+});
+
 Route::post('/login', function () {
 
     if(\Auth::attempt(array('email' => $_POST["email"], 'password' => $_POST["password"])))
@@ -270,7 +275,11 @@ Route::group(['middleware' => 'auth'],function(){
             if ($_GET["order"][0]["column"] == 6)
                 $column = 'certificate';
             if ($column != '')
+            {
                 $x = $x->orderBy($column, $_GET["order"][0]["dir"]);
+                if ($column == 'certificate')
+                    $x = $x->orderBy('certificate_date', $_GET["order"][0]["dir"]);
+            }
             else
                 $x = $x->orderBy('last_name', 'ASC')->orderBy('first_name', 'ASC');
         }
@@ -355,17 +364,23 @@ Route::group(['middleware' => 'auth'],function(){
         ->leftJoin('records_rows', 'records.id', '=', 'records_rows.record_id')
         ->where('records.type', 'IN');
 
+        $hasFilter = false;
+
         if (isset($_GET["search"]["value"]))
-        {
-            $v = str_replace("'", "\'", stripcslashes($_GET["search"]["value"]));
-            $x = $x->where(function ($query) use ($v) {
-                $query->where('first_name', 'like', '%' . $v . '%')
-                        ->orWhere('last_name', 'like', '%' . $v . '%');
-            });
-            $y = $y->where(function ($query) use ($v) {
-                                $query->where('first_name', 'like', '%' . $v . '%')
-                                        ->orWhere('last_name', 'like', '%' . $v . '%');
-                            });
+        {            
+            if ($_GET["search"]["value"] != '')
+            {
+                $hasFilter = true;
+                $v = str_replace("'", "\'", stripcslashes($_GET["search"]["value"]));
+                $x = $x->where(function ($query) use ($v) {
+                    $query->where('first_name', 'like', '%' . $v . '%')
+                            ->orWhere('last_name', 'like', '%' . $v . '%');
+                });
+                $y = $y->where(function ($query) use ($v) {
+                                    $query->where('first_name', 'like', '%' . $v . '%')
+                                            ->orWhere('last_name', 'like', '%' . $v . '%');
+                                });
+                            }
             //where('first_name', 'like', '%' . $_GET["search"]["value"] . '%');
         }
 
@@ -375,27 +390,32 @@ Route::group(['middleware' => 'auth'],function(){
             // $datas = \App\Models\Record::where('type', 'IN')->with('member', 'payment_method');
             if ($_GET["filterCommercial"] == 1)
             {
+                $hasFilter = true;
                 $x = $x->where('commercial', true );
                 $y = $y->where('records.commercial', true );
             }
             if ($_GET["filterCommercial"] == 2)
             {
+                $hasFilter = true;
                 $x = $x->where('commercial', false);
                 $y = $y->where('records.commercial', false);
             }
             if ($_GET["filterMember"] > 0)
             {
+                $hasFilter = true;
                 $x = $x->where('member_id', $_GET["filterMember"]);
                 $y = $y->where('member_id', $_GET["filterMember"]);
             }
             if ($_GET["filterPaymentMethod"] != "null")
             {
+                $hasFilter = true;
                 $payments = explode(",", $_GET["filterPaymentMethod"]);
                 $x = $x->whereIn('payment_method_id', $payments);
                 $y = $y->whereIn('payment_method_id', $payments);
             }
             if ($_GET["filterCausals"] != "null")
             {
+                $hasFilter = true;
                 $causals = explode(",", $_GET["filterCausals"]);
                 //$causals = \App\Models\RecordRow::where('causal_id', $_GET["filterCausals"])->pluck('record_id');
                 $causals = \App\Models\RecordRow::whereIn('causal_id', $causals)->pluck('record_id');
@@ -404,11 +424,13 @@ Route::group(['middleware' => 'auth'],function(){
             }
             if ($_GET["filterFrom"] != '')
             {
+                $hasFilter = true;
                 $x = $x->where('date', '>=', $_GET["filterFrom"]);
                 $y = $y->where('date', '>=', $_GET["filterFrom"]);
             }
             if ($_GET["filterTo"] != '')
             {
+                $hasFilter = true;
                 $x = $x->where('date', '<=', $_GET["filterTo"]);
                 $y = $y->where('date', '<=', $_GET["filterTo"]);
             }
@@ -533,7 +555,10 @@ Route::group(['middleware' => 'auth'],function(){
             'action' => ''
         );*/
 
-        return json_encode(array("data" => $datas,  "recordsTotal" => $count, "recordsFiltered" => $count, "totals" => formatPrice($total)));
+        if ($hasFilter)
+            return json_encode(array("data" => $datas,  "recordsTotal" => $count, "recordsFiltered" => $count, "totals" => formatPrice($total)));
+        else
+            return json_encode(array("data" => $datas,  "recordsTotal" => $count, "recordsFiltered" => $count));
 
     });