Merge remote-tracking branch 'origin/develop'

Author: snipe

database/factories/ComponentFactory.php

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

resources/lang/en-US/general.php

@@ -230,7 +230,7 @@
     'purchase_date'         => 'Purchase Date',
     'qty'		            => 'QTY',
     '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_status'  	=> 'Checkin Status',
     'ready_to_deploy'		=> 'Ready to Deploy',

resources/views/layouts/default.blade.php

@@ -279,15 +279,15 @@
                                             @endif
                                         </a>
                                         <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>
                                                 <!-- inner menu: contains the actual data -->
                                                 <ul class="menu">
 
                                                     @for($i = 0; count($alert_items) > $i; $i++)
 
                                                         <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'] }}
                                                                     <small class="pull-right">
                                                                         {{ $alert_items[$i]['remaining'] }} {{ trans('general.remaining') }}