jev/opensem
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes, add weight

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2023-08-01 21:55:17 +02:00
parent 5f1ff26196
commit 6f2a985edc
11 changed files with 295 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/Datatables/Shop/OffersDataTable.php
View File

@@ -22,18 +22,18 @@ class OffersDataTable extends DataTable
return $this->buildQuery($model);
}
public static function filterByArticleNature($model, $article_nature_id = false)
public static function filterByArticleNature($model, $articleNatureId = false)
{
$article_nature_id = $article_nature_id ? $article_nature_id : self::isFilteredByField('article_nature_id');
$articleNatureId = $articleNatureId ? $articleNatureId : self::isFilteredByField('article_nature_id');
return $article_nature_id ? $model->byArticleNature($article_nature_id) : $model;
return $articleNatureId ? $model->byArticleNature($articleNatureId) : $model;
}
public static function filterByPackage($model, $package_id = false)
public static function filterByPackage($model, $packageId = false)
{
$package_id = $package_id ? $package_id : self::isFilteredByField('package_id');
$packageId = $packageId ? $packageId : self::isFilteredByField('package_id');
return $package_id ? $model->byPackage($package_id) : $model;
return $packageId ? $model->byPackage($packageId) : $model;
}
public function modifier($datatables)
@@ -49,7 +49,7 @@ class OffersDataTable extends DataTable
'on' => __('active'),
'off' => __('inactive'),
'meta' => 'data-id='.$offer->id,
'size' => 'sm',
'size' => 'xs',
]);
})
->editColumn('stock_delayed', function (Offer $offer) {
@@ -63,15 +63,16 @@ class OffersDataTable extends DataTable
protected function getColumns()
{
return [
Column::make('status_id')->title('')->width(40),
Column::make('article.article_nature.name')->title('Nature')->defaultContent(''),
Column::make('thumb')->title('')->width(40)->searchable(false)->order(false),
Column::make('status_id')->title('')->width(40)->searchable(false),
Column::make('article.article_nature.name')->title('Nature')->defaultContent('')->searchable(false),
Column::make('thumb')->title('')->width(30)->searchable(false)->addClass('text-center'),
Column::make('article.name')->title('Article')->defaultContent(''),
Column::make('variation.name')->title('Déclinaison')->defaultContent(''),
Column::make('tariff.name')->title('Tarif')->defaultContent(''),
Column::make('stock_current')->title('Appro im')->searchable(false),
Column::make('stock_delayed')->title('Appro délai')->searchable(false),
Column::make('stock_ondemand')->title('Dmde')->searchable(false),
Column::make('variation.name')->title('Déclinaison')->defaultContent('')->searchable(false),
Column::make('weight')->title('Poids')->searchable(false)->addClass('text-right'),
Column::make('tariff.name')->title('Tarif')->defaultContent('')->searchable(false),
Column::make('stock_current')->title('Appro im')->searchable(false)->addClass('text-right'),
Column::make('stock_delayed')->title('Appro délai')->searchable(false)->addClass('text-right'),
Column::make('stock_ondemand')->title('Dmde')->searchable(false)->addClass('text-right'),
$this->makeColumnButtons(),
];
}

37
app/Http/Controllers/Shop/Auth/RegisterController.php
View File

@@ -3,18 +3,19 @@
namespace App\Http\Controllers\Shop\Auth;
use App\Http\Controllers\Controller;
use App\Http\Requests\Shop\RegisterCustomer;
use App\Repositories\Shop\CustomerAddresses;
use App\Repositories\Shop\Customers;
use Illuminate\Auth\Events\Registered;
use Illuminate\Foundation\Auth\EmailVerificationRequest;
use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Validator;
use Sebastienheyd\Boilerplate\Rules\Password;
class RegisterController extends Controller
{
use RegistersUsers;
// use RegistersUsers;
protected $redirectTo;
@@ -28,21 +29,31 @@ class RegisterController extends Controller
return route(config('boilerplate.app.redirectTo', 'boilerplate.dashboard'));
}
protected function validator(array $data)
{
return Validator::make($data, [
'last_name' => 'required|max:255',
'first_name' => 'required|max:255',
'email' => 'required|email|max:255|unique:shop_customers,email,NULL,id,deleted_at,NULL',
'password' => ['required', 'confirmed', new Password()],
]);
}
public function showRegistrationForm()
{
return view('Shop.auth.register');
}
public function register(Request $request)
{
dump('ici');
exit;
// event(new Registered($user = $this->create($request->all())));
$user = $this->create($request->all());
dump($user);
exit;
$this->guard()->login($user);
if ($response = $this->registered($request, $user)) {
return $response;
}
return $request->wantsJson()
? new JsonResponse([], 201)
: redirect($this->redirectPath());
}
protected function create(array $data)
{
$user = Customers::create($data);

24
app/Http/Requests/Shop/RegisterCustomer.php Normal file
View File

@@ -0,0 +1,24 @@
<?php
namespace App\Http\Requests\Shop;
use Illuminate\Foundation\Http\FormRequest;
use Sebastienheyd\Boilerplate\Rules\Password;
class RegisterCustomer extends FormRequest
{
public function authorize()
{
return true;
}
public function rules()
{
return [
'last_name' => 'required|max:255',
'first_name' => 'required|max:255',
'email' => 'required|email|max:255|unique:shop_customers,email,NULL,id,deleted_at,NULL',
'password' => ['required', 'confirmed', new Password()],
];
}
}