@@ -74,13 +74,13 @@ discard block |
||
74 | 74 | protected function isFileDup($fileName) |
75 | 75 | { |
76 | 76 | // Determine if the filename already exists |
77 | - if (Storage::exists($this->path . DIRECTORY_SEPARATOR . $fileName)) |
|
77 | + if(Storage::exists($this->path.DIRECTORY_SEPARATOR.$fileName)) |
|
78 | 78 | { |
79 | 79 | $fileParts = pathinfo($fileName); |
80 | - $extension = isset($fileParts['extension']) ? ('.' . $fileParts['extension']) : ''; |
|
80 | + $extension = isset($fileParts['extension']) ? ('.'.$fileParts['extension']) : ''; |
|
81 | 81 | |
82 | 82 | // Look to see if a number is already appended to a file. (example - file(1).pdf) |
83 | - if (preg_match('/(.*?)(\d+)$/', $fileParts['filename'], $match)) |
|
83 | + if(preg_match('/(.*?)(\d+)$/', $fileParts['filename'], $match)) |
|
84 | 84 | { |
85 | 85 | // Has a number, increment it |
86 | 86 | $base = $match[1]; |
@@ -96,8 +96,8 @@ discard block |
||
96 | 96 | // Increase the number until one that is not in use is found |
97 | 97 | do |
98 | 98 | { |
99 | - $fileName = $base . '(' . ++$number . ')' . $extension; |
|
100 | - } while (Storage::exists($this->path.DIRECTORY_SEPARATOR.$fileName)); |
|
99 | + $fileName = $base.'('.++$number.')'.$extension; |
|
100 | + } while(Storage::exists($this->path.DIRECTORY_SEPARATOR.$fileName)); |
|
101 | 101 | } |
102 | 102 | |
103 | 103 | return $fileName; |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | { |
109 | 109 | $data = Files::find($fileID); |
110 | 110 | // Move the file to the proper folder |
111 | - try{ |
|
111 | + try { |
|
112 | 112 | Log::debug('Attempting to moving file '.$fileID.' to '.$newPath); |
113 | 113 | Storage::move($data->file_link.$data->file_name, $newPath.DIRECTORY_SEPARATOR.$data->file_name); |
114 | 114 | } |
@@ -108,7 +108,8 @@ |
||
108 | 108 | { |
109 | 109 | $data = Files::find($fileID); |
110 | 110 | // Move the file to the proper folder |
111 | - try{ |
|
111 | + try |
|
112 | + { |
|
112 | 113 | Log::debug('Attempting to moving file '.$fileID.' to '.$newPath); |
113 | 114 | Storage::move($data->file_link.$data->file_name, $newPath.DIRECTORY_SEPARATOR.$data->file_name); |
114 | 115 | } |
@@ -81,8 +81,7 @@ |
||
81 | 81 | |
82 | 82 | // Determine if there is a new password expire's date |
83 | 83 | $newExpire = config('auth.passwords.settings.expire') != null ? |
84 | - Carbon::now()->addDays(config('auth.passwords.settings.expire')) : |
|
85 | - null; |
|
84 | + Carbon::now()->addDays(config('auth.passwords.settings.expire')) : null; |
|
86 | 85 | |
87 | 86 | User::find($userID)->update([ |
88 | 87 | 'password' => bcrypt($request->newPass), |
@@ -47,8 +47,7 @@ discard block |
||
47 | 47 | $searchResults = new CustomersCollection( |
48 | 48 | Customers::orderBy($request->sortField, $request->sortType) |
49 | 49 | // Search the name, dba name, and cust id columns |
50 | - ->where(function($query) use ($request) |
|
51 | - { |
|
50 | + ->where(function($query) use ($request) { |
|
52 | 51 | $query->where('name', 'like', '%'.$request->name.'%') |
53 | 52 | ->orWhere('cust_id', 'like', '%'.$request->name.'%') |
54 | 53 | ->orWhere('dba_name', 'like', '%'.$request->name.'%'); |
@@ -58,10 +57,8 @@ discard block |
||
58 | 57 | // Include the customers systems |
59 | 58 | ->with('CustomerSystems.SystemTypes') |
60 | 59 | // If the system field is present - search for system type |
61 | - ->when($request->system, function($query) use ($request) |
|
62 | - { |
|
63 | - $query->whereHas('CustomerSystems.SystemTypes', function($query) use ($request) |
|
64 | - { |
|
60 | + ->when($request->system, function($query) use ($request) { |
|
61 | + $query->whereHas('CustomerSystems.SystemTypes', function($query) use ($request) { |
|
65 | 62 | $query->where('sys_id', $request->system); |
66 | 63 | }); |
67 | 64 | }) |