Merge remote-tracking branch 'origin/develop'

Author: snipe

app/Http/Controllers/Api/LicensesController.php

@@ -26,6 +26,12 @@ public function index(Request $request) : JsonResponse | array
 
         $licenses = License::with('company', 'manufacturer', 'supplier','category', 'adminuser')->withCount('freeSeats as free_seats_count');
 
+        if ($request->input('status')=='inactive') {
+            $licenses->ExpiredLicenses();
+        } else {
+            $licenses->ActiveLicenses();
+        }
+
         if ($request->filled('company_id')) {
             $licenses->where('licenses.company_id', '=', $request->input('company_id'));
         }
@@ -94,6 +100,8 @@ public function index(Request $request) : JsonResponse | array
             $licenses->onlyTrashed();
         }
 
+
+
         // Make sure the offset and limit are actually integers and do not exceed system limits
         $offset = ($request->input('offset') > $licenses->count()) ? $licenses->count() : app('api_offset_value');
         $limit = app('api_limit_value');

app/Http/Controllers/Licenses/LicenseCheckoutController.php

@@ -25,7 +25,7 @@ class LicenseCheckoutController extends Controller
      * @author [A. Gianotto] [<[email protected]>]
      * @since [v1.0]
      * @param $id
-     * @return \Illuminate\Contracts\View\View
+     * @return \Illuminate\Contracts\View\View |\Illuminate\Http\RedirectResponse
      * @throws \Illuminate\Auth\Access\AuthorizationException
      */
     public function create(License $license)
@@ -39,6 +39,11 @@ public function create(License $license)
                 return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.checkout.not_enough_seats'));
             }
 
