Procházet zdrojové kódy

financial_movements - modifiche

ferrari před 1 měsícem
rodič
revize
81355af79b

+ 3 - 2
app/Http/Livewire/FinancialMovements.php

@@ -74,7 +74,7 @@ class FinancialMovements extends Component
         $this->origins = \App\Models\Bank::where('enabled', true)->whereIn('visibility', ['ALL', 'OUT'])->orderBy('name')->get();
         $this->destinations = \App\Models\Bank::where('enabled', true)->whereIn('visibility', ['ALL', 'IN'])->orderBy('name')->get();
 
-        $this->causal_name = "PAGAMENTO MOVIMENTO";
+        $this->causal_name = "Movimento finanziario";
         $this->causal_id = \App\Models\Causal::where('name', $this->causal_name)->value('id');
         if (!$this->causal_id) {
             $causal = new \App\Models\Causal();
@@ -86,7 +86,8 @@ class FinancialMovements extends Component
             $causal->no_receipt = false;
             $causal->user_status = false;
             $causal->no_first = false;
-            $causal->no_records = false;
+            $causal->no_records = true;
+            $causal->no_reports = true;
             $causal->enabled = true;
             $causal->save();
 

+ 7 - 5
resources/views/layouts/app.blade.php

@@ -303,6 +303,13 @@
                                                 </a>
                                             </li>
                                         @endif
+                                        @if(Auth::user()->level == env('LEVEL_ADMIN', 0))
+                                        <li class="nav-item" style="{{Request::is('financial_movements') ? 'background-color: #c5d9e6;' : ''}}">
+                                            <a href="/financial_movements" class="nav-link d-flex align-items-center linkMenu">
+                                                <span class="ms-3 d-md-inline">Movimenti finanziari</span>
+                                            </a>
+                                        </li>
+                                        @endif
                                         <li class="nav-item" style="{{Request::is('receipts') ? 'background-color: #c5d9e6;' : ''}}">
                                             <a href="/receipts" class="nav-link d-flex align-items-center linkMenu">
                                                 <span class="ms-3 d-md-inline">Ricevute</span>
@@ -325,11 +332,6 @@
                                                 <span class="ms-3 d-md-inline">Prima Nota (OLD)</span>
                                             </a>
                                         </li>
-                                        <li class="nav-item" style="{{Request::is('financial_movements') ? 'background-color: #c5d9e6;' : ''}}">
-                                            <a href="/financial_movements" class="nav-link d-flex align-items-center linkMenu">
-                                                <span class="ms-3 d-md-inline">Movimenti finanziari</span>
-                                            </a>
-                                        </li>
                                     </ul>
                                 </div>
                             </div>

+ 13 - 2
routes/web.php

@@ -879,15 +879,19 @@ Route::get('/get_financial_movements', function () {
         ->leftJoin('causals as causals', 'causals.id', '=', 'financial_movements.causal_id')
         ->where('financial_movements.deleted', false);
 
+    $hasFilter = false;
     if (!empty($filterFrom)) {
+        $hasFilter = true;
         $base->whereDate('financial_movements.date', '>=', $filterFrom);
     }
 
     if (!empty($filterTo)) {
+        $hasFilter = true;
         $base->whereDate('financial_movements.date', '<=', $filterTo);
     }
 
     if ($filterOrigins && $filterOrigins !== "null") {
+        $hasFilter = true;
         $origins = array_filter(explode(",", $filterOrigins));
         if (!empty($origins)) {
             $base->whereIn('financial_movements.origin_id', $origins);
@@ -895,6 +899,7 @@ Route::get('/get_financial_movements', function () {
     }
 
     if ($filterDestinations && $filterDestinations !== "null") {
+        $hasFilter = true;
         $destinations = array_filter(explode(",", $filterDestinations));
         if (!empty($destinations)) {
             $base->whereIn('financial_movements.destination_id', $destinations);
@@ -957,13 +962,19 @@ Route::get('/get_financial_movements', function () {
 
     $draw = (int) request('draw', 0);
 
-    return response()->json([
+    $data = [
         "draw" => $draw,
         "data" => $data,
         "recordsTotal" => $recordsTotal,
         "recordsFiltered" => $recordsFiltered,
         "totals" => formatPrice($totalAmount),
-    ]);
+    ];
+
+    if (!$hasFilter) {
+        unset($data['totals']);
+    }
+
+    return response()->json($data);
 });
 
 Route::get('/get_course_list', function () {