1
0

2 Revīzijas 9a423ce2d8 ... 6e6336d325

Autors SHA1 Ziņojums Datums
  ferrari 6e6336d325 prima nota - tolti record annullati dai totali 3 nedēļas atpakaļ
  ferrari ca06f26b9e record_in - fix annulla ricevuta 3 nedēļas atpakaļ
2 mainītis faili ar 37 papildinājumiem un 11 dzēšanām
  1. 11 8
      app/Http/Livewire/Record.php
  2. 26 3
      app/helpers.php

+ 11 - 8
app/Http/Livewire/Record.php

@@ -731,10 +731,11 @@ class Record extends Component
                 $data->causal_name = $causal->getTree();
                 $ret[] = $data;
 
-                if ($data->type == 'IN')
-                    $this->total_in += $data->amount;
-                if ($data->type == 'OUT')
-                    $this->total_out += $data->amount;
+                if ($data->deleted != true)
+                    if ($data->type == 'IN')
+                        $this->total_in += $data->amount;
+                    if ($data->type == 'OUT')
+                        $this->total_out += $data->amount;
 
             }
         }
@@ -753,8 +754,9 @@ class Record extends Component
                 'deleted' => $m->deleted,
             ];
 
-            $this->total_out += $m->amount;
-
+            if (!$m->deleted)
+                $this->total_out += $m->amount;
+            
             // ENTRATA
             $ret[] = (object) [
                 'id' => 'fm_in_' . $m->id,
@@ -767,8 +769,9 @@ class Record extends Component
                 'destination' => $m->destination,
                 'deleted' => $m->deleted,
             ];
-
-            $this->total_in += $m->amount;
+            
+            if (!$m->deleted)
+                $this->total_in += $m->amount;
         }
 
         usort($ret, function ($a, $b) {

+ 26 - 3
app/helpers.php

@@ -155,11 +155,15 @@ function sendReceiptEmail($receipt)
 function sendReceiptDeleteEmail($receipt)
 {
     $pdf = PDF::loadView('receipt', array('receipt' => $receipt));
-    $pdfName = "Ricevuta_annullata_" . $receipt->member->last_name . "_" . $receipt->number . "_" . $receipt->year . ".pdf";
+    if ($receipt->member) {
+        $pdfName = "Ricevuta_annullata_" . $receipt->member->last_name . "_" . $receipt->number . "_" . $receipt->year . ".pdf";
+    } elseif ($receipt->supplier) {
+        $pdfName = "Ricevuta_annullata_" . $receipt->supplier->name . "_" . $receipt->number . "_" . $receipt->year . ".pdf";
+    }
     Storage::put('public/pdf/' . $pdfName, $pdf->output());
     $email = '';
-    $member = \App\Models\Member::findOrFail($receipt->member_id);
-    if ($member->no_send_mail == null || !$member->no_send_mail)
+    $member = $receipt->member;
+    if ($member && ($member->no_send_mail == null || !$member->no_send_mail))
     {
         if ($member->isAdult())
             $email = $member->email;
@@ -191,6 +195,25 @@ function sendReceiptDeleteEmail($receipt)
             }
         }
     }
+
+    $supplier = $receipt->supplier;
+    if ($supplier)
+    {
+        $email = $supplier->referent_email;
+        if ($email != '')
+        {
+            try
+            {
+                Mail::to($email)->bcc(env('MAIL_CCN', ''))->send(new \App\Mail\ReceipDeleteEmail([
+                    'number' => $receipt->number . "/" . $receipt->year,
+                    'pdf' => 'public/pdf/' . $pdfName,
+                    'date' => date("d/m/Y", strtotime($receipt->date))
+                ]));
+            } catch (Exception $e) {
+                //echo 'Caught exception: ',  $e->getMessage(), "\n";
+            }
+        }
+    }
 }
 
 function updateMemberData($member_id)