ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename parseCurrencyString to formatCurrencyOutput to clarify what it does better.

Browse Source
This commit is contained in:
Daniel Meltzer
2016-08-16 20:47:53 -05:00
parent 0c912bcf49
commit 5959f83de3
20 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AccessoriesController.php
+1 -1
View File
@@ -617,7 +617,7 @@ class AccessoriesController extends Controller
'min_amt' => e($accessory->min_amt),
'location' => ($accessory->location) ? e($accessory->location->name): '',
'purchase_date' => e($accessory->purchase_date),
'purchase_cost' => Helper::parseCurrencyString($accessory->purchase_cost),
'purchase_cost' => Helper::formatCurrencyOutput($accessory->purchase_cost),
'numRemaining' => $accessory->numRemaining(),
'actions' => $actions,
'companyName' => is_null($company) ? '' : e($company->name)
app/Http/Controllers/AssetsController.php
+2 -2
View File
@@ -354,7 +354,7 @@ class AssetsController extends Controller
}
if ($request->has('purchase_cost')) {
$asset->purchase_cost = e(Helper::parseCurrencyString($request->input('purchase_cost')));
$asset->purchase_cost = e(Helper::formatCurrencyOutput($request->input('purchase_cost')));
} else {
$asset->purchase_cost = null;
}
@@ -1741,7 +1741,7 @@ class AssetsController extends Controller
}
}
$purchase_cost = Helper::parseCurrencyString($asset->purchase_cost);
$purchase_cost = Helper::formatCurrencyOutput($asset->purchase_cost);
$row = array(
'checkbox' =>'<div class="text-center"><input type="checkbox" name="edit_asset['.$asset->id.']" class="one_required"></div>',
app/Http/Controllers/ComponentsController.php
+1 -1
View File
@@ -484,7 +484,7 @@ class ComponentsController extends Controller
'category' => ($component->category) ? e($component->category->name) : 'Missing category',
'order_number' => e($component->order_number),
'purchase_date' => e($component->purchase_date),
'purchase_cost' => Helper::parseCurrencyString($component->purchase_cost),
'purchase_cost' => Helper::formatCurrencyOutput($component->purchase_cost),
'numRemaining' => $component->numRemaining(),
'actions' => $actions,
'companyName' => is_null($company) ? '' : e($company->name),
app/Http/Controllers/ConsumablesController.php
+1 -1
View File
@@ -476,7 +476,7 @@ class ConsumablesController extends Controller
'category' => ($consumable->category) ? e($consumable->category->name) : 'Missing category',
'order_number' => e($consumable->order_number),
'purchase_date' => e($consumable->purchase_date),
'purchase_cost' => Helper::parseCurrencyString($consumable->purchase_cost),
'purchase_cost' => Helper::formatCurrencyOutput($consumable->purchase_cost),
'numRemaining' => $consumable->numRemaining(),
'actions' => $actions,
'companyName' => is_null($company) ? '' : e($company->name),
app/Http/Controllers/LicensesController.php
+1 -1
View File
@@ -1015,7 +1015,7 @@ class LicensesController extends Controller
'license_email' => e($license->license_email),
'purchase_date' => ($license->purchase_date) ? $license->purchase_date : '',
'expiration_date' => ($license->expiration_date) ? $license->expiration_date : '',
'purchase_cost' => Helper::parseCurrencyString($license->purchase_cost),
'purchase_cost' => Helper::formatCurrencyOutput($license->purchase_cost),
'purchase_order' => ($license->purchase_order) ? e($license->purchase_order) : '',
'order_number' => ($license->order_number) ? e($license->order_number) : '',
'notes' => ($license->notes) ? e($license->notes) : '',
app/Http/Controllers/ReportsController.php
+9 -9
View File
@@ -309,9 +309,9 @@ class ReportsController extends Controller
}
$row[] = $asset->purchase_date;
$row[] = $currency . Helper::parseCurrencyString($asset->purchase_cost);
$row[] = $currency . Helper::parseCurrencyString($asset->getDepreciatedValue());
$row[] = $currency . Helper::parseCurrencyString(( $asset->purchase_cost - $asset->getDepreciatedValue() ));
$row[] = $currency . Helper::formatCurrencyOutput($asset->purchase_cost);
$row[] = $currency . Helper::formatCurrencyOutput($asset->getDepreciatedValue());
$row[] = $currency . Helper::formatCurrencyOutput(( $asset->purchase_cost - $asset->getDepreciatedValue() ));
$csv->insertOne($row);
}
@@ -393,7 +393,7 @@ class ReportsController extends Controller
$row[] = $license->remaincount();
$row[] = $license->expiration_date;
$row[] = $license->purchase_date;
$row[] = '"' . Helper::parseCurrencyString($license->purchase_cost) . '"';
$row[] = '"' . Helper::formatCurrencyOutput($license->purchase_cost) . '"';
$rows[] = implode($row, ',');
}
@@ -529,7 +529,7 @@ class ReportsController extends Controller
$row[] = e($asset->purchase_date);
}
if (e(Input::get('purchase_cost')) == '1' && ( e(Input::get('depreciation')) != '1' )) {
$row[] = '"' . Helper::parseCurrencyString($asset->purchase_cost) . '"';
$row[] = '"' . Helper::formatCurrencyOutput($asset->purchase_cost) . '"';
}
if (e(Input::get('order')) == '1') {
if ($asset->order_number) {
@@ -606,9 +606,9 @@ class ReportsController extends Controller
}
if (e(Input::get('depreciation')) == '1') {
$depreciation = $asset->getDepreciatedValue();
$row[] = '"' . Helper::parseCurrencyString($asset->purchase_cost) . '"';
$row[] = '"' . Helper::parseCurrencyString($depreciation) . '"';
$row[] = '"' . Helper::parseCurrencyString($asset->purchase_cost) . '"';
$row[] = '"' . Helper::formatCurrencyOutput($asset->purchase_cost) . '"';
$row[] = '"' . Helper::formatCurrencyOutput($depreciation) . '"';
$row[] = '"' . Helper::formatCurrencyOutput($asset->purchase_cost) . '"';
}
foreach ($customfields as $customfield) {
@@ -699,7 +699,7 @@ class ReportsController extends Controller
$improvementTime = intval($assetMaintenance->asset_maintenance_time);
}
$row[] = $improvementTime;
$row[] = trans('general.currency') . Helper::parseCurrencyString($assetMaintenance->cost);
$row[] = trans('general.currency') . Helper::formatCurrencyOutput($assetMaintenance->cost);
$rows[] = implode($row, ',');
}