aggiustamenti minori

madbob · Nov 26, 2023 · e584dda · e584dda
1 parent 518589b
commit e584dda
Show file tree

Hide file tree

Showing 20 changed files with 387 additions and 264 deletions.
diff --git a/code/app/AggregateBooking.php b/code/app/AggregateBooking.php
@@ -3,6 +3,7 @@
 namespace App;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Collection;
 
 use App\Models\Concerns\TracksUpdater;
 use App\GASModel;
@@ -22,18 +23,19 @@ class AggregateBooking extends Model
     public $id;
     public $user;
     public $aggregate;
-    public $bookings = [];
+    public $bookings;
 
     public function __construct($user_id, $aggregate)
     {
         $this->id = $user_id;
         $this->user = User::withTrashed()->find($user_id);
         $this->aggregate = $aggregate;
+        $this->bookings = new Collection();
     }
 
     public function add($booking)
     {
-        $this->bookings[] = $booking;
+        $this->bookings->push($booking);
     }
 
     public function getCreatedAtAttribute()
@@ -176,12 +178,7 @@ public function getConvenientStringsAttribute()
     public function generateReceipt()
     {
         if ($this->user->gas->hasFeature('extra_invoicing')) {
-            $ids = [];
-            foreach ($this->bookings as $booking) {
-                if ($booking->exists) {
-                    $ids[] = $booking->id;
-                }
-            }
+            $ids = $this->bookings->filter(fn($b) => $b->exists)->pluck('id')->all();
 
             if (empty($ids)) {
                 \Log::error('Tentativo di creare fattura non assegnata a nessuna prenotazione');
@@ -215,12 +212,10 @@ public function getPrintableUpdaterAttribute()
         $last_update = null;
         $last_updater = null;
 
-        foreach($this->bookings as $booking) {
-            if ($booking->updater) {
-                if (is_null($last_update) || $booking->updated_at->greaterThan($last_update)) {
-                    $last_update = $booking->updated_at;
-                    $last_updater = $booking->updater;
-                }
+        foreach($this->bookings->filter(fn($b) => $b->updater) as $booking) {
+            if (is_null($last_update) || $booking->updated_at->greaterThan($last_update)) {
+                $last_update = $booking->updated_at;
+                $last_updater = $booking->updater;
             }
         }
 

diff --git a/code/app/Gas.php b/code/app/Gas.php
@@ -11,13 +11,14 @@
 use Log;
 
 use App\Models\Concerns\AttachableTrait;
+use App\Models\Concerns\Configurable;
 use App\Models\Concerns\PayableTrait;
 use App\Models\Concerns\CreditableTrait;
 use App\Events\SluggableCreating;
 
 class Gas extends Model
 {
-    use HasFactory, AttachableTrait, CreditableTrait, PayableTrait, GASModel, SluggableID, Cachable;
+    use HasFactory, Configurable, AttachableTrait, CreditableTrait, PayableTrait, GASModel, SluggableID, Cachable;
 
     public $incrementing = false;
     protected $keyType = 'string';
@@ -66,75 +67,6 @@ public function deliveries(): BelongsToMany
         return $this->belongsToMany('App\Delivery')->orderBy('name', 'asc');
     }
 
-    public function configs(): HasMany
-    {
-        return $this->hasMany('App\Config');
-    }
-
-    private function availableConfigs()
-    {
-        return systemParameters('Config');
-    }
-
-    public function getConfig($name)
-    {
-        foreach ($this->configs as $conf) {
-            if ($conf->name == $name) {
-                return $conf->value;
-            }
-        }
-
-        $defined = $this->availableConfigs();
-        if (!isset($defined[$name])) {
-            Log::error(_i('Configurazione GAS non prevista'));
-            return '';
-        }
-        else {
-            $this->setConfig($name, $defined[$name]->default());
-            $this->load('configs');
-            return $this->getConfig($name);
-        }
-    }
-
-    public function setConfig($name, $value)
-    {
-        if (is_object($value) || is_array($value)) {
-            $value = json_encode($value);
-        }
-
-        foreach ($this->configs as $conf) {
-            if ($conf->name == $name) {
-                $conf->value = $value;
-                $conf->save();
-                return;
-            }
-        }
-
-        $conf = new Config();
-        $conf->name = $name;
-        $conf->value = $value;
-        $conf->gas_id = $this->id;
-        $conf->save();
-    }
-
-    /*
-        Questa funzione permette di accedere direttamente alle configurazioni
-        del GAS, usandone il nome (definito da ciascun parametro definito nelle
-        classi nel namespace App\Parameters\Config)
-    */
-    public function getAttribute($key)
-    {
-        $configs = $this->availableConfigs();
-        $c = $configs[$key] ?? null;
-
-        if ($c) {
-            return $c->asAttribute($this);
-        }
-        else {
-            return parent::getAttribute($key);
-        }
-    }
-
     public function nextInvoiceNumber()
     {
         $status = $this->extra_invoicing;

diff --git a/code/app/Http/Controllers/AttachmentsController.php b/code/app/Http/Controllers/AttachmentsController.php
@@ -32,7 +32,7 @@ public function store(Request $request)
             return $this->errorResponse(_i('Non autorizzato'));
         }
 
-        $a = $target->attachByRequest($request);
+        $a = $target->attachByRequest($request->all());
         if ($a === false) {
             return $this->errorResponse(_i('File non caricato correttamente'));
         }
@@ -55,7 +55,7 @@ public function update(Request $request, $id)
         }
 
         if ($request->hasFile('file')) {
-            $a = $a->attached->attachByRequest($request, $a->id);
+            $a = $a->attached->attachByRequest($request->all(), $a->id);
             if ($a === false) {
                 return $this->errorResponse(_i('File non caricato correttamente'));
             }

diff --git a/code/app/Http/Controllers/DeliveriesController.php b/code/app/Http/Controllers/DeliveriesController.php
@@ -95,13 +95,13 @@ public function destroy($id)
 
         if ($d->default) {
             $fallback = Delivery::where('id', '!=', $d->id)->orderBy(DB::raw('RAND()'))->first();
-            if ($fallback != null)
-                $fallback_id = $fallback->id;
         }
         else {
             $fallback = Delivery::where('default', true)->first();
-            if ($fallback != null)
-                $fallback_id = $fallback->id;
+        }
+
+        if (is_null($fallback) == false) {
+            $fallback_id = $fallback->id;
         }
 
         foreach($d->users as $u) {