+            // Make sure the license is expired or terminated
+            if ($license->isInactive()) {
+                return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.checkout.license_is_inactive'));
+            }
+
             // We don't currently allow checking out licenses to locations, so we'll reset that to user if needed
             if (session()->get('checkout_to_type') == 'location') {
                 session()->put(['checkout_to_type' => 'user']);
@@ -70,8 +75,19 @@ public function store(LicenseCheckoutRequest $request, $licenseId, $seatId = nul
             return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.not_found'));
         }
 
+
         $this->authorize('checkout', $license);
 
+        // Make sure there is at least one available to checkout
+        if ($license->availCount()->count() < 1) {
+            return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.checkout.not_enough_seats'));
+        }
+
+        // Make sure the license is expired or terminated
+        if ($license->isInactive()) {
+            return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.checkout.license_is_inactive'));
+        }
+
         $licenseSeat = $this->findLicenseSeatToCheckout($license, $seatId);
         $licenseSeat->created_by = auth()->id();
         $licenseSeat->notes = $request->input('notes');
@@ -114,6 +130,7 @@ protected function findLicenseSeatToCheckout($license, $seatId)
             throw new \Illuminate\Http\Exceptions\HttpResponseException(redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.checkout.not_enough_seats')));
         }
 
+
         if (! $licenseSeat->license->is($license)) {
             throw new \Illuminate\Http\Exceptions\HttpResponseException(redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.checkout.mismatch')));
         }

app/Http/Transformers/LicensesTransformer.php

@@ -31,11 +31,11 @@ public function transformLicense(License $license)
             'purchase_order' => ($license->purchase_order) ? e($license->purchase_order) : null,
             'purchase_date' => Helper::getFormattedDateObject($license->purchase_date, 'date'),
             'termination_date' => Helper::getFormattedDateObject($license->termination_date, 'date'),
+            'expiration_date' => Helper::getFormattedDateObject($license->expiration_date, 'date'),
             'depreciation' => ($license->depreciation) ? ['id' => (int) $license->depreciation->id,'name'=> e($license->depreciation->name)] : null,
             'purchase_cost' => Helper::formatCurrencyOutput($license->purchase_cost),
             'purchase_cost_numeric' => $license->purchase_cost,
             'notes' => Helper::parseEscapedMarkedownInline($license->notes),
-            'expiration_date' => Helper::getFormattedDateObject($license->expiration_date, 'date'),
             'seats' => (int) $license->seats,
             'free_seats_count' => (int) $license->free_seats_count - License::unReassignableCount($license),
             'remaining' => (int) $license->free_seats_count,

app/Models/License.php

@@ -299,16 +299,36 @@ public function setTerminationDateAttribute($value)
     }
 
     public function isInactive(): bool
-{
-    $day = now()->startOfDay();
+    {
+        $day = now()->startOfDay();
 
-    $expired = $this->expiration_date && $this->asDateTime($this->expiration_date)->startofDay()->lessThanOrEqualTo($day);
+        $expired = $this->expiration_date && $this->asDateTime($this->expiration_date)->startofDay()->lessThanOrEqualTo($day);
 
-    $terminated = $this->termination_date && $this->asDateTime($this->termination_date)->startofDay()->lessThanOrEqualTo($day);
+        $terminated = $this->termination_date && $this->asDateTime($this->termination_date)->startofDay()->lessThanOrEqualTo($day);
 
 
-    return $expired || $terminated;
-}
+        return $this->isExpired() || $this->isTerminated();
+    }
+
+    public function isExpired(): bool
+    {
+        $day = now()->startOfDay();
+
+        $expired = $this->expiration_date && $this->asDateTime($this->expiration_date)->startofDay()->lessThanOrEqualTo($day);
+
+        return $expired;
+    }
+
+    public function isTerminated(): bool
+    {
+        $day = now()->startOfDay();
+
+        $terminated = $this->termination_date && $this->asDateTime($this->termination_date)->startofDay()->lessThanOrEqualTo($day);
+
+
+        return $terminated;
+    }
+
     /**
      * Sets free_seat_count attribute
      *
@@ -750,6 +770,38 @@ public static function getExpiringLicenses($days = 60)
             ->get();
     }
 
+    public function scopeActiveLicenses($query)
+    {
+
+        return $query->whereNull('deleted_at')
+
+            // The termination date is null or within range
+            ->where(function ($query)  {
+                $query->whereNull('termination_date')
+                    ->orWhereDate('termination_date', '>', [Carbon::now()]);
+            })
+            ->where(function ($query) {
+                $query->whereNull('expiration_date')
+                    ->orWhereDate('expiration_date', '>', [Carbon::now()]);
+            });
+    }
+
+    public function scopeExpiredLicenses($query)
+    {
+
+        return $query->whereNull('deleted_at')
+
+            // The termination date is null or within range
+            ->where(function ($query)  {
+                $query->whereNull('termination_date')
+                    ->orWhereDate('termination_date', '<=', [Carbon::now()]);
+            })
+            ->orWhere(function ($query) {
+                $query->whereNull('expiration_date')
+                    ->orWhereDate('expiration_date', '<=', [Carbon::now()]);
+            });
+    }
+
     /**
      * Query builder scope to order on manufacturer
      *

app/Providers/BreadcrumbsServiceProvider.php

@@ -349,10 +349,19 @@ public function boot()
         /**
          * Licenses Breadcrumbs
          */
-        Breadcrumbs::for('licenses.index', fn (Trail $trail) =>
-        $trail->parent('home', route('home'))
-            ->push(trans('general.licenses'), route('licenses.index'))
-        );
+        if ((request()->is('licenses*')) && (request()->status=='inactive')) {
+            Breadcrumbs::for('licenses.index', fn (Trail $trail) =>
+            $trail->parent('home', route('home'))
+                ->push(trans('general.licenses'), route('licenses.index'))
+                ->push(trans('general.show_inactive'), route('licenses.index'))
+            );
+        } else {
+            Breadcrumbs::for('licenses.index', fn (Trail $trail) =>
+            $trail->parent('home', route('home'))
+                ->push(trans('general.licenses'), route('licenses.index'))
+            );
+        }
+
 
         Breadcrumbs::for('licenses.create', fn (Trail $trail) =>
         $trail->parent('licenses.index', route('licenses.index'))

database/factories/LicenseFactory.php

@@ -33,9 +33,9 @@ public function definition()
             'seats' => $this->faker->numberBetween(1, 10),
             'purchase_date' => $this->faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get())->format('Y-m-d'),
             'order_number' => $this->faker->numberBetween(1000000, 50000000),
-            'expiration_date' => $this->faker->dateTimeBetween('now', '+3 years', date_default_timezone_get())->format('Y-m-d H:i:s'),
+            'expiration_date' => null,
             'reassignable' => $this->faker->boolean(),
-            'termination_date' => $this->faker->dateTimeBetween('-1 years', 'now', date_default_timezone_get())->format('Y-m-d H:i:s'),
+            'termination_date' => null,
             'supplier_id' => Supplier::factory(),
             'category_id' => Category::factory(),
         ];

