diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php index 5fd2c9e44d..8ac8149f0e 100755 --- a/app/Http/Controllers/AssetsController.php +++ b/app/Http/Controllers/AssetsController.php @@ -267,7 +267,7 @@ class AssetsController extends Controller if (Input::get('assigned_to')!='') { $user = User::find(e(Input::get('assigned_to'))); - $asset->checkOutToUser($user, Auth::user(), date('Y-m-d h:i:s'), '', 'Checked out on asset creation', e(Input::get('name'))); + $asset->checkOutToUser($user, Auth::user(), date('Y-m-d H:i:s'), '', 'Checked out on asset creation', e(Input::get('name'))); } // Redirect to the asset listing page \Session::flash('success', trans('admin/hardware/message.create.success')); @@ -1588,7 +1588,7 @@ class AssetsController extends Controller foreach ($assets as $asset) { //echo '
  • '.$asset; - $update_array['deleted_at'] = date('Y-m-d h:i:s'); + $update_array['deleted_at'] = date('Y-m-d H:i:s'); $update_array['assigned_to'] = null; if (DB::table('assets') diff --git a/app/Http/Controllers/ComponentsController.php b/app/Http/Controllers/ComponentsController.php index 83b252409e..080f01e847 100644 --- a/app/Http/Controllers/ComponentsController.php +++ b/app/Http/Controllers/ComponentsController.php @@ -345,7 +345,7 @@ class ComponentsController extends Controller $component->assets()->attach($component->id, array( 'component_id' => $component->id, 'user_id' => $admin_user->id, - 'created_at' => date('Y-m-d h:i:s'), + 'created_at' => date('Y-m-d H:i:s'), 'assigned_qty' => e(Input::get('assigned_qty')), 'asset_id' => $asset_id)); diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php index ac6032cc72..35f3779cc2 100755 --- a/app/Http/Controllers/UsersController.php +++ b/app/Http/Controllers/UsersController.php @@ -1028,7 +1028,7 @@ class UsersController extends Controller $logaction->user_id = Auth::user()->id; $logaction->note = e(Input::get('notes')); $logaction->target_id = null; - $logaction->created_at = date("Y-m-d h:i:s"); + $logaction->created_at = date("Y-m-d H:i:s"); $logaction->filename = $filename; $logaction->action_type = 'uploaded'; $logaction->save(); diff --git a/app/Http/Controllers/ViewAssetsController.php b/app/Http/Controllers/ViewAssetsController.php index 8447ec56ce..bc2401dbee 100755 --- a/app/Http/Controllers/ViewAssetsController.php +++ b/app/Http/Controllers/ViewAssetsController.php @@ -86,7 +86,7 @@ class ViewAssetsController extends Controller $logaction = new Actionlog(); $logaction->item_id = $data['asset_id'] = $item->id; $logaction->item_type = $fullItemType; - $logaction->created_at = $data['requested_date'] = date("Y-m-d h:i:s"); + $logaction->created_at = $data['requested_date'] = date("Y-m-d H:i:s"); if ($user->location_id) { $logaction->location_id = $user->location_id; } @@ -207,7 +207,7 @@ class ViewAssetsController extends Controller $logaction = new Actionlog(); $logaction->item_id = $data['asset_id'] = $asset->id; $logaction->item_type = Asset::class; - $logaction->created_at = $data['requested_date'] = date("Y-m-d h:i:s"); + $logaction->created_at = $data['requested_date'] = date("Y-m-d H:i:s"); $data['asset_type'] = 'hardware'; if ($user->location_id) { $logaction->location_id = $user->location_id; @@ -356,7 +356,7 @@ class ViewAssetsController extends Controller $logaction->note = e(Input::get('note')); $logaction->user_id = $user->id; - $logaction->accepted_at = date("Y-m-d h:i:s"); + $logaction->accepted_at = date("Y-m-d H:i:s"); $log = $logaction->logaction($logaction_msg); $update_checkout = DB::table('action_logs')