Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/Http/Controllers/Controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
use App\Models\License;
use App\Models\Location;
use App\Models\Maintenance;
use App\Models\Supplier;
use App\Models\User;
use Illuminate\Support\Facades\Auth;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
Expand All @@ -52,6 +53,7 @@ abstract class Controller extends BaseController
'licenses' => License::class,
'locations' => Location::class,
'models' => AssetModel::class,
'suppliers' => Supplier::class,
'users' => User::class,
];

Expand All @@ -66,6 +68,7 @@ abstract class Controller extends BaseController
'licenses' => 'private_uploads/licenses/',
'locations' => 'private_uploads/locations/',
'models' => 'private_uploads/models/',
'suppliers' => 'private_uploads/suppliers/',
'users' => 'private_uploads/users/',
];

Expand All @@ -80,6 +83,7 @@ abstract class Controller extends BaseController
'licenses' => 'license',
'locations' => 'location',
'models' => 'model',
'suppliers' => 'supplier',
'users' => 'user',
];

Expand Down
2 changes: 2 additions & 0 deletions app/Models/Actionlog.php
Original file line number Diff line number Diff line change
Expand Up @@ -518,6 +518,8 @@ public function uploads_file_path()
return 'private_uploads/locations/'.$this->filename;
case Maintenance::class:
return 'private_uploads/maintenances/'.$this->filename;
case Supplier::class:
return 'private_uploads/suppliers/'.$this->filename;
case User::class:
return 'private_uploads/users/'.$this->filename;
default:
Expand Down
4 changes: 4 additions & 0 deletions app/Models/Supplier.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,18 @@
namespace App\Models;

use App\Http\Traits\UniqueUndeletedTrait;
use App\Models\Traits\HasUploads;
use App\Models\Traits\Searchable;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\SoftDeletes;
use Watson\Validating\ValidatingTrait;
use \Illuminate\Database\Eloquent\Relations\Relation;
use App\Models\Traits\Loggable;
class Supplier extends SnipeModel
{
use HasFactory;
use SoftDeletes;
use HasUploads;

protected $table = 'suppliers';

Expand Down Expand Up @@ -42,6 +45,7 @@ class Supplier extends SnipeModel
use ValidatingTrait;
use UniqueUndeletedTrait;
use Searchable;
use Loggable;

/**
* The attributes that should be included when searching the model.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('suppliers', function (Blueprint $table) {
$table->text('notes')->change();
});
}

/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('text', function (Blueprint $table) {
//
});
}
};
31 changes: 31 additions & 0 deletions resources/views/suppliers/view.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,26 @@
</span>
</a>
</li>

<li>
<a href="#files" data-toggle="tab">

<span class="hidden-lg hidden-md">
<i class="fas fa-barcode fa-2x"></i>
</span>
<span class="hidden-xs hidden-sm">
{{ trans('general.files') }}
{!! ($supplier->uploads->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($supplier->uploads->count()).'</span>' : '' !!}
</span>
</a>
</li>

<li class="pull-right">
<a href="#" data-toggle="modal" data-target="#uploadFileModal">
<x-icon type="paperclip" />
{{ trans('button.upload') }}
</a>
</li>
</ul>


Expand Down Expand Up @@ -243,6 +263,14 @@ class="table table-striped snipe-table"
</div><!-- /.table-responsive -->
</div><!-- /.tab-pane -->

<div class="tab-pane fade" id="files">
<div class="row">
<div class="col-md-12">
<x-filestable object_type="suppliers" :object="$supplier" />
</div> <!-- /.col-md-12 -->
</div> <!-- /.row -->
</div>

</div><!--/.col-md-9-->
</div><!--/.col-md-9-->
</div><!--/.col-md-9-->
Expand Down Expand Up @@ -318,6 +346,9 @@ class="table table-striped snipe-table"
</div>
</div>

@can('update', \App\Models\Supplier::class)
@include ('modals.upload-file', ['item_type' => 'supplier', 'item_id' => $supplier->id])
@endcan
@stop

@section('moar_scripts')
Expand Down
8 changes: 4 additions & 4 deletions routes/api.php
Original file line number Diff line number Diff line change
Expand Up @@ -1348,7 +1348,7 @@
'index'
]
)->name('api.files.index')
->where(['object_type' => 'accessories|audits|assets|components|consumables|hardware|licenses|locations|maintenances|models|users']);
->where(['object_type' => 'accessories|audits|assets|components|consumables|hardware|licenses|locations|maintenances|models|suppliers|users']);

// Get a file
Route::get('{object_type}/{id}/files/{file_id}',
Expand All @@ -1357,7 +1357,7 @@
'show'
]
)->name('api.files.show')
->where(['object_type' => 'accessories|audits|assets|components|consumables|hardware|licenses|locations|maintenances|models|users']);
->where(['object_type' => 'accessories|audits|assets|components|consumables|hardware|licenses|locations|maintenances|models|suppliers|users']);

// Upload files(s)
Route::post('{object_type}/{id}/files',
Expand All @@ -1366,7 +1366,7 @@
'store'
]
)->name('api.files.store')
->where(['object_type' => 'accessories|audits|assets|components|consumables|hardware|licenses|locations|maintenances|models|users']);
->where(['object_type' => 'accessories|audits|assets|components|consumables|hardware|licenses|locations|maintenances|models|suppliers|users']);

// Delete files(s)
Route::delete('{object_type}/{id}/files/{file_id}/delete',
Expand All @@ -1375,6 +1375,6 @@
'destroy'
]
)->name('api.files.destroy')
->where(['object_type' => 'accessories|assets|components|consumables|hardware|licenses|locations|maintenances|models|users']);
->where(['object_type' => 'accessories|assets|components|consumables|hardware|licenses|locations|maintenances|models|suppliers|users']);

}); // end API routes
6 changes: 3 additions & 3 deletions routes/web.php
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,7 @@
'show'
]
)->name('ui.files.show')
->where(['object_type' => 'assets|audits|maintenances|hardware|models|users|locations|accessories|consumables|licenses|components']);
->where(['object_type' => 'assets|audits|maintenances|hardware|models|users|locations|accessories|consumables|licenses|suppliers|components']);

// Upload files(s)
Route::post('{object_type}/{id}/files',
Expand All @@ -725,7 +725,7 @@
'store'
]
)->name('ui.files.store')
->where(['object_type' => 'assets|audits|maintenances|hardware|models|users|locations|accessories|consumables|licenses|components']);
->where(['object_type' => 'assets|audits|maintenances|hardware|models|users|locations|accessories|consumables|licenses|suppliers|components']);

// Delete files(s)
Route::delete('{object_type}/{id}/files/{file_id}/delete',
Expand All @@ -734,7 +734,7 @@
'destroy'
]
)->name('ui.files.destroy')
->where(['object_type' => 'assets|maintenances|hardware|models|users|locations|accessories|consumables|licenses|components']);
->where(['object_type' => 'assets|maintenances|hardware|models|users|locations|accessories|consumables|licenses|suppliers|components']);
});


Expand Down
2 changes: 2 additions & 0 deletions storage/private_uploads/suppliers/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*
!.gitignore
Loading