Commit 0dbbc200 authored by Victor Friboulet's avatar Victor Friboulet
Browse files

fix: conflicts and user_id in registration

parent a0eb7be4

app/Http/Controllers/DivingSignUpController.php

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ public function show(){ 
    }



    public function index($ds_code){

        $userid = session()->get('userid');

        $userid = session('user')->US_ID;

        session()->put('DS_CODE', $ds_code);

        $request = DivingSignUpModel::select()->where('US_ID', $userid)->where('DS_CODE', $ds_code)->count();

        if(!$request == 0)

app/Models/DivingSignUpModel.php

+0 −6
Original line number Diff line number Diff line
@@ -8,12 +8,6 @@ 
class DivingSignUpModel extends Model

{

    protected $table = 'CAR_REGISTRATION';

<<<<<<< HEAD

    protected $primaryKey = ['us_id', 'ds_code'];

=======

    protected $primaryKey = ['US_ID', 'DS_CODE'];

>>>>>>> diversbysession

    protected $keyType = ['int', 'string'];

    protected $fillable = ['US_ID', 'DS_CODE', 'REG_ACTIVE'];

    use HasFactory;

}