Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Laravel 6.x Shift #1

Merged
merged 8 commits into from
Jan 19, 2024
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
58 changes: 32 additions & 26 deletions app/Appointment.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,45 +7,51 @@
class Appointment extends Model
{
protected $fillable = [
'user_id',
'vehicle_company_id',
'vehicle_modal_id',
'vehicle_types_id',
'washing_plan_id',
'status_id',
'appointment_date',
'vehicle_no',
'time_frame',
'appx_hour',
'remark',
'user_id',
'vehicle_company_id',
'vehicle_modal_id',
'vehicle_types_id',
'washing_plan_id',
'status_id',
'appointment_date',
'vehicle_no',
'time_frame',
'appx_hour',
'remark',
];

public function user() {
return $this->belongsTo('App\User');
public function user()
{
return $this->belongsTo(\App\User::class);
}

public function vehicle_company() {
return $this->belongsTo('App\Vehicle_company');
public function vehicle_company()
{
return $this->belongsTo(\App\Vehicle_company::class);
}

public function vehicle_modal() {
return $this->belongsTo('App\Vehicle_modal');
public function vehicle_modal()
{
return $this->belongsTo(\App\Vehicle_modal::class);
}

public function vehicle_type() {
return $this->belongsTo('App\Vehicle_type', 'vehicle_types_id');
public function vehicle_type()
{
return $this->belongsTo(\App\Vehicle_type::class, 'vehicle_types_id');
}

public function washing_plan() {
return $this->belongsTo('App\Washing_plan');
public function washing_plan()
{
return $this->belongsTo(\App\Washing_plan::class);
}

public function status() {
return $this->belongsTo('App\Status');
public function status()
{
return $this->belongsTo(\App\Status::class);
}

public function payment(){
return $this->hasOne('App\Payment');
public function payment()
{
return $this->hasOne('App\Payment');
}

}
28 changes: 15 additions & 13 deletions app/Appointment_user.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,27 @@

class Appointment_user extends Model
{

protected $fillable = [
'user_id',
'appointment_id',
'discount',
'advance',
'payment_mode_id',
'remark',
'user_id',
'appointment_id',
'discount',
'advance',
'payment_mode_id',
'remark',
];

public function user(){
return $this->belongsTo('App\User');
public function user()
{
return $this->belongsTo(\App\User::class);
}

public function appointment(){
return $this->belongsTo('App\Appointment');
public function appointment()
{
return $this->belongsTo(\App\Appointment::class);
}

public function payment_mode(){
return $this->belongsTo('App\Payment_mode');
public function payment_mode()
{
return $this->belongsTo(\App\Payment_mode::class);
}
}
16 changes: 8 additions & 8 deletions app/Blog.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@

class Blog extends Model
{

protected $dates = ['date'];

protected $fillable = [
'title',
'img',
'user_id',
'date',
'dtl',
'title',
'img',
'user_id',
'date',
'dtl',
];

public function users() {
return $this->belongsTo('App\User', 'user_id');
public function users()
{
return $this->belongsTo(\App\User::class, 'user_id');
}
}
2 changes: 1 addition & 1 deletion app/Clients.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
class Clients extends Model
{
protected $fillable = [
'image',
'image',
];
}
6 changes: 3 additions & 3 deletions app/Company_social.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
class Company_social extends Model
{
protected $fillable = [
'link',
'social_site',
'social_icon',
'link',
'social_site',
'social_icon',
];
}
1 change: 0 additions & 1 deletion app/Console/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ class Kernel extends ConsoleKernel
/**
* Define the application's command schedule.
*
* @param \Illuminate\Console\Scheduling\Schedule $schedule
* @return void
*/
protected function schedule(Schedule $schedule)
Expand Down
20 changes: 10 additions & 10 deletions app/Contact.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
class Contact extends Model
{
protected $fillable = [
'c_name',
'logo',
'logo_two',
'mobile',
'phone',
'address',
'email',
'website',
'inspect',
'rightclick'
'c_name',
'logo',
'logo_two',
'mobile',
'phone',
'address',
'email',
'website',
'inspect',
'rightclick',
];
}
2 changes: 0 additions & 2 deletions app/Exceptions/Handler.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ class Handler extends ExceptionHandler
*
* This is a great spot to send exceptions to Sentry, Bugsnag, etc.
*
* @param \Exception $exception
* @return void
*/
public function report(Exception $exception)
Expand All @@ -43,7 +42,6 @@ public function report(Exception $exception)
* Render an exception into an HTTP response.
*
* @param \Illuminate\Http\Request $request
* @param \Exception $exception
* @return \Illuminate\Http\Response
*/
public function render($request, Exception $exception)
Expand Down
6 changes: 3 additions & 3 deletions app/Facts.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
class Facts extends Model
{
protected $fillable = [
'icon',
'number',
'detail',
'icon',
'number',
'detail',
];
}
2 changes: 1 addition & 1 deletion app/Gallery.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ class Gallery extends Model
{
//
protected $fillable = [
'gallery_img',
'gallery_img',
];
}
24 changes: 12 additions & 12 deletions app/HomeSection.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@

class HomeSection extends Model
{
protected $fillable = [
'slider_section',
'about_section',
'service_section',
'gallery_section',
'facts_section',
'team_section',
'plan_section',
'appointment_section',
'testinomial_section',
'blog_section',
'client_section'
protected $fillable = [
'slider_section',
'about_section',
'service_section',
'gallery_section',
'facts_section',
'team_section',
'plan_section',
'appointment_section',
'testinomial_section',
'blog_section',
'client_section',
];
}
20 changes: 10 additions & 10 deletions app/HomeSlider.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
class HomeSlider extends Model
{
protected $fillable = [
'heading',
'sub_heading',
'detail',
'button1',
'button1_text',
'button1_link',
'button2',
'button2_text',
'button2_link',
'image'
'heading',
'sub_heading',
'detail',
'button1',
'button1_text',
'button1_link',
'button2',
'button2_text',
'button2_link',
'image',
];
}
Loading