Merge remote-tracking branch 'origin/develop'

Author: snipe

app/Http/Transformers/LicenseSeatsTransformer.php

@@ -16,7 +16,7 @@ public function transformLicenseSeats(Collection $seats, $total)
         $seat_count = 0;
         foreach ($seats as $seat) {
             $seat_count++;
-            $array[] = self::transformLicenseSeat($seat, $seat_count);
+            $array[] = self::transformLicenseSeat($seat, ($total - $seat_count));
         }
 
         return (new DatatablesTransformer)->transformDatatables($array, $total);

tests/Feature/Authentication/LoginTest.php

@@ -32,6 +32,7 @@ public function testLogsFailedLoginAttempt()
     public function testLoginThrottleConfigIsRespected()
     {
 
+       $this->markTestIncomplete("This test is flaky and needs to be fixed. Passes and fails seemingly at random.");
        User::factory()->create(['username' => 'username_here']);
 
        config(['auth.passwords.users.throttle.max_attempts' => 1]);