DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-31 16:37:27 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'
Some checks are pending
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run
Details
Codacy Security Scan / Codacy Security Scan (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details

Browse source
This commit is contained in:
snipe 2024-10-23 19:14:36 +01:00
parent 574f2e096d 55ba6279a4
commit 7bbe23995d
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
database/factories/ComponentFactory.php
View file

@ -7,6 +7,7 @@ use App\Models\Asset;
use App\Models\Category; use App\Models\Category;
use App\Models\Company; use App\Models\Company;
use App\Models\Component; use App\Models\Component;
use App\Models\Manufacturer;
use App\Models\Consumable; use App\Models\Consumable;
use App\Models\Location; use App\Models\Location;
use App\Models\User; use App\Models\User;
@ -41,7 +42,9 @@ class ComponentFactory extends Factory
'purchase_cost' => $this->faker->randomFloat(2), 'purchase_cost' => $this->faker->randomFloat(2),
'min_amt' => $this->faker->numberBetween($min = 1, $max = 2), 'min_amt' => $this->faker->numberBetween($min = 1, $max = 2),
'company_id' => Company::factory(), 'company_id' => Company::factory(),
'manufacturer_id' => $this->faker->numberBetween(1, 5),
'supplier_id' => Supplier::factory(), 'supplier_id' => Supplier::factory(),
'model_number' => $this->faker->numberBetween(1000000, 50000000),
]; ];
} }

2
resources/lang/en-US/general.php
View file

@ -230,7 +230,7 @@ return [
'purchase_date' => 'Purchase Date', 'purchase_date' => 'Purchase Date',
'qty' => 'QTY', 'qty' => 'QTY',
'quantity' => 'Quantity', 'quantity' => 'Quantity',
'quantity_minimum' => 'You have :count items below or almost below minimum quantity levels', 'quantity_minimum' => 'You have one item below or almost below minimum quantity levels|You have :count items below or almost below minimum quantity levels',
'quickscan_checkin' => 'Quick Scan Checkin', 'quickscan_checkin' => 'Quick Scan Checkin',
'quickscan_checkin_status' => 'Checkin Status', 'quickscan_checkin_status' => 'Checkin Status',
'ready_to_deploy' => 'Ready to Deploy', 'ready_to_deploy' => 'Ready to Deploy',

4
resources/views/layouts/default.blade.php
View file

@ -279,7 +279,7 @@ dir="{{ Helper::determineLanguageDirection() }}">
@endif @endif
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li class="header">{{ trans('general.quantity_minimum', array('count' => count($alert_items))) }}</li> <li class="header">{{ trans_choice('general.quantity_minimum', count($alert_items)) }}</li>
<li> <li>
<!-- inner menu: contains the actual data --> <!-- inner menu: contains the actual data -->
<ul class="menu"> <ul class="menu">
@ -287,7 +287,7 @@ dir="{{ Helper::determineLanguageDirection() }}">
@for($i = 0; count($alert_items) > $i; $i++) @for($i = 0; count($alert_items) > $i; $i++)
<li><!-- Task item --> <li><!-- Task item -->
<a href="{{route($alert_items[$i]['type'].'.show', $alert_items[$i]['id'])}}"> <a href="{{ route($alert_items[$i]['type'].'.show', $alert_items[$i]['id'])}}">
<h2 class="task_menu">{{ $alert_items[$i]['name'] }} <h2 class="task_menu">{{ $alert_items[$i]['name'] }}
<small class="pull-right"> <small class="pull-right">
{{ $alert_items[$i]['remaining'] }} {{ trans('general.remaining') }} {{ $alert_items[$i]['remaining'] }} {{ trans('general.remaining') }}