loviuz/openstamanager
loviuz/openstamanager
1
0
Fork 0
mirror of https://github.com/devcode-it/openstamanager.git synced 2025-02-21 14:00:53 +01:00
Code Issues Releases Activity

Miglioramenti minori in elenco Movimenti Articoli

Browse Source
This commit is contained in:
Dasc3er 2021-09-17 11:17:33 +02:00
parent 5a9ab741b1
commit bd1da38d3f
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/articoli/plugins/articoli.movimenti.php
View File

@ -128,7 +128,7 @@ if (!empty($movimenti)) {
if (Auth::admin() && $movimento->isManuale()) { if (Auth::admin() && $movimento->isManuale()) {
echo ' echo '
<a class="btn btn-danger btn-xs ask" data-backto="record-edit" data-op="delmovimento" data-idmovimento="'.$movimento['idmovimento'].'"> <a class="btn btn-danger btn-xs ask" data-backto="record-edit" data-op="delmovimento" data-idmovimento="'.$movimento['id'].'">
<i class="fa fa-trash"></i> <i class="fa fa-trash"></i>
</a>'; </a>';
} }

14
modules/articoli/src/Articolo.php
View File

@ -257,11 +257,17 @@ class Articolo extends Model
* *
* @return \Illuminate\Database\Eloquent\Relations\HasMany|\Illuminate\Database\Query\Builder * @return \Illuminate\Database\Eloquent\Relations\HasMany|\Illuminate\Database\Query\Builder
*/ */
public function movimentiComposti() public function movimentiComposti($mostra_vuoti = false)
{ {
return $this->movimenti() $movimenti = $this->movimenti()
->selectRaw('*, mg_movimenti.id AS idmovimento, mg_movimenti.created_at AS data_movimento, sum(mg_movimenti.qta) as qta_documento, IFNULL(mg_movimenti.reference_type, mg_movimenti.id) as tipo_gruppo') ->selectRaw('*, mg_movimenti.created_at AS data_movimento, SUM(mg_movimenti.qta) as qta_documento, IFNULL(mg_movimenti.reference_type, mg_movimenti.id) as tipo_gruppo')
->groupBy('tipo_gruppo', 'mg_movimenti.reference_id'); ->groupBy(['tipo_gruppo', 'mg_movimenti.reference_id']);
if (!empty($mostra_vuoti)){
return $movimenti;
}
return $movimenti->havingRaw('mg_movimenti.reference_type IS NULL OR qta_documento != 0');
} }
public function categoria() public function categoria()