Merge branch 'master' into aggregations

madbob · Aug 4, 2024 · efaac73 · efaac73
2 parents bba0d4b + c70b4ca
commit efaac73
Show file tree

Hide file tree

Showing 48 changed files with 580 additions and 167 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+github: madbob
+custom: 'https://www.paypal.me/m4db0b'
diff --git a/code/app/Booking.php b/code/app/Booking.php
@@ -93,6 +93,11 @@ public function payment(): BelongsTo
         return $this->belongsTo(Movement::class);
     }
 
+    public function receipts(): BelongsToMany
+    {
+        return $this->belongsToMany('App\Receipt');
+    }
+
     /*
         Con questo scope si caricano le relazioni utilizzate per il calcolo dei
         modificatori.

diff --git a/code/app/Console/Commands/CloseOrders.php b/code/app/Console/Commands/CloseOrders.php
@@ -3,6 +3,7 @@
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
+use Carbon\Carbon;
 
 use App\Jobs\NotifyClosedOrder;
 use App\Order;
@@ -14,22 +15,33 @@ class CloseOrders extends Command
 
     public function handle()
     {
-        $orders = Order::withoutGlobalScopes()->where('status', 'open')->where('end', '<', date('Y-m-d'))->get();
-        $closed = [];
+        $today = Carbon::today()->format('Y-m-d');
+        $orders = Order::withoutGlobalScopes()->where('status', 'open')->where('end', '<', $today)->get();
+        $notifications = [];
 
         foreach($orders as $order) {
             try {
                 $order->status = 'closed';
                 $order->save();
-                $closed[] = $order->id;
+
+                foreach($order->aggregate->gas as $gas) {
+                    if (isset($notifications[$gas->id]) == false) {
+                        $notifications[$gas->id] = [];
+                    }
+
+                    $notifications[$gas->id][] = $order->id;
+                }
             }
             catch(\Exception $e) {
                 \Log::error('Errore in chiusura automatica ordine: ' . $e->getMessage());
             }
         }
 
-        if (empty($closed) == false) {
-            NotifyClosedOrder::dispatch($closed);
+        $hub = app()->make('GlobalScopeHub');
+
+        foreach($notifications as $gas_id => $orders) {
+            $hub->setGas($gas_id);
+            NotifyClosedOrder::dispatch($orders);
         }
     }
 }
diff --git a/code/app/Console/Commands/RemindOrders.php b/code/app/Console/Commands/RemindOrders.php
@@ -46,9 +46,12 @@ public function handle()
 			}
 		}
 
+        $hub = app()->make('GlobalScopeHub');
+
         foreach($notifications as $gas_id => $orders) {
             Log::info('Invio promemoria per ordini ' . join(', ', $orders));
-            NotifyRemindOrder::dispatch($gas_id, $orders);
+            $hub->setGas($gas_id);
+            NotifyRemindOrder::dispatch($orders);
         }
 
 		$gas = Gas::all();

diff --git a/code/app/Formatters/User.php b/code/app/Formatters/User.php
@@ -98,6 +98,20 @@ private static function columnsByType($ret, $type)
 					return $obj->member_since;
 				},
 			];
+
+            $ret['birthplace'] = (object) [
+				'name' => _i('Luogo di Nascita'),
+				'format' => function($obj, $context) {
+					return $obj->birthplace;
+				},
+			];
+
+            $ret['birthday'] = (object) [
+				'name' => _i('Data di Nascita'),
+				'format' => function($obj, $context) {
+					return $obj->birthday;
+				},
+			];
         }
 
         return $ret;

diff --git a/code/app/Helpers/Components.php b/code/app/Helpers/Components.php
@@ -236,6 +236,19 @@ function formatMainFormButtons($component, $params)
         }
 
         $params['buttons'] = $buttons;
+
+        if (isset($params['appendNodes']) == false) {
+            $params['appendNodes'] = [];
+        }
+
+        $params['appendNodes'][] = sprintf('<div class="fixed-bottom bg-danger p-2 bottom-helper" hidden>
+            <div class="row justify-content-end align-items-center">
+                <div class="col-auto text-white">%s</div>
+                <div class="col-auto">
+                    <button class="btn btn-success" type="submit">%s</button>
+                </div>
+            </div>
+        </div>', _i('Ricorda di cliccare il tasto "Salva" quando hai finito!'), _i('Salva'));
     }
 
     unset($params['attributes']['other_buttons'], $params['attributes']['nodelete'], $params['attributes']['nosave']);

diff --git a/code/app/Http/Controllers/MailController.php b/code/app/Http/Controllers/MailController.php
@@ -56,41 +56,6 @@ private function registerBounce($event, $email, $message)
         }
     }
 
-    public function postStatusSES(Request $request)
-    {
-		if (env('MAIL_MAILER') == 'ses') {
-	        $message = Message::fromRawPostData();
-	        $validator = new MessageValidator();
-
-	        try {
-	            $validator->validate($message);
-	        }
-	        catch (InvalidSnsMessageException $e) {
-	            Log::error('SNS Message Validation Error: ' . $e->getMessage());
-	            abort(404);
-	        }
-
-	        if ($message['Type'] === 'SubscriptionConfirmation') {
-	            Http::get($message['SubscribeURL']);
-	        }
-	        else if ($message['Type'] === 'Notification') {
-	            $data = json_decode($message['Message']);
-                $event = $data->notificationType;
-
-	            if ($event == 'Bounce') {
-					try {
-						$email = $data->bounce->bouncedRecipients[0]->emailAddress;
-			            $message = $data->bounce->bouncedRecipients[0]->diagnosticCode ?? '???';
-		                $this->registerBounce($event, $email, $message);
-					}
-					catch(\Exception $e) {
-						Log::error('Notifica SNS illeggibile: ' . $e->getMessage() . ' - ' . print_r($data, true));
-					}
-	            }
-	        }
-		}
-    }
-
 	public function postStatusSendinblue(Request $request)
 	{
 		if (env('MAIL_MAILER') == 'sendinblue') {
@@ -120,4 +85,47 @@ public function postStatusSendinblue(Request $request)
 			}
 		}
 	}
+
+    public function postStatusScaleway(Request $request)
+    {
+        if (env('MAIL_MAILER') == 'scaleway') {
+            $api_endpoint = 'https://api.scaleway.com/transactional-email/v1alpha1/regions/fr-par/webhooks';
+
+            $message = Message::fromRawPostData();
+            $validator = new MessageValidator();
+
+            try {
+                $validator->validate($message);
+            }
+            catch (InvalidSnsMessageException $e) {
+                Log::error('SNS Message Validation Error: ' . $e->getMessage());
+                abort(404);
+            }
+
+            try {
+                $body = json_decode($request->getContent());
+
+                if ($body) {
+                    /*
+                        Per automatizzare la procedura di conferma della
+                        registrazione del webhook
+                    */
+                    if (isset($body->SubscribeURL)) {
+                        @file_get_contents($body->SubscribeURL);
+                        return;
+                    }
+                    else {
+                        $payload = json_decode($body->Message);
+                        $event = $payload->type;
+                        $email = $payload->email_to;
+                        $message = $payload->email_error;
+                        $this->registerBounce($event, $email, $message);
+                    }
+                }
+            }
+            catch(\Exception $e) {
+                Log::error('Notifica Scaleway illeggibile: ' . $e->getMessage() . ' - ' . print_r($request->all(), true));
+            }
+		}
+    }
 }
