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

Fixes #1500: Use the currency setting rather than the localization label

Browse Source
This commit is contained in:
snipe
2016-01-05 19:45:40 -08:00
parent 2b13641661
commit 218fe72e16
10 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/config/version.php
+1 -1
View File
@@ -1,5 +1,5 @@
<?php
return array (
'app_version' => 'v2.1.0-pre',
'hash_version' => 'v2.1.0-pre-12-gca9ab68',
'hash_version' => 'v2.1.0-pre-13-g66fe626',
);
app/views/backend/asset_maintenances/edit.blade.php
+1 -1
View File
@@ -115,7 +115,7 @@
<label for="cost" class="col-md-3 control-label">@lang('admin/asset_maintenances/form.cost')</label>
<div class="col-md-2">
<div class="input-group">
<span class="input-group-addon">@lang('general.currency')</span>
<span class="input-group-addon">{{{ Setting::first()->default_currency }}}</span>
<input class="col-md-2 form-control" type="text" name="cost" id="cost" value="{{ Input::old('cost', number_format($assetMaintenance->cost,2)) }}" />
{{ $errors->first('cost', '<br><span class="alert-msg"><i class="fa fa-times"></i> :message</span>') }}
</div>
app/views/backend/hardware/bulk.blade.php
+1 -1
View File
@@ -81,7 +81,7 @@
<div class="form-group {{ $errors->has('purchase_cost') ? ' has-error' : '' }}">
<label for="purchase_cost" class="col-md-2 control-label">@lang('admin/hardware/form.cost')</label>
<div class="input-group col-md-3">
<span class="input-group-addon">@lang('general.currency')</span>
<span class="input-group-addon">{{{ Setting::first()->default_currency }}}</span>
<input type="text" class="form-control" placeholder="@lang('admin/hardware/form.cost')" name="purchase_cost" id="purchase_cost" value="{{{ Input::old('purchase_cost') }}}">
{{ $errors->first('purchase_cost', '<br><span class="alert-msg"><i class="fa fa-times"></i> :message</span>') }}
app/views/backend/hardware/qr-view.blade.php
+1 -1
View File
@@ -90,7 +90,7 @@
@if ($asset->purchase_cost)
<div class="col-md-12" style="padding-bottom: 5px;"><strong>@lang('admin/hardware/form.cost'):</strong>
@lang('general.currency')
{{{ Setting::first()->default_currency }}}
{{{ number_format($asset->purchase_cost,2) }}} </div>
@endif
app/views/backend/licenses/edit.blade.php
+1 -1
View File
@@ -142,7 +142,7 @@
<label for="purchase_cost" class="col-md-3 control-label">@lang('admin/licenses/form.cost')</label>
<div class="col-md-2">
<div class="input-group">
<span class="input-group-addon">@lang('general.currency')</span>
<span class="input-group-addon">{{{ Setting::first()->default_currency }}}</span>
<input class="col-md-2 form-control" type="text" name="purchase_cost" id="purchase_cost" value="{{ Input::old('purchase_cost', number_format($license->purchase_cost,2)) }}" />
{{ $errors->first('purchase_cost', '<br><span class="alert-msg"><i class="fa fa-times"></i> :message</span>') }}
</div>
app/views/backend/licenses/view.blade.php
+1 -1
View File
@@ -333,7 +333,7 @@
@endif
@if ($license->purchase_cost > 0)
<li><strong>@lang('admin/licenses/form.cost'):</strong>
@lang('general.currency')
{{{ Setting::first()->default_currency }}}
{{{ number_format($license->purchase_cost,2) }}} </li>
@endif
@if ($license->order_number)
app/views/backend/locations/index.blade.php
+1 -1
View File
@@ -32,7 +32,7 @@ Locations ::
<th data-sortable="true" data-field="parent">@lang('admin/locations/table.parent')</th>
<th data-searchable="false" data-sortable="false" data-field="assets_default">@lang('admin/locations/table.assets_rtd')</th>
<th data-searchable="false" data-sortable="false" data-field="assets_checkedout">@lang('admin/locations/table.assets_checkedout')</th>
<th data-searchable="true" data-sortable="true" data-field="currency">@lang('general.currency')</th>
<th data-searchable="true" data-sortable="true" data-field="currency">{{{ Setting::first()->default_currency }}}</th>
<th data-searchable="true" data-sortable="true" data-field="address">@lang('admin/locations/table.address')</th>
<th data-searchable="true" data-sortable="true" data-field="city">@lang('admin/locations/table.city')
</th>
app/views/backend/reports/asset.blade.php
+1 -1
View File
@@ -76,7 +76,7 @@
@endif
</td>
<td>{{{ $asset->purchase_date }}}</td>
<td class="align-right">@lang('general.currency')
<td class="align-right">{{{ Setting::first()->default_currency }}}
{{{ number_format($asset->purchase_cost) }}}
</td>
<td>
app/views/backend/reports/asset_maintenances.blade.php
+8 -2
View File
@@ -60,7 +60,10 @@ use Carbon\Carbon;
?>
@endif
<td>{{{ $assetMaintenanceTime }}}</td>
<td>@lang('general.currency'){{ number_format($assetMaintenance->cost,2) }}</td>
<td>
{{{ Setting::first()->default_currency }}}
{{ number_format($assetMaintenance->cost,2) }}
</td>
</tr>
<?php
$totalDays += $assetMaintenanceTime;
@@ -72,7 +75,10 @@ use Carbon\Carbon;
<tr>
<td colspan="6" align="right"><strong>Totals:</strong></td>
<td>{{number_format($totalDays)}}</td>
<td>@lang('general.currency'){{ number_format($totalCost,2) }}</td>
<td>
{{{ Setting::first()->default_currency }}}
{{ number_format($totalCost,2) }}
</td>
</tr>
</tfoot>
</table>
app/views/backend/reports/index.blade.php
+11 -6
View File
@@ -72,12 +72,17 @@
</td>
@if ($asset->purchase_cost > 0)
<td class="align-right">@lang('general.currency')
{{{ number_format($asset->purchase_cost) }}}</td>
<td class="align-right">@lang('general.currency')
{{{ number_format($asset->depreciate()) }}}</td>
<td class="align-right">@lang('general.currency')
-{{{ number_format(($asset->purchase_cost - $asset->depreciate())) }}}</td>
<td class="align-right">
{{{ Setting::first()->default_currency }}}
{{{ number_format($asset->purchase_cost) }}}
</td>
<td class="align-right">
{{{ Setting::first()->default_currency }}}
{{{ number_format($asset->depreciate()) }}}
</td>
<td class="align-right">
{{{ Setting::first()->default_currency }}}
-{{{ number_format(($asset->purchase_cost - $asset->depreciate())) }}}</td>
@else
<td></td>
<td></td>