diff --git a/app/Models/Movimenti.php b/app/Models/Movimenti.php index 2a47ddc..f2aa5dc 100644 --- a/app/Models/Movimenti.php +++ b/app/Models/Movimenti.php @@ -151,9 +151,9 @@ public function ContoA() public static function reportSpesa($year,$month) { return DB::table('movimentis') - ->selectRaw('ABS(Sum(movimentis.mov_importo)) as resoconto, categories.cat_name,categories.id') + ->selectRaw('ABS(Sum(movimentis.mov_importo_dare)) as resoconto, categories.cat_name,categories.id') ->join('categories','movimentis.mov_fk_categoria','=','categories.id') - ->where('mov_importo','<',0) + // ->where('mov_importo_','<',0) ->whereYear('mov_data',$year) ->whereMonth('mov_data',$month) ->groupBy('cat_name','categories.id') @@ -162,9 +162,9 @@ public function ContoA() public static function reportEntrate($year,$month) { return DB::table('movimentis') - ->selectRaw('ABS(Sum(movimentis.mov_importo)) as resoconto, categories.cat_name,categories.id') + ->selectRaw('ABS(Sum(movimentis.mov_importo_avere)) as resoconto, categories.cat_name,categories.id') ->join('categories','movimentis.mov_fk_categoria','=','categories.id') - ->where('mov_importo','>',0) + //->where('mov_importo','>',0) ->whereYear('mov_data',$year) ->whereMonth('mov_data',$month) ->groupBy('cat_name','categories.id')