diff --git a/code/app/Http/Controllers/MovementsController.php b/code/app/Http/Controllers/MovementsController.php
@@ -95,19 +95,20 @@ private function exportMain($format, $movements)
 		$filename = sanitizeFilename(_i('Esportazione movimenti GAS %s.%s', [date('d/m/Y'), $format]));
 
 		if ($format == 'csv') {
-			$headers = [_i('Data Registrazione'), _i('Data Movimento'), _i('Tipo'), _i('Pagamento'), _i('Pagante'), _i('Pagato'), _i('Valore'), _i('Note')];
+			$headers = [_i('Data Registrazione'), _i('Data Movimento'), _i('Tipo'), _i('Pagamento'), _i('Identificativo'), _i('Pagante'), _i('Pagato'), _i('Valore'), _i('Note')];
 
 			return output_csv($filename, $headers, $movements, function($mov) {
-				$row = [];
-				$row[] = $mov->registration_date;
-				$row[] = $mov->date;
-				$row[] = $mov->printableType();
-				$row[] = $mov->printablePayment();
-				$row[] = $mov->sender ? $mov->sender->printableName() : '';
-				$row[] = $mov->target ? $mov->target->printableName() : '';
-				$row[] = printablePrice($mov->amount);
-				$row[] = $mov->notes;
-				return $row;
+                $row = [];
+                $row[] = $mov->registration_date;
+                $row[] = $mov->date;
+                $row[] = $mov->printableType();
+                $row[] = $mov->printablePayment();
+                $row[] = $mov->identifier;
+                $row[] = $mov->sender ? $mov->sender->printableName() : '';
+                $row[] = $mov->target ? $mov->target->printableName() : '';
+                $row[] = printablePrice($mov->amount);
+                $row[] = $mov->notes;
+                return $row;
 			});
 		}
 		else if ($format == 'pdf') {

diff --git a/code/app/Http/Controllers/OrdersController.php b/code/app/Http/Controllers/OrdersController.php
@@ -184,6 +184,12 @@ private function oldOrders($user)
         return easyFilterOrders($supplier_id, '1970-01-01', date('Y-m-d', strtotime('-1 years')), ['open', 'closed']);
     }
 
