Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <[email protected]>

# Conflicts:
#	config/version.php

Author: snipe

app/Http/Controllers/Api/ConsumablesController.php

@@ -154,7 +154,7 @@ public function store(ImageUploadRequest $request)
     public function show($id)
     {
         $this->authorize('view', Consumable::class);
-        $consumable = Consumable::findOrFail($id);
+        $consumable = Consumable::with('users')->findOrFail($id);
 
         return (new ConsumablesTransformer)->transformConsumable($consumable);
     }
@@ -253,33 +253,39 @@ public function getDataView($consumableId)
     public function checkout(Request $request, $id)
     {
         // Check if the consumable exists
-        if (is_null($consumable = Consumable::find($id))) {
+        if (!$consumable = Consumable::with('users')->find($id)) {
             return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/consumables/message.does_not_exist')));
         }
 
         $this->authorize('checkout', $consumable);
 
-        if ($consumable->qty > 0) {
+        // Make sure there is at least one available to checkout
+        if ($consumable->numRemaining() <= 0) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/consumables/message.checkout.unavailable')));
+            \Log::debug('No enough remaining');
+        }
 
-            // Check if the user exists
-            $assigned_to = $request->input('assigned_to');
-            if (is_null($user = User::find($assigned_to))) {
-                // Return error message
-                return response()->json(Helper::formatStandardApiResponse('error', null, 'No user found'));
-            }
+        // Check if the user exists - @TODO:  this should probably be handled via validation, not here??
+        if (!$user = User::find($request->input('assigned_to'))) {
+            // Return error message
+            return response()->json(Helper::formatStandardApiResponse('error', null, 'No user found'));
+            \Log::debug('No valid user');
+        }
 
-            // Update the consumable data
-            $consumable->assigned_to = e($assigned_to);
+        // Update the consumable data
+        $consumable->assigned_to = $request->input('assigned_to');
 
-            $consumable->users()->attach($consumable->id, [
-                'consumable_id' => $consumable->id,
-                'user_id' => $user->id,
-                'assigned_to' => $assigned_to,
-                'note' => $request->input('note'),
-            ]);
+        $consumable->users()->attach($consumable->id,
+                [
+                    'consumable_id' => $consumable->id,
+                    'user_id' => $user->id,
+                    'assigned_to' => $request->input('assigned_to'),
+                    'note' => $request->input('note'),
+                ]
+            );
 
             // Log checkout event
-            $logaction = $consumable->logCheckout(e($request->input('note')), $user);
+            $logaction = $consumable->logCheckout($request->input('note'), $user);
             $data['log_id'] = $logaction->id;
             $data['eula'] = $consumable->getEula();
             $data['first_name'] = $user->first_name;
@@ -289,9 +295,7 @@ public function checkout(Request $request, $id)
             $data['require_acceptance'] = $consumable->requireAcceptance();
 
             return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/consumables/message.checkout.success')));
-        }
 
-        return response()->json(Helper::formatStandardApiResponse('error', null, 'No consumables remaining'));
     }
 
     /**

app/Http/Controllers/Consumables/ConsumableCheckoutController.php

@@ -24,9 +24,16 @@ class ConsumableCheckoutController extends Controller
      */
     public function create($consumableId)
     {
-        if (is_null($consumable = Consumable::find($consumableId))) {
+
+        if (is_null($consumable = Consumable::with('users')->find($consumableId))) {
             return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.does_not_exist'));
         }
+
+        // Make sure there is at least one available to checkout
+        if ($consumable->numRemaining() <= 0){
+            return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.checkout.unavailable'));
+        }
+
         $this->authorize('checkout', $consumable);
 
         return view('consumables/checkout', compact('consumable'));
@@ -44,12 +51,18 @@ public function create($consumableId)
      */
     public function store(Request $request, $consumableId)
     {
-        if (is_null($consumable = Consumable::find($consumableId))) {
+        if (is_null($consumable = Consumable::with('users')->find($consumableId))) {
             return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.not_found'));
         }
 
         $this->authorize('checkout', $consumable);
 
+        // Make sure there is at least one available to checkout
+        if ($consumable->numRemaining() <= 0) {
+            return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.checkout.unavailable'));
+        }
+
+
         $admin_user = Auth::user();
         $assigned_to = e($request->input('assigned_to'));
 

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v6.1.0-pre',
-  'full_app_version' => 'v6.1.0-pre - build 10030-gdcbd216e2',
-  'build_version' => '10030',
+  'app_version' => 'v6.1.0',
+  'full_app_version' => 'v6.1.0 - build 10161-ga8ca3ad2a',
+  'build_version' => '10161',
   'prerelease_version' => '',
-  'hash_version' => 'gdcbd216e2',
-  'full_hash' => 'v6.1.0-pre-986-gdcbd216e2',
+  'hash_version' => 'ga8ca3ad2a',
+  'full_hash' => 'v6.1.0-127-ga8ca3ad2a',
   'branch' => 'master',
 );

resources/lang/af/admin/accessories/general.php

@@ -16,5 +16,6 @@
     'update'  							=> 'Opdatering bywerk',
     'use_default_eula'					=> 'Gebruik eerder die <a href="#" data-toggle="modal" data-target="#eulaModal">primary standaard EULA</a>.',
     'use_default_eula_disabled'			=> '<del>Gebruik die primêre standaardverlof in plaas daarvan.</del> Geen primêre standaard EULA is ingestel nie. Voeg asseblief een by Instellings.',
+    'clone'                             => 'Clone Accessory',
 
 );

resources/lang/af/admin/accessories/message.php

@@ -24,6 +24,7 @@
      'checkout' => array(
         'error'   		=> 'Toebehore is nie nagegaan nie, probeer asseblief weer',
         'success' 		=> 'Toebehore suksesvol nagegaan.',
+        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
         'user_does_not_exist' => 'Die gebruiker is ongeldig. Probeer asseblief weer.'
     ),
 

resources/lang/af/admin/asset_maintenances/form.php

@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Onderhoudstipe',
+        'asset_maintenance_type' => 'Asset Maintenance Type',
         'title'                  => 'Titel',
-        'start_date'             => 'begin',
-        'completion_date'        => 'voltooi',
+        'start_date'             => 'Start Date',
+        'completion_date'        => 'Completion Date',
         'cost'                   => 'koste',
         'is_warranty'            => 'Garantieverbetering',
-        'asset_maintenance_time' => 'dae',
+        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
         'notes'                  => 'notas',
-        'update'                 => 'Opdateer',
-        'create'                 => 'Skep'
+        'update'                 => 'Update Asset Maintenance',
+        'create'                 => 'Create Asset Maintenance'
     ];

resources/lang/af/admin/groups/message.php

@@ -3,7 +3,7 @@
 return array(
 
     'group_exists'        => 'Groep bestaan ​​reeds!',
-    'group_not_found'     => 'Groep [: id] bestaan ​​nie.',
+    'group_not_found'     => 'Group ID :id does not exist.',
     'group_name_required' => 'Die naam veld is nodig',
 
     'success' => array(

resources/lang/af/admin/hardware/form.php

@@ -2,8 +2,11 @@
 
 return [
     'bulk_delete'		=> 'Bevestig bates vir die verwydering van grootmaat',
+    'bulk_restore'      => 'Confirm Bulk Restore Assets', 
   'bulk_delete_help'	=> 'Hersien die bates vir grootmaatverwydering hieronder. Sodra dit verwyder is, kan hierdie bates herstel word, maar hulle word nie meer geassosieer met enige gebruikers wat hulle tans toegewys is nie.',
+  'bulk_restore_help'	=> 'Review the assets for bulk restoration below. Once restored, these assets will not be associated with any users they were previously assigned to.',
   'bulk_delete_warn'	=> 'Jy is op die punt om te verwyder: bate_count bates.',
+  'bulk_restore_warn'	=> 'You are about to restore :asset_count assets.',
     'bulk_update'		=> 'Grootskaalse opdateringsbates',
     'bulk_update_help'	=> 'Met hierdie vorm kan u verskeie bates gelyktydig bywerk. Vul slegs die velde in wat u moet verander. Enige velde wat leeg is, bly onveranderd.',
     'bulk_update_warn'	=> 'You are about to edit the properties of a single asset.|You are about to edit the properties of :asset_count assets.',
@@ -45,7 +48,7 @@
     'asset_location_update_default' => 'Update only default location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
     'optional_infos'  => 'Optional Information',
     'order_details'   => 'Order Related Information'
 ];

resources/lang/af/admin/hardware/general.php

@@ -42,5 +42,6 @@
     'error_messages' => 'Error messages:',
     'success_messages' => 'Success messages:',
     'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Custom Export',
+    'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
 ];

resources/lang/af/admin/hardware/message.php

@@ -22,6 +22,8 @@
     'restore' => [
         'error'   		=> 'Bate is nie herstel nie, probeer asseblief weer',
         'success' 		=> 'Bate herstel suksesvol.',
+        'bulk_success' 		=> 'Asset restored successfully.',
+        'nothing_updated'   => 'No assets were selected, so nothing was restored.', 
     ],
 
     'audit' => [