diff --git a/app/config/version.php b/app/config/version.php
index 6ec8beb918..0c85a85fb3 100644
--- a/app/config/version.php
+++ b/app/config/version.php
@@ -1,5 +1,5 @@
'v2.0-374',
- 'hash_version' => 'v2.0-374-g577c193',
+ 'app_version' => 'v2.0-377',
+ 'hash_version' => 'v2.0-377-g0b0b556',
);
\ No newline at end of file
diff --git a/app/controllers/admin/AssetMaintenancesController.php b/app/controllers/admin/AssetMaintenancesController.php
index 85147a24b1..69d5245dd5 100644
--- a/app/controllers/admin/AssetMaintenancesController.php
+++ b/app/controllers/admin/AssetMaintenancesController.php
@@ -20,6 +20,7 @@
use TCPDF;
use Validator;
use View;
+ use Setting;
class AssetMaintenancesController extends AdminController
{
@@ -48,7 +49,9 @@
public function getDatatable()
{
- $maintenances = AssetMaintenance::with('asset','supplier')
+
+
+ $maintenances = AssetMaintenance::with('asset','supplier')
->whereNull('deleted_at');
if (Input::has('search')) {
@@ -77,18 +80,25 @@
$maintenances = $maintenances->skip($offset)->take($limit)->get();
$rows = array();
+ $settings = Setting::getSettings();
foreach($maintenances as $maintenance) {
$actions = '';
+ if (($maintenance->cost) && ($maintenance->asset->assetloc) && ($maintenance->asset->assetloc->currency!='')) {
+ $maintenance_cost = $maintenance->asset->assetloc->currency.$maintenance->cost;
+ } else {
+ $maintenance_cost = $settings->default_currency.$maintenance->cost;
+ }
+
$rows[] = array(
'id' => $maintenance->id,
'asset_name' => $maintenance->asset->showAssetName(),
'title' => $maintenance->title,
'notes' => $maintenance->notes,
'supplier' => $maintenance->supplier->name,
- 'cost' => ($maintenance->cost) ? $maintenance->asset->assetloc->currency.''.$maintenance->cost : $maintenance->cost ,
+ 'cost' => $maintenance_cost,
'asset_maintenance_type' => e($maintenance->asset_maintenance_type),
'start_date' => $maintenance->start_date,
'time' => $maintenance->asset_maintenance_time,