Merge remote-tracking branch 'origin/develop'

Author: snipe

app/Presenters/LicensePresenter.php

@@ -53,6 +53,7 @@ public static function dataTableLayout()
                 'searchable' => true,
                 'sortable' => true,
                 'title' => trans('admin/licenses/form.to_email'),
+                'formatter' => 'emailFormatter',
             ], [
                 'field' => 'license_name',
                 'searchable' => true,

tests/Unit/SnipeModelTest.php

@@ -18,12 +18,14 @@ public function testSetsPurchaseDatesAppropriately()
     public function testSetsPurchaseCostsAppropriately()
     {
         $c = new SnipeModel;
+        $c->purchase_cost = '';
+        $this->assertTrue($c->purchase_cost == null);
         $c->purchase_cost = '0.00';
-        $this->assertTrue($c->purchase_cost === null);
+        $this->assertTrue($c->purchase_cost == 0.00);
         $c->purchase_cost = '9.54';
-        $this->assertTrue($c->purchase_cost === 9.54);
+        $this->assertTrue($c->purchase_cost == 9.54);
         $c->purchase_cost = '9.50';
-        $this->assertTrue($c->purchase_cost === 9.5);
+        $this->assertTrue($c->purchase_cost == 9.5);
     }
 
     public function testNullsBlankLocationIdsButNotOthers()