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

Merge pull request #17850 from Godmartinz/change-purchase-cost-to-unit

Browse Source 
Rewords Purchase cost to Unit Cost for Accessories, Components, Consumables
This commit is contained in:
snipe
2025-09-15 14:20:04 +01:00
committed by GitHub
parent 7062962cc8 990cd82f97
commit ec47ee3573
12 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Presenters/AccessoryPresenter.php
View File

@@ -120,7 +120,7 @@ class AccessoryPresenter extends Presenter
'field' => 'purchase_cost', 'field' => 'purchase_cost',
'searchable' => true, 'searchable' => true,
'sortable' => true, 'sortable' => true,
'title' => trans('general.purchase_cost'), 'title' => trans('general.unit_cost'),
'footerFormatter' => 'sumFormatterQuantity', 'footerFormatter' => 'sumFormatterQuantity',
'class' => 'text-right text-padding-number-cell', 'class' => 'text-right text-padding-number-cell',
], [ ], [

2
app/Presenters/ComponentPresenter.php
View File

@@ -126,7 +126,7 @@ class ComponentPresenter extends Presenter
'field' => 'purchase_cost', 'field' => 'purchase_cost',
'searchable' => true, 'searchable' => true,
'sortable' => true, 'sortable' => true,
'title' => trans('general.purchase_cost'), 'title' => trans('general.unit_cost'),
'visible' => true, 'visible' => true,
'footerFormatter' => 'sumFormatterQuantity', 'footerFormatter' => 'sumFormatterQuantity',
'class' => 'text-right', 'class' => 'text-right',

2
app/Presenters/ConsumablePresenter.php
View File

@@ -126,7 +126,7 @@ class ConsumablePresenter extends Presenter
'field' => 'purchase_cost', 'field' => 'purchase_cost',
'searchable' => true, 'searchable' => true,
'sortable' => true, 'sortable' => true,
'title' => trans('general.purchase_cost'), 'title' => trans('general.unit_cost'),
'visible' => true, 'visible' => true,
'footerFormatter' => 'sumFormatterQuantity', 'footerFormatter' => 'sumFormatterQuantity',
'class' => 'text-right text-padding-number-cell', 'class' => 'text-right text-padding-number-cell',

1
resources/lang/en-US/general.php
View File

@@ -313,6 +313,7 @@ return [
'undeployable' => 'Un-deployable', 'undeployable' => 'Un-deployable',
'unknown_admin' => 'Unknown Admin', 'unknown_admin' => 'Unknown Admin',
'unknown_user' => 'Unknown User', 'unknown_user' => 'Unknown User',
'unit_cost' => 'Unit Cost',
'username' => 'Username', 'username' => 'Username',
'update' => 'Update', 'update' => 'Update',
'updating_item' => 'Updating :item', 'updating_item' => 'Updating :item',

2
resources/views/accessories/edit.blade.php
View File

@@ -24,7 +24,7 @@
@include ('partials.forms.edit.model_number') @include ('partials.forms.edit.model_number')
@include ('partials.forms.edit.order_number') @include ('partials.forms.edit.order_number')
@include ('partials.forms.edit.datepicker', ['translated_name' => trans('general.purchase_date'),'fieldname' => 'purchase_date']) @include ('partials.forms.edit.datepicker', ['translated_name' => trans('general.purchase_date'),'fieldname' => 'purchase_date'])
@include ('partials.forms.edit.purchase_cost', ['currency_type' => $item->location->currency ?? null]) @include ('partials.forms.edit.purchase_cost', ['currency_type' => $item->location->currency ?? null, 'unit_cost' => trans('general.unit_cost')])
@include ('partials.forms.edit.quantity') @include ('partials.forms.edit.quantity')
@include ('partials.forms.edit.minimum_quantity') @include ('partials.forms.edit.minimum_quantity')
@include ('partials.forms.edit.notes') @include ('partials.forms.edit.notes')

2
resources/views/accessories/view.blade.php
View File

@@ -236,7 +236,7 @@
<div class="row"> <div class="row">
<div class="col-md-3" style="padding-bottom: 10px;"> <div class="col-md-3" style="padding-bottom: 10px;">
<strong> <strong>
{{ trans('general.purchase_cost') }} {{ trans('general.unit_cost') }}
</strong> </strong>
</div> </div>
<div class="col-md-9" style="word-wrap: break-word;"> <div class="col-md-9" style="word-wrap: break-word;">

2
resources/views/components/edit.blade.php
View File

@@ -28,7 +28,7 @@
@include ('partials.forms.edit.supplier-select', ['translated_name' => trans('general.supplier'), 'fieldname' => 'supplier_id']) @include ('partials.forms.edit.supplier-select', ['translated_name' => trans('general.supplier'), 'fieldname' => 'supplier_id'])
@include ('partials.forms.edit.order_number') @include ('partials.forms.edit.order_number')
@include ('partials.forms.edit.datepicker', ['translated_name' => trans('general.purchase_date'),'fieldname' => 'purchase_date']) @include ('partials.forms.edit.datepicker', ['translated_name' => trans('general.purchase_date'),'fieldname' => 'purchase_date'])
@include ('partials.forms.edit.purchase_cost') @include ('partials.forms.edit.purchase_cost', ['unit_cost' => trans('general.unit_cost')])
@include ('partials.forms.edit.notes') @include ('partials.forms.edit.notes')
@include ('partials.forms.edit.image-upload', ['image_path' => app('components_upload_path')]) @include ('partials.forms.edit.image-upload', ['image_path' => app('components_upload_path')])

2
resources/views/components/view.blade.php
View File

@@ -201,7 +201,7 @@
@endif @endif
@if ($component->purchase_cost) @if ($component->purchase_cost)
<div class="col-md-12" style="padding-bottom: 5px;"><strong>{{ trans('admin/components/general.cost') }}:</strong> <div class="col-md-12" style="padding-bottom: 5px;"><strong>{{ trans('general.unit_cost') }}:</strong>
{{ $snipeSettings->default_currency }} {{ $snipeSettings->default_currency }}
{{ Helper::formatCurrencyOutput($component->purchase_cost) }} </div> {{ Helper::formatCurrencyOutput($component->purchase_cost) }} </div>

2
resources/views/consumables/edit.blade.php
View File

@@ -24,7 +24,7 @@
@include ('partials.forms.edit.item_number') @include ('partials.forms.edit.item_number')
@include ('partials.forms.edit.order_number') @include ('partials.forms.edit.order_number')
@include ('partials.forms.edit.datepicker', ['translated_name' => trans('general.purchase_date'),'fieldname' => 'purchase_date']) @include ('partials.forms.edit.datepicker', ['translated_name' => trans('general.purchase_date'),'fieldname' => 'purchase_date'])
@include ('partials.forms.edit.purchase_cost') @include ('partials.forms.edit.purchase_cost', [ 'unit_cost' => trans('general.unit_cost')])
@include ('partials.forms.edit.quantity') @include ('partials.forms.edit.quantity')
@include ('partials.forms.edit.minimum_quantity') @include ('partials.forms.edit.minimum_quantity')
@include ('partials.forms.edit.notes') @include ('partials.forms.edit.notes')

2
resources/views/consumables/view.blade.php
View File

@@ -272,7 +272,7 @@
@if ($consumable->purchase_cost) @if ($consumable->purchase_cost)
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
{{ trans('general.purchase_cost') }} {{ trans('general.unit_cost') }}
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{{ $snipeSettings->default_currency }} {{ $snipeSettings->default_currency }}

2
resources/views/partials/forms/edit/purchase_cost.blade.php
View File

@@ -1,6 +1,6 @@
<!-- Purchase Cost --> <!-- Purchase Cost -->
<div class="form-group {{ $errors->has('purchase_cost') ? ' has-error' : '' }}"> <div class="form-group {{ $errors->has('purchase_cost') ? ' has-error' : '' }}">
<label for="purchase_cost" class="col-md-3 control-label">{{ trans('general.purchase_cost') }}</label> <label for="purchase_cost" class="col-md-3 control-label">{{ $unit_cost ?? trans('general.purchase_cost') }}</label>
<div class="col-md-9"> <div class="col-md-9">
<div class="input-group col-md-5" style="padding-left: 0px;"> <div class="input-group col-md-5" style="padding-left: 0px;">
<input class="form-control" type="number" name="purchase_cost" min="0.00" max="99999999999999999.000" step="0.001" aria-label="purchase_cost" id="purchase_cost" value="{{ old('purchase_cost', $item->purchase_cost) }}" maxlength="25" /> <input class="form-control" type="number" name="purchase_cost" min="0.00" max="99999999999999999.000" step="0.001" aria-label="purchase_cost" id="purchase_cost" value="{{ old('purchase_cost', $item->purchase_cost) }}" maxlength="25" />

4
resources/views/users/view.blade.php
View File

@@ -927,7 +927,7 @@
<th>{{ trans('general.name') }}</th> <th>{{ trans('general.name') }}</th>
<th>{{ trans('general.date') }}</th> <th>{{ trans('general.date') }}</th>
<th data-fieldname="note">{{ trans('general.notes') }}</th> <th data-fieldname="note">{{ trans('general.notes') }}</th>
<th data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">{{ trans('general.purchase_cost') }}</th> <th data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">{{ trans('general.unit_cost') }}</th>
<th class="hidden-print">{{ trans('general.action') }}</th> <th class="hidden-print">{{ trans('general.action') }}</th>
</tr> </tr>
</thead> </thead>
@@ -971,7 +971,7 @@
<thead> <thead>
<tr> <tr>
<th class="col-md-3">{{ trans('general.name') }}</th> <th class="col-md-3">{{ trans('general.name') }}</th>
<th class="col-md-2" data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">{{ trans('general.purchase_cost') }}</th> <th class="col-md-2" data-footer-formatter="sumFormatter" data-fieldname="purchase_cost">{{ trans('general.unit_cost') }}</th>
<th class="col-md-2">{{ trans('general.date') }}</th> <th class="col-md-2">{{ trans('general.date') }}</th>
<th class="col-md-5">{{ trans('general.notes') }}</th> <th class="col-md-5">{{ trans('general.notes') }}</th>
</tr> </tr>