diff --git a/app/Presenters/AccessoryPresenter.php b/app/Presenters/AccessoryPresenter.php index 368ddd3f65..6d04e18b6a 100644 --- a/app/Presenters/AccessoryPresenter.php +++ b/app/Presenters/AccessoryPresenter.php @@ -120,7 +120,7 @@ class AccessoryPresenter extends Presenter 'field' => 'purchase_cost', 'searchable' => true, 'sortable' => true, - 'title' => trans('general.purchase_cost'), + 'title' => trans('general.unit_cost'), 'footerFormatter' => 'sumFormatterQuantity', 'class' => 'text-right text-padding-number-cell', ], [ diff --git a/app/Presenters/ComponentPresenter.php b/app/Presenters/ComponentPresenter.php index 32e63ac713..be15144623 100644 --- a/app/Presenters/ComponentPresenter.php +++ b/app/Presenters/ComponentPresenter.php @@ -126,7 +126,7 @@ class ComponentPresenter extends Presenter 'field' => 'purchase_cost', 'searchable' => true, 'sortable' => true, - 'title' => trans('general.purchase_cost'), + 'title' => trans('general.unit_cost'), 'visible' => true, 'footerFormatter' => 'sumFormatterQuantity', 'class' => 'text-right', diff --git a/app/Presenters/ConsumablePresenter.php b/app/Presenters/ConsumablePresenter.php index 57f628c5ba..da167c0d2c 100644 --- a/app/Presenters/ConsumablePresenter.php +++ b/app/Presenters/ConsumablePresenter.php @@ -126,7 +126,7 @@ class ConsumablePresenter extends Presenter 'field' => 'purchase_cost', 'searchable' => true, 'sortable' => true, - 'title' => trans('general.purchase_cost'), + 'title' => trans('general.unit_cost'), 'visible' => true, 'footerFormatter' => 'sumFormatterQuantity', 'class' => 'text-right text-padding-number-cell', diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php index a3b6eb37e6..b7c62a8aa7 100644 --- a/resources/lang/en-US/general.php +++ b/resources/lang/en-US/general.php @@ -313,6 +313,7 @@ return [ 'undeployable' => 'Un-deployable', 'unknown_admin' => 'Unknown Admin', 'unknown_user' => 'Unknown User', + 'unit_cost' => 'Unit Cost', 'username' => 'Username', 'update' => 'Update', 'updating_item' => 'Updating :item', diff --git a/resources/views/accessories/edit.blade.php b/resources/views/accessories/edit.blade.php index 86015b7643..a327df5fa9 100644 --- a/resources/views/accessories/edit.blade.php +++ b/resources/views/accessories/edit.blade.php @@ -24,7 +24,7 @@ @include ('partials.forms.edit.model_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.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.minimum_quantity') @include ('partials.forms.edit.notes') diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php index 695c8dc714..e0f276e755 100644 --- a/resources/views/accessories/view.blade.php +++ b/resources/views/accessories/view.blade.php @@ -236,7 +236,7 @@
- {{ trans('general.purchase_cost') }} + {{ trans('general.unit_cost') }}
diff --git a/resources/views/components/edit.blade.php b/resources/views/components/edit.blade.php index b9a393f1d1..c6445cf1e0 100644 --- a/resources/views/components/edit.blade.php +++ b/resources/views/components/edit.blade.php @@ -28,7 +28,7 @@ @include ('partials.forms.edit.supplier-select', ['translated_name' => trans('general.supplier'), 'fieldname' => 'supplier_id']) @include ('partials.forms.edit.order_number') @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.image-upload', ['image_path' => app('components_upload_path')]) diff --git a/resources/views/components/view.blade.php b/resources/views/components/view.blade.php index 42cd033e28..6c0d8840ad 100644 --- a/resources/views/components/view.blade.php +++ b/resources/views/components/view.blade.php @@ -201,7 +201,7 @@ @endif @if ($component->purchase_cost) -
{{ trans('admin/components/general.cost') }}: +
{{ trans('general.unit_cost') }}: {{ $snipeSettings->default_currency }} {{ Helper::formatCurrencyOutput($component->purchase_cost) }}
diff --git a/resources/views/consumables/edit.blade.php b/resources/views/consumables/edit.blade.php index 5b8dd736c6..4ce6de9d78 100644 --- a/resources/views/consumables/edit.blade.php +++ b/resources/views/consumables/edit.blade.php @@ -24,7 +24,7 @@ @include ('partials.forms.edit.item_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.purchase_cost') +@include ('partials.forms.edit.purchase_cost', [ 'unit_cost' => trans('general.unit_cost')]) @include ('partials.forms.edit.quantity') @include ('partials.forms.edit.minimum_quantity') @include ('partials.forms.edit.notes') diff --git a/resources/views/consumables/view.blade.php b/resources/views/consumables/view.blade.php index f468eedfd7..376a4ddfed 100644 --- a/resources/views/consumables/view.blade.php +++ b/resources/views/consumables/view.blade.php @@ -272,7 +272,7 @@ @if ($consumable->purchase_cost)
- {{ trans('general.purchase_cost') }} + {{ trans('general.unit_cost') }}
{{ $snipeSettings->default_currency }} diff --git a/resources/views/partials/forms/edit/purchase_cost.blade.php b/resources/views/partials/forms/edit/purchase_cost.blade.php index 8256bc11ad..467ff6c410 100644 --- a/resources/views/partials/forms/edit/purchase_cost.blade.php +++ b/resources/views/partials/forms/edit/purchase_cost.blade.php @@ -1,6 +1,6 @@
- +
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index 0b0be323ff..7dc8590c08 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -927,7 +927,7 @@ {{ trans('general.name') }} {{ trans('general.date') }} {{ trans('general.notes') }} - {{ trans('general.purchase_cost') }} + {{ trans('general.unit_cost') }} {{ trans('general.action') }} @@ -971,7 +971,7 @@ {{ trans('general.name') }} - {{ trans('general.purchase_cost') }} + {{ trans('general.unit_cost') }} {{ trans('general.date') }} {{ trans('general.notes') }}