This commit is contained in:
Ludovic CANDELLIER
2021-03-30 23:06:12 +02:00
parent 993154674e
commit a7881e4261
8 changed files with 34 additions and 4 deletions

View File

@@ -12,13 +12,14 @@ class UnitiesDataTable extends DataTable
public function query(Unity $model) public function query(Unity $model)
{ {
$model = $model::with(['package'])->select('shop_unities.*'); $model = $model::with(['package.article_family'])->select('shop_unities.*');
return self::buildQuery($model); return self::buildQuery($model);
} }
protected function getColumns() protected function getColumns()
{ {
return [ return [
Column::make('package.article_family.name')->title('Famille'),
Column::make('package.value')->title('Package'), Column::make('package.value')->title('Package'),
Column::make('value')->title('Valeur'), Column::make('value')->title('Valeur'),
self::makeColumnButtons(), self::makeColumnButtons(),

View File

@@ -31,7 +31,7 @@ class PackageController extends Controller
public function create() public function create()
{ {
$data['families'] = ArticleFamilies::getOptions(); $data['families'] = ArticleFamilies::getOptions();
return view('Shop.Admin.Packages.create'); return view('Shop.Admin.Packages.create', $data);
} }
public function store(Request $request) public function store(Request $request)

View File

@@ -3,9 +3,14 @@
namespace App\Models\Shop; namespace App\Models\Shop;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use Znck\Eloquent\Traits\BelongsToThrough;
class Unity extends Model class Unity extends Model
{ {
use BelongsToThrough, softDeletes;
protected $guarded = ['id']; protected $guarded = ['id'];
protected $table = 'shop_unities'; protected $table = 'shop_unities';
@@ -14,6 +19,11 @@ class Unity extends Model
return $this->belongsTo('App\Models\Shop\Package'); return $this->belongsTo('App\Models\Shop\Package');
} }
public function article_family()
{
return $this->belongsToThrough('App\Models\Shop\ArticleFamily', 'App\Models\Shop\Package', null, '', ['App\Models\Shop\ArticleFamily' => 'article_family_id', 'App\Models\Shop\Package' => 'package_id']);
}
public function scopeByPackage($query, $id) public function scopeByPackage($query, $id)
{ {
return $query->where('package_id', $id); return $query->where('package_id', $id);

View File

@@ -16,4 +16,3 @@
</div> </div>
</div> </div>
</div> </div>

View File

@@ -1 +1 @@
@include('components.button', ['class' => 'btn-success save ' . ($class ?? ''), 'icon' => 'fa-save', 'txt' => __('save')]) @include('components.button', ['type' => 'submit', 'class' => 'btn-success save ' . ($class ?? ''), 'icon' => 'fa-save', 'txt' => __('save')])

View File

@@ -0,0 +1,18 @@
@if(!defined('LOAD_SAVE'))
@push('scripts')
<script>
function initSaveForm(sel, form) {
var selector = (typeof(sel) == 'undefined') ? '.save' : sel;
var form = (typeof(form) == 'undefined') ? '#form' : form;
console.log(selector);
console.log(form);
$(selector).off().click(function(e) {
console.log("ici");
e.preventDefault();
$(form).submit();
});
}
</script>
@endpush
@php(define('LOAD_SAVE', true))
@endif

View File

@@ -3,6 +3,7 @@
Route::prefix('Packages')->name('Packages.')->group(function () { Route::prefix('Packages')->name('Packages.')->group(function () {
Route::any('getOptionsByFamily', 'PackageController@getOptionsByFamily')->name('getOptionsByFamily'); Route::any('getOptionsByFamily', 'PackageController@getOptionsByFamily')->name('getOptionsByFamily');
Route::get('edit/{id}', 'PackageController@edit')->name('edit'); Route::get('edit/{id}', 'PackageController@edit')->name('edit');
Route::delete('destroy/{id?}', 'PackageController@destroy')->name('destroy');
}); });
Route::resource('Packages', 'PackageController'); Route::resource('Packages', 'PackageController');

View File

@@ -3,6 +3,7 @@
Route::prefix('Unities')->name('Unities.')->group(function () { Route::prefix('Unities')->name('Unities.')->group(function () {
Route::any('getOptionsByPackage', 'UnityController@getOptionsByPackage')->name('getOptionsByPackage'); Route::any('getOptionsByPackage', 'UnityController@getOptionsByPackage')->name('getOptionsByPackage');
Route::get('edit/{id}', 'UnityController@edit')->name('edit'); Route::get('edit/{id}', 'UnityController@edit')->name('edit');
Route::delete('destroy/{id?}', 'UnityController@destroy')->name('destroy');
}); });
Route::resource('Unities', 'UnityController'); Route::resource('Unities', 'UnityController');