FGFS-4.1/phpvms
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move currency to config file; change units to their own group in settings

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-02-26 20:23:48 -06:00
parent 920b92c096
commit d61ade4482
15 changed files with 154 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Support/Units/Altitude.php
View File

@@ -15,7 +15,7 @@ class Altitude extends \PhpUnitsOfMeasure\PhysicalQuantity\Length implements Arr
*/
public function __toString()
{
$unit = setting('general.altitude_unit');
$unit = setting('units.altitude');
$value = $this->toUnit($unit);
return (string) round($value, 2);
}

2
app/Support/Units/Distance.php
View File

@@ -15,7 +15,7 @@ class Distance extends \PhpUnitsOfMeasure\PhysicalQuantity\Length implements Arr
*/
public function __toString()
{
$unit = setting('general.distance_unit');
$unit = setting('units.distance');
$value = $this->toUnit($unit);
return (string) round($value, 2);
}

2
app/Support/Units/Fuel.php
View File

@@ -15,7 +15,7 @@ class Fuel extends \PhpUnitsOfMeasure\PhysicalQuantity\Mass implements Arrayable
*/
public function __toString()
{
$unit = setting('general.fuel_unit');
$unit = setting('units.fuel');
$value = $this->toUnit($unit);
return (string) round($value, 2);
}

2
app/Support/Units/Mass.php
View File

@@ -15,7 +15,7 @@ class Mass extends \PhpUnitsOfMeasure\PhysicalQuantity\Mass implements Arrayable
*/
public function __toString()
{
$unit = setting('general.weight_unit');
$unit = setting('units.weight');
$value = $this->toUnit($unit);
return (string) round($value, 2);
}

2
app/Support/Units/Velocity.php
View File

@@ -15,7 +15,7 @@ class Velocity extends \PhpUnitsOfMeasure\PhysicalQuantity\Velocity implements A
*/
public function __toString()
{
$unit = setting('general.speed_unit');
$unit = setting('units.speed');
$value = $this->toUnit($unit);
return (string) round($value, 2);
}

2
app/Support/Units/Volume.php
View File

@@ -15,7 +15,7 @@ class Volume extends \PhpUnitsOfMeasure\PhysicalQuantity\Volume implements Array
*/
public function __toString()
{
$unit = setting('general.liquid_unit');
$unit = setting('units.volume');
$value = $this->toUnit($unit);
return (string) round($value, 2);
}