|
@@ -1,6 +1,7 @@
|
|
|
<?php
|
|
<?php
|
|
|
|
|
|
|
|
namespace App\Http\Livewire;
|
|
namespace App\Http\Livewire;
|
|
|
|
|
+
|
|
|
use Livewire\Component;
|
|
use Livewire\Component;
|
|
|
|
|
|
|
|
use PhpOffice\PhpSpreadsheet\Spreadsheet;
|
|
use PhpOffice\PhpSpreadsheet\Spreadsheet;
|
|
@@ -8,6 +9,7 @@ use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
|
|
|
use Illuminate\Support\Facades\Log;
|
|
use Illuminate\Support\Facades\Log;
|
|
|
use SimpleXMLElement;
|
|
use SimpleXMLElement;
|
|
|
use Illuminate\Support\Facades\Auth;
|
|
use Illuminate\Support\Facades\Auth;
|
|
|
|
|
+use Illuminate\Support\Facades\Storage;
|
|
|
|
|
|
|
|
class RecordINOUT extends Component
|
|
class RecordINOUT extends Component
|
|
|
{
|
|
{
|
|
@@ -54,18 +56,17 @@ class RecordINOUT extends Component
|
|
|
public function mount()
|
|
public function mount()
|
|
|
{
|
|
{
|
|
|
|
|
|
|
|
- if(Auth::user()->level != env('LEVEL_ADMIN', 0))
|
|
|
|
|
|
|
+ if (Auth::user()->level != env('LEVEL_ADMIN', 0))
|
|
|
return redirect()->to('/dashboard');
|
|
return redirect()->to('/dashboard');
|
|
|
|
|
|
|
|
$borsellino = \App\Models\Causal::where('money', true)->first();
|
|
$borsellino = \App\Models\Causal::where('money', true)->first();
|
|
|
if ($borsellino)
|
|
if ($borsellino)
|
|
|
$this->excludeCausals[] = $borsellino->id;
|
|
$this->excludeCausals[] = $borsellino->id;
|
|
|
- //$this->borsellino_id = $borsellino->id;
|
|
|
|
|
|
|
+ //$this->borsellino_id = $borsellino->id;
|
|
|
|
|
|
|
|
// Aggiungo
|
|
// Aggiungo
|
|
|
$excludes = \App\Models\Causal::where('no_records', true)->get();
|
|
$excludes = \App\Models\Causal::where('no_records', true)->get();
|
|
|
- foreach($excludes as $e)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ foreach ($excludes as $e) {
|
|
|
$this->excludeCausals[] = $e->id;
|
|
$this->excludeCausals[] = $e->id;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -89,38 +90,34 @@ class RecordINOUT extends Component
|
|
|
|
|
|
|
|
public function getCausalsIn($records, $indentation)
|
|
public function getCausalsIn($records, $indentation)
|
|
|
{
|
|
{
|
|
|
- foreach($records as $record)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ foreach ($records as $record) {
|
|
|
$this->causalsIn[] = array('id' => $record->id, 'name' => $record->getTree(), 'text' => $record->getTree(), 'level' => $indentation);
|
|
$this->causalsIn[] = array('id' => $record->id, 'name' => $record->getTree(), 'text' => $record->getTree(), 'level' => $indentation);
|
|
|
- if(count($record->childs))
|
|
|
|
|
|
|
+ if (count($record->childs))
|
|
|
$this->getCausalsIn($record->childs, $indentation + 1);
|
|
$this->getCausalsIn($record->childs, $indentation + 1);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public function getCausalsOut($records, $indentation)
|
|
public function getCausalsOut($records, $indentation)
|
|
|
{
|
|
{
|
|
|
- foreach($records as $record)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ foreach ($records as $record) {
|
|
|
$this->causalsOut[] = array('id' => $record->id, 'name' => $record->getTree(), 'text' => $record->getTree(), 'level' => $indentation);
|
|
$this->causalsOut[] = array('id' => $record->id, 'name' => $record->getTree(), 'text' => $record->getTree(), 'level' => $indentation);
|
|
|
- if(count($record->childs))
|
|
|
|
|
|
|
+ if (count($record->childs))
|
|
|
$this->getCausalsOut($record->childs, $indentation + 1);
|
|
$this->getCausalsOut($record->childs, $indentation + 1);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public function getCausale($records, $type, $indentation)
|
|
public function getCausale($records, $type, $indentation)
|
|
|
{
|
|
{
|
|
|
- foreach($records as $record)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ foreach ($records as $record) {
|
|
|
$first_parent_id = null;
|
|
$first_parent_id = null;
|
|
|
- if ($record->parent_id != null)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ if ($record->parent_id != null) {
|
|
|
$first_parent_id = \App\Models\Causal::where('id', $record->parent_id)->first()->parent_id;
|
|
$first_parent_id = \App\Models\Causal::where('id', $record->parent_id)->first()->parent_id;
|
|
|
}
|
|
}
|
|
|
if ($type == 'IN')
|
|
if ($type == 'IN')
|
|
|
$this->rows_in[] = array('id' => $record->id, 'name' => $record->name, 'level' => $indentation, 'parent_id' => $record->parent_id, 'parent_name' => $this->getCausalName($record->parent_id), 'first_parent_id' => $first_parent_id, 'first_parent_name' => $this->getCausalName($first_parent_id), 'all_childs' => $this->getAllChild($record->id));
|
|
$this->rows_in[] = array('id' => $record->id, 'name' => $record->name, 'level' => $indentation, 'parent_id' => $record->parent_id, 'parent_name' => $this->getCausalName($record->parent_id), 'first_parent_id' => $first_parent_id, 'first_parent_name' => $this->getCausalName($first_parent_id), 'all_childs' => $this->getAllChild($record->id));
|
|
|
if ($type == 'OUT')
|
|
if ($type == 'OUT')
|
|
|
$this->rows_out[] = array('id' => $record->id, 'name' => $record->name, 'level' => $indentation, 'parent_id' => $record->parent_id, 'parent_name' => $this->getCausalName($record->parent_id), 'first_parent_id' => $first_parent_id, 'first_parent_name' => $this->getCausalName($first_parent_id), 'all_childs' => $this->getAllChild($record->id));
|
|
$this->rows_out[] = array('id' => $record->id, 'name' => $record->name, 'level' => $indentation, 'parent_id' => $record->parent_id, 'parent_name' => $this->getCausalName($record->parent_id), 'first_parent_id' => $first_parent_id, 'first_parent_name' => $this->getCausalName($first_parent_id), 'all_childs' => $this->getAllChild($record->id));
|
|
|
- if(count($record->childs))
|
|
|
|
|
|
|
+ if (count($record->childs))
|
|
|
$this->getCausale($record->childs, $type, $indentation + 1);
|
|
$this->getCausale($record->childs, $type, $indentation + 1);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -133,30 +130,24 @@ class RecordINOUT extends Component
|
|
|
|
|
|
|
|
$record = \App\Models\Causal::findOrFail($id);
|
|
$record = \App\Models\Causal::findOrFail($id);
|
|
|
$aChilds[] = $record->parent_id;
|
|
$aChilds[] = $record->parent_id;
|
|
|
- if ($record->parent_id != null)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ if ($record->parent_id != null) {
|
|
|
$first_parent_id = \App\Models\Causal::where('id', $record->parent_id)->first()->parent_id;
|
|
$first_parent_id = \App\Models\Causal::where('id', $record->parent_id)->first()->parent_id;
|
|
|
$aChilds[] = $first_parent_id;
|
|
$aChilds[] = $first_parent_id;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
$childs = \App\Models\Causal::where('parent_id', $id)->get();
|
|
$childs = \App\Models\Causal::where('parent_id', $id)->get();
|
|
|
- foreach($childs as $child)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ foreach ($childs as $child) {
|
|
|
$aChilds[] = $child->id;
|
|
$aChilds[] = $child->id;
|
|
|
$childs2 = \App\Models\Causal::where('parent_id', $child->id)->get();
|
|
$childs2 = \App\Models\Causal::where('parent_id', $child->id)->get();
|
|
|
- foreach($childs2 as $child2)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ foreach ($childs2 as $child2) {
|
|
|
$aChilds[] = $child2->id;
|
|
$aChilds[] = $child2->id;
|
|
|
$childs3 = \App\Models\Causal::where('parent_id', $child2->id)->get();
|
|
$childs3 = \App\Models\Causal::where('parent_id', $child2->id)->get();
|
|
|
- foreach($childs3 as $child3)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ foreach ($childs3 as $child3) {
|
|
|
$aChilds[] = $child3->id;
|
|
$aChilds[] = $child3->id;
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
return $aChilds;
|
|
return $aChilds;
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@@ -189,10 +180,8 @@ class RecordINOUT extends Component
|
|
|
|
|
|
|
|
$exclude_from_records = \App\Models\Member::where('exclude_from_records', true)->pluck('id')->toArray();
|
|
$exclude_from_records = \App\Models\Member::where('exclude_from_records', true)->pluck('id')->toArray();
|
|
|
|
|
|
|
|
- if (sizeof($this->datas) > 0)
|
|
|
|
|
- {
|
|
|
|
|
- foreach($this->datas as $filter)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ if (sizeof($this->datas) > 0) {
|
|
|
|
|
+ foreach ($this->datas as $filter) {
|
|
|
$this->columns[] = $filter;
|
|
$this->columns[] = $filter;
|
|
|
|
|
|
|
|
$f = $filter;
|
|
$f = $filter;
|
|
@@ -201,24 +190,22 @@ class RecordINOUT extends Component
|
|
|
$records = \App\Models\Record::where('type', 'IN')
|
|
$records = \App\Models\Record::where('type', 'IN')
|
|
|
->join('records_rows', 'records.id', '=', 'records_rows.record_id')
|
|
->join('records_rows', 'records.id', '=', 'records_rows.record_id')
|
|
|
->whereNotIn('records_rows.causal_id', $this->excludeCausals)
|
|
->whereNotIn('records_rows.causal_id', $this->excludeCausals)
|
|
|
- ->where(function ($query) {
|
|
|
|
|
|
|
+ ->where(function ($query) {
|
|
|
$query->where('deleted', false)->orWhere('deleted', null);
|
|
$query->where('deleted', false)->orWhere('deleted', null);
|
|
|
})
|
|
})
|
|
|
- ->where(function ($query) {
|
|
|
|
|
|
|
+ ->where(function ($query) {
|
|
|
$query->where('financial_movement', false)->orWhere('financial_movement', null);
|
|
$query->where('financial_movement', false)->orWhere('financial_movement', null);
|
|
|
})
|
|
})
|
|
|
->whereNotIn('member_id', $exclude_from_records)
|
|
->whereNotIn('member_id', $exclude_from_records)
|
|
|
->where('records_rows.when', 'like', '%"' . $f . '"%')
|
|
->where('records_rows.when', 'like', '%"' . $f . '"%')
|
|
|
->get();
|
|
->get();
|
|
|
|
|
|
|
|
- //Log::info('Record In' . $records);
|
|
|
|
|
- foreach($records as $record)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ //Log::info('Record In' . $records);
|
|
|
|
|
+ foreach ($records as $record) {
|
|
|
$amount = $record->amount;
|
|
$amount = $record->amount;
|
|
|
$amount += getVatValue($amount, $record->vat_id);
|
|
$amount += getVatValue($amount, $record->vat_id);
|
|
|
$when = sizeof(json_decode($record->when));
|
|
$when = sizeof(json_decode($record->when));
|
|
|
- if ($when > 1)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ if ($when > 1) {
|
|
|
$amount = $amount / $when;
|
|
$amount = $amount / $when;
|
|
|
$record->amount = $amount;
|
|
$record->amount = $amount;
|
|
|
}
|
|
}
|
|
@@ -231,25 +218,23 @@ class RecordINOUT extends Component
|
|
|
$this->updateParent("IN", $record->causal_id, $amount, $filter);
|
|
$this->updateParent("IN", $record->causal_id, $amount, $filter);
|
|
|
}
|
|
}
|
|
|
$records = \App\Models\Record::where('type', 'OUT')
|
|
$records = \App\Models\Record::where('type', 'OUT')
|
|
|
- ->join('records_rows', 'records.id', '=', 'records_rows.record_id')
|
|
|
|
|
- ->whereNotIn('records_rows.causal_id', $this->excludeCausals)
|
|
|
|
|
- ->where(function ($query) {
|
|
|
|
|
- $query->where('deleted', false)->orWhere('deleted', null);
|
|
|
|
|
- })
|
|
|
|
|
|
|
+ ->join('records_rows', 'records.id', '=', 'records_rows.record_id')
|
|
|
|
|
+ ->whereNotIn('records_rows.causal_id', $this->excludeCausals)
|
|
|
|
|
+ ->where(function ($query) {
|
|
|
|
|
+ $query->where('deleted', false)->orWhere('deleted', null);
|
|
|
|
|
+ })
|
|
|
|
|
|
|
|
- ->where(function ($query) use ($exclude_from_records) {
|
|
|
|
|
- $query->whereNull('member_id')
|
|
|
|
|
- ->orWhereNotIn('member_id', $exclude_from_records);
|
|
|
|
|
- })
|
|
|
|
|
- ->where('records_rows.when', 'like', '%"' . $f . '"%')->get();
|
|
|
|
|
|
|
+ ->where(function ($query) use ($exclude_from_records) {
|
|
|
|
|
+ $query->whereNull('member_id')
|
|
|
|
|
+ ->orWhereNotIn('member_id', $exclude_from_records);
|
|
|
|
|
+ })
|
|
|
|
|
+ ->where('records_rows.when', 'like', '%"' . $f . '"%')->get();
|
|
|
Log::info('Record Out' . $records);
|
|
Log::info('Record Out' . $records);
|
|
|
- foreach($records as $record)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ foreach ($records as $record) {
|
|
|
$amount = $record->amount;
|
|
$amount = $record->amount;
|
|
|
$amount += getVatValue($amount, $record->vat_id);
|
|
$amount += getVatValue($amount, $record->vat_id);
|
|
|
$when = sizeof(json_decode($record->when));
|
|
$when = sizeof(json_decode($record->when));
|
|
|
- if ($when > 1)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ if ($when > 1) {
|
|
|
$amount = $amount / $when;
|
|
$amount = $amount / $when;
|
|
|
$record->amount = $amount;
|
|
$record->amount = $amount;
|
|
|
}
|
|
}
|
|
@@ -260,23 +245,18 @@ class RecordINOUT extends Component
|
|
|
$this->records_out[$filter][$record->causal_id] = $amount;
|
|
$this->records_out[$filter][$record->causal_id] = $amount;
|
|
|
$this->updateParent("OUT", $record->causal_id, $amount, $filter);
|
|
$this->updateParent("OUT", $record->causal_id, $amount, $filter);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
//$this->showData = true;
|
|
//$this->showData = true;
|
|
|
$this->emit('load-table');
|
|
$this->emit('load-table');
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public function updateParent($type, $causal_id, $amount, $filter)
|
|
public function updateParent($type, $causal_id, $amount, $filter)
|
|
|
{
|
|
{
|
|
|
- if ($type == "IN")
|
|
|
|
|
- {
|
|
|
|
|
- foreach($this->rows_in as $r)
|
|
|
|
|
- {
|
|
|
|
|
- if ($r["id"] == $causal_id)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ if ($type == "IN") {
|
|
|
|
|
+ foreach ($this->rows_in as $r) {
|
|
|
|
|
+ if ($r["id"] == $causal_id) {
|
|
|
if (isset($this->records_in[$filter][$r["parent_id"]]))
|
|
if (isset($this->records_in[$filter][$r["parent_id"]]))
|
|
|
$this->records_in[$filter][$r["parent_id"]] += $amount;
|
|
$this->records_in[$filter][$r["parent_id"]] += $amount;
|
|
|
else
|
|
else
|
|
@@ -286,12 +266,9 @@ class RecordINOUT extends Component
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- if ($type == "OUT")
|
|
|
|
|
- {
|
|
|
|
|
- foreach($this->rows_out as $r)
|
|
|
|
|
- {
|
|
|
|
|
- if ($r["id"] == $causal_id)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ if ($type == "OUT") {
|
|
|
|
|
+ foreach ($this->rows_out as $r) {
|
|
|
|
|
+ if ($r["id"] == $causal_id) {
|
|
|
if (isset($this->records_out[$filter][$r["parent_id"]]))
|
|
if (isset($this->records_out[$filter][$r["parent_id"]]))
|
|
|
$this->records_out[$filter][$r["parent_id"]] += $amount;
|
|
$this->records_out[$filter][$r["parent_id"]] += $amount;
|
|
|
else
|
|
else
|
|
@@ -305,12 +282,9 @@ class RecordINOUT extends Component
|
|
|
|
|
|
|
|
public function updateParentYear($type, $causal_id, $amount, $filter, &$records_in, &$records_out)
|
|
public function updateParentYear($type, $causal_id, $amount, $filter, &$records_in, &$records_out)
|
|
|
{
|
|
{
|
|
|
- if ($type == "IN")
|
|
|
|
|
- {
|
|
|
|
|
- foreach($this->rows_in as $r)
|
|
|
|
|
- {
|
|
|
|
|
- if ($r["id"] == $causal_id)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ if ($type == "IN") {
|
|
|
|
|
+ foreach ($this->rows_in as $r) {
|
|
|
|
|
+ if ($r["id"] == $causal_id) {
|
|
|
if (isset($records_in[$filter][$r["parent_id"]]))
|
|
if (isset($records_in[$filter][$r["parent_id"]]))
|
|
|
$records_in[$filter][$r["parent_id"]] += $amount;
|
|
$records_in[$filter][$r["parent_id"]] += $amount;
|
|
|
else
|
|
else
|
|
@@ -320,12 +294,9 @@ class RecordINOUT extends Component
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- if ($type == "OUT")
|
|
|
|
|
- {
|
|
|
|
|
- foreach($this->rows_out as $r)
|
|
|
|
|
- {
|
|
|
|
|
- if ($r["id"] == $causal_id)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ if ($type == "OUT") {
|
|
|
|
|
+ foreach ($this->rows_out as $r) {
|
|
|
|
|
+ if ($r["id"] == $causal_id) {
|
|
|
if (isset($records_out[$filter][$r["parent_id"]]))
|
|
if (isset($records_out[$filter][$r["parent_id"]]))
|
|
|
$records_out[$filter][$r["parent_id"]] += $amount;
|
|
$records_out[$filter][$r["parent_id"]] += $amount;
|
|
|
else
|
|
else
|
|
@@ -340,8 +311,7 @@ class RecordINOUT extends Component
|
|
|
public function getCausal($causal)
|
|
public function getCausal($causal)
|
|
|
{
|
|
{
|
|
|
$ret = '';
|
|
$ret = '';
|
|
|
- if ($causal > 0)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ if ($causal > 0) {
|
|
|
$ret = \App\Models\Causal::findOrFail($causal)->getTree();
|
|
$ret = \App\Models\Causal::findOrFail($causal)->getTree();
|
|
|
}
|
|
}
|
|
|
return $ret;
|
|
return $ret;
|
|
@@ -415,7 +385,7 @@ class RecordINOUT extends Component
|
|
|
|
|
|
|
|
if (sizeof($this->datas) > 1)
|
|
if (sizeof($this->datas) > 1)
|
|
|
array_splice($this->datas, $idx, 1);
|
|
array_splice($this->datas, $idx, 1);
|
|
|
- //unset($this->datas[$idx]);
|
|
|
|
|
|
|
+ //unset($this->datas[$idx]);
|
|
|
else
|
|
else
|
|
|
$this->datas = array();
|
|
$this->datas = array();
|
|
|
|
|
|
|
@@ -427,25 +397,34 @@ class RecordINOUT extends Component
|
|
|
|
|
|
|
|
$rows_in = array();
|
|
$rows_in = array();
|
|
|
|
|
|
|
|
- if ($this->filterCausalsIn != null && sizeof($this->filterCausalsIn) > 0)
|
|
|
|
|
- {
|
|
|
|
|
- foreach($this->rows_in as $r)
|
|
|
|
|
- {
|
|
|
|
|
- if (in_array($r["id"], $this->filterCausalsIn) || in_array($r["parent_id"], $this->filterCausalsIn) || in_array($r["first_parent_id"], $this->filterCausalsIn))
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ if ($this->filterCausalsIn != null && sizeof($this->filterCausalsIn) > 0) {
|
|
|
|
|
+ foreach ($this->rows_in as $r) {
|
|
|
|
|
+ if (in_array($r["id"], $this->filterCausalsIn) || in_array($r["parent_id"], $this->filterCausalsIn) || in_array($r["first_parent_id"], $this->filterCausalsIn)) {
|
|
|
$rows_in[] = $r;
|
|
$rows_in[] = $r;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- }
|
|
|
|
|
- else
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ } else {
|
|
|
$rows_in = $this->rows_in;
|
|
$rows_in = $this->rows_in;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
- $path = $this->generateExcel($this->columns, $rows_in, $this->records_in, $this->rows_out, $this->records_out,false);
|
|
|
|
|
-
|
|
|
|
|
- return response()->download($path)->deleteFileAfterSend();
|
|
|
|
|
-
|
|
|
|
|
|
|
+ $result = $this->generateExcel($this->columns, $rows_in, $this->records_in, $this->rows_out, $this->records_out, false);
|
|
|
|
|
+
|
|
|
|
|
+ if ($result['storage_type'] === 's3') {
|
|
|
|
|
+ try {
|
|
|
|
|
+ $disk = Storage::disk('wasabi');
|
|
|
|
|
+ $downloadUrl = $disk->temporaryUrl($result['path'], now()->addHour());
|
|
|
|
|
+
|
|
|
|
|
+ return redirect($downloadUrl);
|
|
|
|
|
+ } catch (\Exception $e) {
|
|
|
|
|
+ Log::error('Error generating S3 download URL for export', [
|
|
|
|
|
+ 'error' => $e->getMessage(),
|
|
|
|
|
+ 'path' => $result['path']
|
|
|
|
|
+ ]);
|
|
|
|
|
+ session()->flash('error', 'Errore durante la generazione del link di download. Riprova.');
|
|
|
|
|
+ return back();
|
|
|
|
|
+ }
|
|
|
|
|
+ } else {
|
|
|
|
|
+ return response()->download($result['path'])->deleteFileAfterSend();
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public function exportYear($year)
|
|
public function exportYear($year)
|
|
@@ -453,52 +432,43 @@ class RecordINOUT extends Component
|
|
|
$records_in = [];
|
|
$records_in = [];
|
|
|
$records_out = [];
|
|
$records_out = [];
|
|
|
$datas = [];
|
|
$datas = [];
|
|
|
- if (env('FISCAL_YEAR_MONTH_FROM', 1) > 1)
|
|
|
|
|
- {
|
|
|
|
|
- for($m=env('FISCAL_YEAR_MONTH_FROM', 1);$m<=12;$m++)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ if (env('FISCAL_YEAR_MONTH_FROM', 1) > 1) {
|
|
|
|
|
+ for ($m = env('FISCAL_YEAR_MONTH_FROM', 1); $m <= 12; $m++) {
|
|
|
$datas[] = $m . "-" . $year;
|
|
$datas[] = $m . "-" . $year;
|
|
|
}
|
|
}
|
|
|
- for($m=1;$m<=env('FISCAL_YEAR_MONTH_TO', 12);$m++)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ for ($m = 1; $m <= env('FISCAL_YEAR_MONTH_TO', 12); $m++) {
|
|
|
$datas[] = $m . "-" . ($year + 1);
|
|
$datas[] = $m . "-" . ($year + 1);
|
|
|
}
|
|
}
|
|
|
- }
|
|
|
|
|
- else
|
|
|
|
|
- {
|
|
|
|
|
- for($m=1;$m<=12;$m++)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ } else {
|
|
|
|
|
+ for ($m = 1; $m <= 12; $m++) {
|
|
|
$datas[] = $m . "-" . $year;
|
|
$datas[] = $m . "-" . $year;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
$exclude_from_records = \App\Models\Member::where('exclude_from_records', true)->pluck('id')->toArray();
|
|
$exclude_from_records = \App\Models\Member::where('exclude_from_records', true)->pluck('id')->toArray();
|
|
|
|
|
|
|
|
- foreach($datas as $filter)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ foreach ($datas as $filter) {
|
|
|
|
|
|
|
|
$columns[] = $filter;
|
|
$columns[] = $filter;
|
|
|
|
|
|
|
|
$records = \App\Models\Record::where('type', 'IN')
|
|
$records = \App\Models\Record::where('type', 'IN')
|
|
|
->join('records_rows', 'records.id', '=', 'records_rows.record_id')
|
|
->join('records_rows', 'records.id', '=', 'records_rows.record_id')
|
|
|
->whereNotIn('records_rows.causal_id', $this->excludeCausals)
|
|
->whereNotIn('records_rows.causal_id', $this->excludeCausals)
|
|
|
- ->where(function ($query) {
|
|
|
|
|
|
|
+ ->where(function ($query) {
|
|
|
$query->where('deleted', false)->orWhere('deleted', null);
|
|
$query->where('deleted', false)->orWhere('deleted', null);
|
|
|
})
|
|
})
|
|
|
- ->where(function ($query) {
|
|
|
|
|
|
|
+ ->where(function ($query) {
|
|
|
$query->where('financial_movement', false)->orWhere('financial_movement', null);
|
|
$query->where('financial_movement', false)->orWhere('financial_movement', null);
|
|
|
})
|
|
})
|
|
|
->whereNotIn('member_id', $exclude_from_records)
|
|
->whereNotIn('member_id', $exclude_from_records)
|
|
|
->where('records_rows.when', 'like', '%"' . $filter . '"%')->get();
|
|
->where('records_rows.when', 'like', '%"' . $filter . '"%')->get();
|
|
|
//$records = $records->orderBy('date', 'DESC')->get();
|
|
//$records = $records->orderBy('date', 'DESC')->get();
|
|
|
|
|
|
|
|
- foreach($records as $record)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ foreach ($records as $record) {
|
|
|
$amount = $record->amount;
|
|
$amount = $record->amount;
|
|
|
$amount += getVatValue($amount, $record->vat_id);
|
|
$amount += getVatValue($amount, $record->vat_id);
|
|
|
$when = sizeof(json_decode($record->when));
|
|
$when = sizeof(json_decode($record->when));
|
|
|
- if ($when > 1)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ if ($when > 1) {
|
|
|
$amount = $amount / $when;
|
|
$amount = $amount / $when;
|
|
|
$record->amount = $amount;
|
|
$record->amount = $amount;
|
|
|
}
|
|
}
|
|
@@ -514,21 +484,19 @@ class RecordINOUT extends Component
|
|
|
$records = \App\Models\Record::where('type', 'OUT')
|
|
$records = \App\Models\Record::where('type', 'OUT')
|
|
|
->join('records_rows', 'records.id', '=', 'records_rows.record_id')
|
|
->join('records_rows', 'records.id', '=', 'records_rows.record_id')
|
|
|
->whereNotIn('records_rows.causal_id', $this->excludeCausals)
|
|
->whereNotIn('records_rows.causal_id', $this->excludeCausals)
|
|
|
- ->where(function ($query) {
|
|
|
|
|
|
|
+ ->where(function ($query) {
|
|
|
$query->where('deleted', false)->orWhere('deleted', null);
|
|
$query->where('deleted', false)->orWhere('deleted', null);
|
|
|
})
|
|
})
|
|
|
->where(function ($query) use ($exclude_from_records) {
|
|
->where(function ($query) use ($exclude_from_records) {
|
|
|
$query->whereNull('member_id')
|
|
$query->whereNull('member_id')
|
|
|
- ->orWhereNotIn('member_id', $exclude_from_records);
|
|
|
|
|
|
|
+ ->orWhereNotIn('member_id', $exclude_from_records);
|
|
|
})
|
|
})
|
|
|
->where('records_rows.when', 'like', '%"' . $filter . '"%')->get();
|
|
->where('records_rows.when', 'like', '%"' . $filter . '"%')->get();
|
|
|
//$records = $records->orderBy('date', 'DESC')->get();
|
|
//$records = $records->orderBy('date', 'DESC')->get();
|
|
|
- foreach($records as $record)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ foreach ($records as $record) {
|
|
|
$amount = $record->amount;
|
|
$amount = $record->amount;
|
|
|
$when = sizeof(json_decode($record->when));
|
|
$when = sizeof(json_decode($record->when));
|
|
|
- if ($when > 1)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ if ($when > 1) {
|
|
|
$amount = $amount / $when;
|
|
$amount = $amount / $when;
|
|
|
$record->amount = $amount;
|
|
$record->amount = $amount;
|
|
|
}
|
|
}
|
|
@@ -539,12 +507,17 @@ class RecordINOUT extends Component
|
|
|
$records_out[$filter][$record->causal_id] = $amount;
|
|
$records_out[$filter][$record->causal_id] = $amount;
|
|
|
$this->updateParentYear("OUT", $record->causal_id, $amount, $filter, $records_in, $records_out);
|
|
$this->updateParentYear("OUT", $record->causal_id, $amount, $filter, $records_in, $records_out);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- $path = $this->generateExcel($columns, $this->rows_in, $records_in, $this->rows_out, $records_out, true);
|
|
|
|
|
- return response()->download($path)->deleteFileAfterSend();
|
|
|
|
|
|
|
+ $result = $this->generateExcel($columns, $this->rows_in, $records_in, $this->rows_out, $records_out, true);
|
|
|
|
|
|
|
|
|
|
+ if ($result['storage_type'] === 's3') {
|
|
|
|
|
+ $disk = Storage::disk('wasabi');
|
|
|
|
|
+ $downloadUrl = $disk->temporaryUrl($result['path'], now()->addHour());
|
|
|
|
|
+ return redirect($downloadUrl);
|
|
|
|
|
+ } else {
|
|
|
|
|
+ return response()->download($result['path'])->deleteFileAfterSend();
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public function generateExcel($columns, $rows_in, $records_in, $rows_out, $records_out, $isYearExport)
|
|
public function generateExcel($columns, $rows_in, $records_in, $rows_out, $records_out, $isYearExport)
|
|
@@ -555,8 +528,7 @@ class RecordINOUT extends Component
|
|
|
$activeWorksheet = $spreadsheet->getActiveSheet();
|
|
$activeWorksheet = $spreadsheet->getActiveSheet();
|
|
|
|
|
|
|
|
$activeWorksheet->setCellValue('A1', 'Entrate');
|
|
$activeWorksheet->setCellValue('A1', 'Entrate');
|
|
|
- foreach($columns as $idx => $column)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ foreach ($columns as $idx => $column) {
|
|
|
$activeWorksheet->setCellValue($letters[$idx + 1] . '1', $this->getMonth($column));
|
|
$activeWorksheet->setCellValue($letters[$idx + 1] . '1', $this->getMonth($column));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -567,17 +539,13 @@ class RecordINOUT extends Component
|
|
|
|
|
|
|
|
$totals = [];
|
|
$totals = [];
|
|
|
|
|
|
|
|
- foreach($rows_in as $in)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ foreach ($rows_in as $in) {
|
|
|
$activeWorksheet->setCellValue('A' . $count, str_repeat(" ", $in["level"]) . $in["name"]);
|
|
$activeWorksheet->setCellValue('A' . $count, str_repeat(" ", $in["level"]) . $in["name"]);
|
|
|
|
|
|
|
|
- foreach($columns as $idx => $column)
|
|
|
|
|
- {
|
|
|
|
|
- if(isset($records_in[$column][$in["id"]]))
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ foreach ($columns as $idx => $column) {
|
|
|
|
|
+ if (isset($records_in[$column][$in["id"]])) {
|
|
|
$activeWorksheet->setCellValue($letters[$idx + 1] . $count, formatPrice($records_in[$column][$in["id"]]));
|
|
$activeWorksheet->setCellValue($letters[$idx + 1] . $count, formatPrice($records_in[$column][$in["id"]]));
|
|
|
- if ($in["level"] == 0)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ if ($in["level"] == 0) {
|
|
|
if (isset($totals[$idx]))
|
|
if (isset($totals[$idx]))
|
|
|
$totals[$idx] += $records_in[$column][$in["id"]];
|
|
$totals[$idx] += $records_in[$column][$in["id"]];
|
|
|
else
|
|
else
|
|
@@ -586,30 +554,23 @@ class RecordINOUT extends Component
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if ($in["level"] == 0)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ if ($in["level"] == 0) {
|
|
|
$activeWorksheet->getStyle('A' . $count . ':N' . $count)->getFont()->setBold(true);
|
|
$activeWorksheet->getStyle('A' . $count . ':N' . $count)->getFont()->setBold(true);
|
|
|
- //$activeWorksheet->getStyle('A' . $count . ':N' . $count)->getFill()->setFillType(\PhpOffice\PhpSpreadsheet\Style\Fill::FILL_SOLID)->getStartColor()->setARGB('b1ed5c');
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
$count += 1;
|
|
$count += 1;
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
$activeWorksheet->setCellValue('A' . $count, 'Totale');
|
|
$activeWorksheet->setCellValue('A' . $count, 'Totale');
|
|
|
- foreach($totals as $idx => $total)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ foreach ($totals as $idx => $total) {
|
|
|
$activeWorksheet->setCellValue($letters[$idx + 1] . $count, formatPrice($total));
|
|
$activeWorksheet->setCellValue($letters[$idx + 1] . $count, formatPrice($total));
|
|
|
$activeWorksheet->getStyle('A' . $count . ':N' . $count)->getFont()->setBold(true);
|
|
$activeWorksheet->getStyle('A' . $count . ':N' . $count)->getFont()->setBold(true);
|
|
|
$activeWorksheet->getStyle('A' . $count . ':N' . $count)->getFill()->setFillType(\PhpOffice\PhpSpreadsheet\Style\Fill::FILL_SOLID)->getStartColor()->setARGB('C6E0B4'); // Lighter green
|
|
$activeWorksheet->getStyle('A' . $count . ':N' . $count)->getFill()->setFillType(\PhpOffice\PhpSpreadsheet\Style\Fill::FILL_SOLID)->getStartColor()->setARGB('C6E0B4'); // Lighter green
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
$count += 2;
|
|
$count += 2;
|
|
|
$activeWorksheet->setCellValue('A' . $count, "Uscite");
|
|
$activeWorksheet->setCellValue('A' . $count, "Uscite");
|
|
|
- foreach($columns as $idx => $column)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ foreach ($columns as $idx => $column) {
|
|
|
$activeWorksheet->setCellValue($letters[$idx + 1] . $count, $this->getMonth($column));
|
|
$activeWorksheet->setCellValue($letters[$idx + 1] . $count, $this->getMonth($column));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -620,17 +581,13 @@ class RecordINOUT extends Component
|
|
|
|
|
|
|
|
$totals = [];
|
|
$totals = [];
|
|
|
|
|
|
|
|
- foreach($rows_out as $out)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ foreach ($rows_out as $out) {
|
|
|
$activeWorksheet->setCellValue('A' . $count, str_repeat(" ", $out["level"]) . $out["name"]);
|
|
$activeWorksheet->setCellValue('A' . $count, str_repeat(" ", $out["level"]) . $out["name"]);
|
|
|
|
|
|
|
|
- foreach($columns as $idx => $column)
|
|
|
|
|
- {
|
|
|
|
|
- if(isset($records_out[$column][$out["id"]]))
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ foreach ($columns as $idx => $column) {
|
|
|
|
|
+ if (isset($records_out[$column][$out["id"]])) {
|
|
|
$activeWorksheet->setCellValue($letters[$idx + 1] . $count, formatPrice($records_out[$column][$out["id"]]));
|
|
$activeWorksheet->setCellValue($letters[$idx + 1] . $count, formatPrice($records_out[$column][$out["id"]]));
|
|
|
- if ($out["level"] == 0)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ if ($out["level"] == 0) {
|
|
|
if (isset($totals[$idx]))
|
|
if (isset($totals[$idx]))
|
|
|
$totals[$idx] += $records_out[$column][$out["id"]];
|
|
$totals[$idx] += $records_out[$column][$out["id"]];
|
|
|
else
|
|
else
|
|
@@ -639,19 +596,15 @@ class RecordINOUT extends Component
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if ($out["level"] == 0)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ if ($out["level"] == 0) {
|
|
|
$activeWorksheet->getStyle('A' . $count . ':N' . $count)->getFont()->setBold(true);
|
|
$activeWorksheet->getStyle('A' . $count . ':N' . $count)->getFont()->setBold(true);
|
|
|
- //$activeWorksheet->getStyle('A' . $count . ':N' . $count)->getFill()->setFillType(\PhpOffice\PhpSpreadsheet\Style\Fill::FILL_SOLID)->getStartColor()->setARGB('ed6d61');
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
$count += 1;
|
|
$count += 1;
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
$activeWorksheet->setCellValue('A' . $count, 'Totale');
|
|
$activeWorksheet->setCellValue('A' . $count, 'Totale');
|
|
|
- foreach($totals as $idx => $total)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ foreach ($totals as $idx => $total) {
|
|
|
$activeWorksheet->setCellValue($letters[$idx + 1] . $count, formatPrice($total));
|
|
$activeWorksheet->setCellValue($letters[$idx + 1] . $count, formatPrice($total));
|
|
|
$activeWorksheet->getStyle('A' . $count . ':N' . $count)->getFont()->setBold(true);
|
|
$activeWorksheet->getStyle('A' . $count . ':N' . $count)->getFont()->setBold(true);
|
|
|
$activeWorksheet->getStyle('A' . $count . ':N' . $count)->getFill()->setFillType(\PhpOffice\PhpSpreadsheet\Style\Fill::FILL_SOLID)->getStartColor()->setARGB('F8CBAD'); // Lighter red
|
|
$activeWorksheet->getStyle('A' . $count . ':N' . $count)->getFill()->setFillType(\PhpOffice\PhpSpreadsheet\Style\Fill::FILL_SOLID)->getStartColor()->setARGB('F8CBAD'); // Lighter red
|
|
@@ -659,17 +612,98 @@ class RecordINOUT extends Component
|
|
|
|
|
|
|
|
$activeWorksheet->getColumnDimension('A')->setWidth(35);
|
|
$activeWorksheet->getColumnDimension('A')->setWidth(35);
|
|
|
|
|
|
|
|
- for($i = 1; $i < count($letters); $i++) {
|
|
|
|
|
|
|
+ for ($i = 1; $i < count($letters); $i++) {
|
|
|
$activeWorksheet->getColumnDimension($letters[$i])->setWidth(20);
|
|
$activeWorksheet->getColumnDimension($letters[$i])->setWidth(20);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
$fileSuffix = $isYearExport ? 'AnnoFiscale' : 'Selezione';
|
|
$fileSuffix = $isYearExport ? 'AnnoFiscale' : 'Selezione';
|
|
|
|
|
+ $filename = date("Ymd") . '_Gestionale_' . $fileSuffix . '.xlsx';
|
|
|
|
|
+
|
|
|
|
|
+ try {
|
|
|
|
|
+ // Get current client for folder organization
|
|
|
|
|
+ $currentClient = session('currentClient', 'default');
|
|
|
|
|
+
|
|
|
|
|
+ // Create temporary file to write Excel data
|
|
|
|
|
+ $tempPath = sys_get_temp_dir() . '/' . $filename;
|
|
|
|
|
|
|
|
- $writer = new Xlsx($spreadsheet);
|
|
|
|
|
- $writer->save($path = storage_path(date("Ymd") .'_Gestionale_' . $fileSuffix . '.xlsx'));
|
|
|
|
|
|
|
+ // Write to temporary file
|
|
|
|
|
+ $writer = new Xlsx($spreadsheet);
|
|
|
|
|
+ $writer->save($tempPath);
|
|
|
|
|
|
|
|
- return $path;
|
|
|
|
|
|
|
+ // Get Wasabi disk
|
|
|
|
|
+ $disk = Storage::disk('wasabi');
|
|
|
|
|
|
|
|
|
|
+ // Create the S3 path (client folder + reports subfolder)
|
|
|
|
|
+ $s3Path = $currentClient . '/reports/' . $filename;
|
|
|
|
|
+
|
|
|
|
|
+ // Ensure the client reports folder exists
|
|
|
|
|
+ $reportsFolderPath = $currentClient . '/reports/.gitkeep';
|
|
|
|
|
+ if (!$disk->exists($reportsFolderPath)) {
|
|
|
|
|
+ $disk->put($reportsFolderPath, '');
|
|
|
|
|
+ Log::info("Created reports folder for client: {$currentClient}");
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ // Upload file to Wasabi S3
|
|
|
|
|
+ $fileContent = file_get_contents($tempPath);
|
|
|
|
|
+ $uploaded = $disk->put($s3Path, $fileContent, 'private');
|
|
|
|
|
+
|
|
|
|
|
+ if (!$uploaded) {
|
|
|
|
|
+ throw new \Exception('Failed to upload file to Wasabi S3');
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ Log::info("Management report uploaded to Wasabi", [
|
|
|
|
|
+ 'client' => $currentClient,
|
|
|
|
|
+ 'path' => $s3Path,
|
|
|
|
|
+ 'size' => filesize($tempPath),
|
|
|
|
|
+ 'type' => $fileSuffix
|
|
|
|
|
+ ]);
|
|
|
|
|
+
|
|
|
|
|
+ // Clean up temporary file
|
|
|
|
|
+ if (file_exists($tempPath)) {
|
|
|
|
|
+ unlink($tempPath);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ // Return S3 path for further processing or download URL generation
|
|
|
|
|
+ return [
|
|
|
|
|
+ 'success' => true,
|
|
|
|
|
+ 'path' => $s3Path,
|
|
|
|
|
+ 'local_path' => null,
|
|
|
|
|
+ 'storage_type' => 's3'
|
|
|
|
|
+ ];
|
|
|
|
|
+ } catch (\Exception $e) {
|
|
|
|
|
+ Log::error('Error uploading management report to Wasabi S3', [
|
|
|
|
|
+ 'error' => $e->getMessage(),
|
|
|
|
|
+ 'client' => session('currentClient', 'unknown'),
|
|
|
|
|
+ 'filename' => $filename
|
|
|
|
|
+ ]);
|
|
|
|
|
+
|
|
|
|
|
+ // Fallback to local storage if S3 fails
|
|
|
|
|
+ $currentClient = session('currentClient', 'default');
|
|
|
|
|
+ $clientFolder = storage_path('app/reports/' . $currentClient);
|
|
|
|
|
+
|
|
|
|
|
+ // Ensure client folder exists
|
|
|
|
|
+ if (!is_dir($clientFolder)) {
|
|
|
|
|
+ mkdir($clientFolder, 0755, true);
|
|
|
|
|
+ Log::info("Created local client reports folder: {$clientFolder}");
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ $localPath = $clientFolder . '/' . $filename;
|
|
|
|
|
+ $writer = new Xlsx($spreadsheet);
|
|
|
|
|
+ $writer->save($localPath);
|
|
|
|
|
+
|
|
|
|
|
+ Log::warning("Management report saved locally due to S3 error", [
|
|
|
|
|
+ 'client' => $currentClient,
|
|
|
|
|
+ 'local_path' => $localPath,
|
|
|
|
|
+ 'error' => $e->getMessage()
|
|
|
|
|
+ ]);
|
|
|
|
|
+
|
|
|
|
|
+ // Return local path for backward compatibility
|
|
|
|
|
+ return [
|
|
|
|
|
+ 'success' => true,
|
|
|
|
|
+ 'path' => $localPath,
|
|
|
|
|
+ 'local_path' => $localPath,
|
|
|
|
|
+ 'storage_type' => 'local'
|
|
|
|
|
+ ];
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|