+    public function noDestroyNotice(Request $request, $id)
+    {
+        $order = $this->service->show($id, true);
+        return view('order.partials.nodestroy', ['order' => $order]);
+    }
+
     /*
         Questa funzione è usata per aggiornare manualmente le quantità
         di un certo prodotto all'interno di un ordine

diff --git a/code/app/Http/Controllers/ReceiptsController.php b/code/app/Http/Controllers/ReceiptsController.php
@@ -22,13 +22,21 @@ public function __construct(ReceiptsService $service)
         ]);
     }
 
+    private function filterByUser($request)
+    {
+        return $request->input('user_id', '0');
+    }
+
 	public function index(Request $request)
 	{
 		$past = date('Y-m-d', strtotime('-1 months'));
 		$future = date('Y-m-d', strtotime('+10 years'));
-		$receipts = $this->service->list($past, $future, 0);
+        $user_id = $this->filterByUser($request);
+		$receipts = $this->service->list($past, $future, 0, $user_id);
+
 		return view('receipt.index', [
 			'receipts' => $receipts,
+            'user_id' => $user_id,
 		]);
 	}
 
@@ -40,7 +48,7 @@ public function show(Request $request, $id)
         if ($user->can('movements.admin', $user->gas)) {
             return view('receipt.edit', ['receipt' => $receipt]);
         }
-        else if ($user->can('movements.view', $user->gas)) {
+        else if ($user->can('movements.view', $user->gas) || $receipt->user->id == $user->id) {
             return view('receipt.show', ['receipt' => $receipt]);
         }
         else {
@@ -50,7 +58,7 @@ public function show(Request $request, $id)
 
     private function testAccess($user, $receipt)
     {
-        if ($user->can('movements.admin', $user->gas) || $user->can('movements.view', $user->gas) || $receipt->user_id == $user->id) {
+        if ($user->can('movements.admin', $user->gas) || $user->can('movements.view', $user->gas) || $receipt->user->id == $user->id) {
             return true;
         }
         else {
@@ -120,14 +128,14 @@ private function outputCSV($elements)
 
     private function send($elements): void
     {
-        foreach($elements as $receipt) {
-            if ($receipt->mailed == false) {
-                try {
-                    $this->sendByMail($receipt);
-                }
-                catch(\Exception $e) {
-                    \Log::error('Errore in inoltro ricevuta: ' . $e->getMessage());
-                }
+        $to_send = $elements->filter(fn($r) => $r->mailed == false);
+
+        foreach($to_send as $receipt) {
+            try {
+                $this->sendByMail($receipt);
+            }
+            catch(\Exception $e) {
+                \Log::error('Errore in inoltro ricevuta: ' . $e->getMessage());
             }
         }
     }
@@ -136,8 +144,9 @@ public function search(Request $request)
 	{
 		$start = decodeDate($request->input('startdate'));
 		$end = decodeDate($request->input('enddate'));
-		$supplier_id = $request->input('supplier_id');
-		$elements = $this->service->list($start, $end, $supplier_id);
+		$supplier_id = $request->input('supplier_id', '0');
+        $user_id = $this->filterByUser($request);
+		$elements = $this->service->list($start, $end, $supplier_id, $user_id);
 
 		$format = $request->input('format', 'none');
 

diff --git a/code/app/Http/Controllers/UsersController.php b/code/app/Http/Controllers/UsersController.php
@@ -29,6 +29,18 @@ public function index(Request $request)
         return $this->easyExecute(function() use ($request) {
             $user = $request->user();
             $users = $this->service->list('', $user->can('users.admin', $user->gas));
+
+            /*
+                Il grosso collo di bottiglia nell'enumerazione degli utenti è
+                il recupero sullo stato del saldo di ciascuno, da cui dipendono
+                poi icone e filtri.
+                Qui pre-carico il saldo corrente di ognuno, premesso che nella
+                funzione CreditableTrait::currentBalance() verifico che
+                effettivamente esista o se è necessario allocare un nuovo saldo
+                corrente
+            */
+            $users->loadMissing(['balances' => fn($query) => $query->where('current', true)]);
+
             return view('pages.users', ['users' => $users]);
         });
     }
@@ -94,6 +106,11 @@ public function export(Request $request)
         $headers = UserFormatter::getHeaders($fields);
         $users = $this->service->list('', true);
 
+        if ($request->input('exportables') == 'selected') {
+            $selected = $request->input('users', []);
+            $users = $users->filter(fn($u) => in_array($u->id, $selected));
+        }
+
         return output_csv(_i('utenti.csv'), $headers, $users, function($user) use ($fields) {
             return UserFormatter::format($user, $fields);
         });

diff --git a/code/app/Jobs/NotifyNewOrder.php b/code/app/Jobs/NotifyNewOrder.php
@@ -26,7 +26,13 @@ public function handle()
     {
         $order = Order::find($this->order_id);
 
-        if (is_null($order) || is_null($order->first_notify) == false) {
+        if (is_null($order)) {
+            \Log::warning('Richiesta notifica creazione ordine non esistente');
+            return;
+        }
+
+        if (is_null($order->first_notify) == false) {
+            \Log::warning('Richiesta notifica creazione ordine già inoltrata');
             return;
         }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		github: madbob
		custom: 'https://www.paypal.me/m4db0b'