Fix for wrong math on remaining licenses when assigned to an asset

snipe · Feb 11, 2015 · cd5a352 · cd5a352
1 parent e343c15
commit cd5a352
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/app/models/License.php b/app/models/License.php
@@ -112,20 +112,23 @@ public function availcount()
      */
     public function assignedcount()
     {
-        return DB::table('license_seats')
-                    ->whereNotNull('assigned_to')
-                    ->whereNotNull('asset_id')
-                    ->where('license_id', '=', $this->id)
-                    ->whereNull('deleted_at')
-                    ->count();
+
+			return LicenseSeat::where('license_id', '=', $this->id)
+			->where( function ( $query )
+			{
+			$query->whereNotNull('assigned_to')
+                    ->orWhereNotNull('asset_id');
+			})
+			->count();
+
+
     }
 
     public function remaincount()
     {
     	$total = $this->totalSeatsByLicenseID();
         $taken =  $this->assignedcount();
         $diff =   ($total - $taken);
-
         return $diff;
     }
 

diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php
@@ -143,9 +143,9 @@
             @endif
             </td>
             <td nowrap="nowrap">
-                <a href="{{ route('update/hardware', $asset->id) }}" class="btn btn-warning"><i class="icon-pencil icon-white"></i></a>
 
             @if ($asset->deleted_at=='')
+             	<a href="{{ route('update/hardware', $asset->id) }}" class="btn btn-warning"><i class="icon-pencil icon-white"></i></a>
             	 <a data-html="false" class="btn delete-asset btn-danger" data-toggle="modal" href="{{ route('delete/hardware', $asset->id) }}" data-content="@lang('admin/hardware/message.delete.confirm')"
                 data-title="@lang('general.delete')
                  {{ htmlspecialchars($asset->asset_tag) }}?" onClick="return false;"><i class="icon-trash icon-white"></i></a>