mirror of
https://github.com/snipe/snipe-it.git
synced 2024-09-21 00:07:42 -07:00
323c3807fa
* Make delete routes work. We put a little form in the modal that spoofs the delete field.
* Fix route on creating a user.
* Fix redundant id parameter.
* Port acceptance tests to new urls.
* Initial work on migrating to model based policies instead of global gates. Will allow for much more detailed permissions bits in the future.
* This needs to stay for the dashboard checks.
* Add user states for permissions to build tests.
* Build up unit tests for gates/permissions. Move accessories/consumables/assets to policies instead of in authserviceprovider
* Migrate various locations to new syntax. Update test to be more specific
* Fix functional tests.
Add an artisan command for installing a settings setup on travis-ci
* Try a different id... Need to come up with a better way of passing the id for tests that need an existing one.
* Try to fix travis
* Update urls to use routes and not hardcode old paths. Also fix some migration errors found along the way.:
* Add a environment for travis functional tests.
* Adjust config file to make travis use it.
* Use redirect()->route instead of redirect()-to
* Dump all failures in the output directory if travis fails.
* Cleanups and minor fixes.
* Adjust the supplier modelfactory to comply with new validation restrictions.
* Some test fixes.
* Locales can be longer than 5 characters according to faker... fex gez_ET. Increase lenght in mysql and add a validation
* Update test database dump to latest migrations.
* Extend Supplier phone/fax length.
This catches issues found in testing with a phone number with a five digit extension. fex (356) 654-3024 x36632
Also move away from escaping all values put into eloquent. Eloquent
already uses PDO parameter binding, and this was leading to names like
Mr Ryan O'Malley turning into an html escaped version of that name when
stored. All values should be escaped when using {{}}, we'll just have
to be more cautious when we use {!!, but I think we already are?
* Remove additional escaping here, like we did in suppliers controller.
* No need to eager load all of these relationships when we can call the count on the querybuilder directly
* Work on controller cleanup
* Always start from scrach, catches more issues this way.
* Update sql dump. Remove old code from permissions test.
* Generate a deletable item on demand in the test, rather than relying on one existing. I think we should probably move to mock all the database stuff at some point..
* More travis related fixes
* Break script into multiple functional lines
* Update all controllers to use the new helper, also cleanup syntax and docblocks along the way.
285 lines
10 KiB
PHP
Executable file
285 lines
10 KiB
PHP
Executable file
<?php
|
|
namespace App\Http\Controllers;
|
|
|
|
use App\Helpers\Helper;
|
|
use Image;
|
|
use App\Models\AssetMaintenance;
|
|
use Input;
|
|
use Lang;
|
|
use App\Models\Supplier;
|
|
use Redirect;
|
|
use App\Models\Setting;
|
|
use Str;
|
|
use View;
|
|
use Auth;
|
|
use Illuminate\Http\Request;
|
|
|
|
use Symfony\Component\HttpFoundation\JsonResponse;
|
|
|
|
/**
|
|
* This controller handles all actions related to Suppliers for
|
|
* the Snipe-IT Asset Management application.
|
|
*
|
|
* @version v1.0
|
|
*/
|
|
class SuppliersController extends Controller
|
|
{
|
|
/**
|
|
* Show a list of all suppliers
|
|
*
|
|
* @return \Illuminate\Contracts\View\View
|
|
*/
|
|
public function index()
|
|
{
|
|
// Grab all the suppliers
|
|
$suppliers = Supplier::orderBy('created_at', 'DESC')->get();
|
|
|
|
// Show the page
|
|
return View::make('suppliers/index', compact('suppliers'));
|
|
}
|
|
|
|
|
|
/**
|
|
* Supplier create.
|
|
*
|
|
* @return \Illuminate\Contracts\View\View
|
|
*/
|
|
public function create()
|
|
{
|
|
return View::make('suppliers/edit')->with('item', new Supplier);
|
|
}
|
|
|
|
|
|
/**
|
|
* Supplier create form processing.
|
|
*
|
|
* @param Request $request
|
|
* @return \Illuminate\Http\RedirectResponse
|
|
*/
|
|
public function store(Request $request)
|
|
{
|
|
// Create a new supplier
|
|
$supplier = new Supplier;
|
|
// Save the location data
|
|
$supplier->name = request('name');
|
|
$supplier->address = request('address');
|
|
$supplier->address2 = request('address2');
|
|
$supplier->city = request('city');
|
|
$supplier->state = request('state');
|
|
$supplier->country = request('country');
|
|
$supplier->zip = request('zip');
|
|
$supplier->contact = request('contact');
|
|
$supplier->phone = request('phone');
|
|
$supplier->fax = request('fax');
|
|
$supplier->email = request('email');
|
|
$supplier->notes = request('notes');
|
|
$supplier->url = $supplier->addhttp(request('url'));
|
|
$supplier->user_id = Auth::id();
|
|
|
|
if (Input::file('image')) {
|
|
$image = $request->file('image');
|
|
$file_name = str_random(25).".".$image->getClientOriginalExtension();
|
|
$path = public_path('uploads/suppliers/'.$file_name);
|
|
Image::make($image->getRealPath())->resize(300, null, function ($constraint) {
|
|
$constraint->aspectRatio();
|
|
$constraint->upsize();
|
|
})->save($path);
|
|
$supplier->image = $file_name;
|
|
}
|
|
|
|
// Was it created?
|
|
if ($supplier->save()) {
|
|
// Redirect to the new supplier page
|
|
return redirect()->route('suppliers.index')->with('success', trans('admin/suppliers/message.create.success'));
|
|
}
|
|
return redirect()->back()->withInput()->withErrors($supplier->getErrors());
|
|
}
|
|
|
|
/**
|
|
* @param Request $request
|
|
* @return JsonResponse
|
|
*/
|
|
public function apiStore(Request $request)
|
|
{
|
|
$supplier = new Supplier;
|
|
$supplier->name = $request->input('name');
|
|
$supplier->user_id = Auth::id();
|
|
|
|
if ($supplier->save()) {
|
|
return JsonResponse::create($supplier);
|
|
}
|
|
return JsonResponse::create(["error" => "Failed validation: ".print_r($supplier->getErrors(), true)], 500);
|
|
}
|
|
|
|
/**
|
|
* Supplier update.
|
|
*
|
|
* @param int $supplierId
|
|
* @return \Illuminate\Contracts\View\View
|
|
*/
|
|
public function edit($supplierId = null)
|
|
{
|
|
// Check if the supplier exists
|
|
if (is_null($item = Supplier::find($supplierId))) {
|
|
// Redirect to the supplier page
|
|
return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.does_not_exist'));
|
|
}
|
|
|
|
// Show the page
|
|
return View::make('suppliers/edit', compact('item'));
|
|
}
|
|
|
|
|
|
/**
|
|
* Supplier update form processing page.
|
|
*
|
|
* @param int $supplierId
|
|
* @return \Illuminate\Http\RedirectResponse
|
|
*/
|
|
public function update($supplierId = null, Request $request)
|
|
{
|
|
// Check if the supplier exists
|
|
if (is_null($supplier = Supplier::find($supplierId))) {
|
|
// Redirect to the supplier page
|
|
return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.does_not_exist'));
|
|
}
|
|
|
|
// Save the data
|
|
$supplier->name = request('name');
|
|
$supplier->address = request('address');
|
|
$supplier->address2 = request('address2');
|
|
$supplier->city = request('city');
|
|
$supplier->state = request('state');
|
|
$supplier->country = request('country');
|
|
$supplier->zip = request('zip');
|
|
$supplier->contact = request('contact');
|
|
$supplier->phone = request('phone');
|
|
$supplier->fax = request('fax');
|
|
$supplier->email = request('email');
|
|
$supplier->url = $supplier->addhttp(request('url'));
|
|
$supplier->notes = request('notes');
|
|
|
|
if (Input::file('image')) {
|
|
$image = $request->file('image');
|
|
$file_name = str_random(25).".".$image->getClientOriginalExtension();
|
|
$path = public_path('uploads/suppliers/'.$file_name);
|
|
Image::make($image->getRealPath())->resize(300, null, function ($constraint) {
|
|
$constraint->aspectRatio();
|
|
$constraint->upsize();
|
|
})->save($path);
|
|
$supplier->image = $file_name;
|
|
}
|
|
|
|
if (request('image_delete') == 1 && $request->file('image') == "") {
|
|
$supplier->image = null;
|
|
}
|
|
|
|
if ($supplier->save()) {
|
|
return redirect()->route('suppliers.index')->with('success', trans('admin/suppliers/message.update.success'));
|
|
}
|
|
|
|
return redirect()->back()->withInput()->withErrors($supplier->getErrors());
|
|
|
|
}
|
|
|
|
/**
|
|
* Delete the given supplier.
|
|
*
|
|
* @param int $supplierId
|
|
* @return \Illuminate\Http\RedirectResponse
|
|
*/
|
|
public function destroy($supplierId)
|
|
{
|
|
// Check if the supplier exists
|
|
if (is_null($supplier = Supplier::find($supplierId))) {
|
|
// Redirect to the suppliers page
|
|
return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.not_found'));
|
|
}
|
|
|
|
if ($supplier->num_assets() == 0) {
|
|
// Delete the supplier
|
|
$supplier->delete();
|
|
// Redirect to the suppliers management page
|
|
return redirect()->route('suppliers.index')->with('success',
|
|
trans('admin/suppliers/message.delete.success'));
|
|
}
|
|
// Redirect to the asset management page
|
|
return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.assoc_users'));
|
|
}
|
|
|
|
|
|
/**
|
|
* Get the asset information to present to the supplier view page
|
|
*
|
|
* @param null $supplierId
|
|
* @return \Illuminate\Contracts\View\View
|
|
* @internal param int $assetId
|
|
*/
|
|
public function show($supplierId = null)
|
|
{
|
|
$supplier = Supplier::find($supplierId);
|
|
|
|
if (isset($supplier->id)) {
|
|
return View::make('suppliers/view', compact('supplier'));
|
|
}
|
|
// Prepare the error message
|
|
$error = trans('admin/suppliers/message.does_not_exist', compact('id'));
|
|
|
|
// Redirect to the user management page
|
|
return redirect()->route('suppliers')->with('error', $error);
|
|
}
|
|
|
|
public function getDatatable()
|
|
{
|
|
$suppliers = Supplier::with('assets', 'licenses')->select(array('id','name','address','address2','city','state','country','fax', 'phone','email','contact'))
|
|
->whereNull('deleted_at');
|
|
|
|
if (Input::has('search')) {
|
|
$suppliers = $suppliers->TextSearch(e(Input::get('search')));
|
|
}
|
|
|
|
$offset = request('offset', 0);
|
|
$limit = request('limit', 50);
|
|
|
|
|
|
$allowed_columns = ['id','name','address','phone','contact','fax','email'];
|
|
$order = Input::get('order') === 'asc' ? 'asc' : 'desc';
|
|
$sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
|
|
|
|
$suppliers->orderBy($sort, $order);
|
|
|
|
$suppliersCount = $suppliers->count();
|
|
$suppliers = $suppliers->skip($offset)->take($limit)->get();
|
|
|
|
$rows = array();
|
|
|
|
foreach ($suppliers as $supplier) {
|
|
$actions = '<nobr>';
|
|
$actions .= Helper::generateDatatableButton('edit', route('suppliers.edit', $supplier->id));
|
|
$actions .= Helper::generateDatatableButton(
|
|
'delete',
|
|
route('suppliers.destroy', $supplier->id),
|
|
true, /*enabled*/
|
|
trans('admin/suppliers/message.delete.confirm'),
|
|
$supplier->name
|
|
);
|
|
$actions .= '</nobr>';
|
|
|
|
$rows[] = array(
|
|
'id' => $supplier->id,
|
|
'name' => (string)link_to_route('suppliers.show', e($supplier->name), ['supplier' => $supplier->id ]),
|
|
'contact' => e($supplier->contact),
|
|
'address' => e($supplier->address).' '.e($supplier->address2).' '.e($supplier->city).' '.e($supplier->state).' '.e($supplier->country),
|
|
'phone' => e($supplier->phone),
|
|
'fax' => e($supplier->fax),
|
|
'email' => ($supplier->email!='') ? '<a href="mailto:'.e($supplier->email).'">'.e($supplier->email).'</a>' : '',
|
|
'assets' => $supplier->assets->count(),
|
|
'licenses' => $supplier->licenses->count(),
|
|
'actions' => $actions
|
|
);
|
|
}
|
|
$data = array('total' => $suppliersCount, 'rows' => $rows);
|
|
return $data;
|
|
}
|
|
}
|