resources/lang/en-US/general.php

@@ -589,6 +589,7 @@
         'components'  => ':count Component|:count Components',
     ],
 
+    'show_inactive' => 'Expired or Terminated',
     'more_info' => 'More Info',
     'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
     'whoops' => 'Whoops!',

resources/views/licenses/index.blade.php

@@ -27,7 +27,7 @@
               id="licensesTable"
               data-buttons="licenseButtons"
               class="table table-striped snipe-table"
-              data-url="{{ route('api.licenses.index') }}"
+              data-url="{{ route('api.licenses.index', ['status' => e(request('status'))]) }}"
               data-export-options='{
             "fileName": "export-licenses-{{ date('Y-m-d') }}",
             "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]

resources/views/licenses/view.blade.php

@@ -249,6 +249,11 @@
                         </strong>
                       </div>
                       <div class="col-md-9">
+                        @if ($license->isExpired())
+                          <span class="text-danger">
+                           <x-icon type="warning" class="text-warning" />
+                          </span>
+                        @endif
                         {{ Helper::getFormattedDateObject($license->expiration_date, 'date', false) }}
                       </div>
                     </div>
@@ -262,6 +267,12 @@
                         </strong>
                       </div>
                       <div class="col-md-9">
+                        @if ($license->isTerminated())
+                          <span class="text-danger">
+                           <x-icon type="warning" class="text-warning" />
+                          </span>
+                        @endif
+
                         {{ Helper::getFormattedDateObject($license->termination_date, 'date', false) }}
                       </div>
                     </div>
@@ -545,7 +556,7 @@ class="table table-striped snipe-table"
 
       @can('checkout', $license)
 
-        @if ($license->availCount()->count() > 0)
+        @if (($license->availCount()->count() > 0) && (!$license->isInactive()))
 
           <a href="{{ route('licenses.checkout', $license->id) }}" class="btn bg-maroon btn-sm btn-social btn-block hidden-print" style="margin-bottom: 5px;">
             <x-icon type="checkout" />
@@ -558,17 +569,13 @@ class="table table-striped snipe-table"
           </a>
 
         @else
-          <span data-tooltip="true" title=" {{ trans('admin/licenses/general.bulk.checkout_all.disabled_tooltip') }}">
-          <a href="#" class="btn bg-maroon btn-sm btn-social btn-block hidden-print disabled" style="margin-bottom: 5px;" data-tooltip="true" title="{{ trans('general.checkout') }}">
+          <span data-tooltip="true" title="{{ ($license->availCount()->count() == 0) ? trans('admin/licenses/general.bulk.checkout_all.disabled_tooltip') : trans('admin/licenses/message.checkout.license_is_inactive') }}" class="btn bg-maroon btn-sm btn-social btn-block hidden-print disabled" style="margin-bottom: 5px;" data-tooltip="true" title="{{ trans('general.checkout') }}">
             <x-icon type="checkout" />
             {{ trans('general.checkout') }}
-          </a>
           </span>
-          <span data-tooltip="true" title=" {{ trans('admin/licenses/general.bulk.checkout_all.disabled_tooltip') }}">
-            <a href="#" class="btn bg-maroon btn-sm btn-social btn-block hidden-print disabled" style="margin-bottom: 5px;" data-tooltip="true" title="{{ trans('general.checkout') }}">
+          <span data-tooltip="true" title="{{ ($license->availCount()->count() == 0) ? trans('admin/licenses/general.bulk.checkout_all.disabled_tooltip') : trans('admin/licenses/message.checkout.license_is_inactive') }}" class="btn bg-maroon btn-sm btn-social btn-block hidden-print disabled" style="margin-bottom: 5px;" data-tooltip="true" title="{{ trans('general.checkout') }}">
               <x-icon type="checkout" />
               {{ trans('admin/licenses/general.bulk.checkout_all.button') }}
-            </a>
           </span>
         @endif
       @endcan

resources/views/models/index.blade.php

@@ -36,7 +36,7 @@
                         id="asssetModelsTable"
                         data-buttons="modelButtons"
                         class="table table-striped snipe-table"
-                        data-url="{{ route('api.models.index', ['status' => request('status')]) }}"
+                        data-url="{{ route('api.models.index', ['status' => e(request('status'))]) }}"
                         data-export-options='{
               "fileName": "export-models-{{ date('Y-m-d') }}",
               "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]