diff --git a/_docker/app/Dockerfile b/_docker/app/Dockerfile index b774a18..47130ed 100755 --- a/_docker/app/Dockerfile +++ b/_docker/app/Dockerfile @@ -62,4 +62,9 @@ RUN mkdir -p /var/www/storage/app/public \ chmod 755 -R /var/www && \ chmod -R 775 /var/www/storage /var/www/bootstrap/cache +COPY _docker/app/entrypoint.sh /usr/local/bin/entrypoint.sh +RUN chmod +x /usr/local/bin/entrypoint.sh + WORKDIR /var/www + +ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] diff --git a/_docker/app/entrypoint.sh b/_docker/app/entrypoint.sh new file mode 100644 index 0000000..606d691 --- /dev/null +++ b/_docker/app/entrypoint.sh @@ -0,0 +1,14 @@ +#!/bin/sh +set -e + +cd /var/www + +# Create storage:link if not exists +if [ ! -L /var/www/public/storage ]; then + php artisan storage:link --force +fi + +# Cache config +php artisan config:cache --no-ansi 2>/dev/null || true + +exec php-fpm diff --git a/app/Http/Controllers/AutoController.php b/app/Http/Controllers/AutoController.php index 6aa2158..a008394 100644 --- a/app/Http/Controllers/AutoController.php +++ b/app/Http/Controllers/AutoController.php @@ -67,10 +67,11 @@ class AutoController extends Controller public function create() { $concerns = DB::table('concerns')->get(); - $purposes = DB::table('purposes')->get(); + $purposeCases = DB::table('purposes')->get(); $regions = DB::table('regions')->get(); $appraisers = DB::table('users')->whereRaw('LOWER(role) = ?', ['appraiser'])->where('status', 'active')->get(); - return view('auto.create', compact('concerns', 'purposes', 'regions', 'appraisers')); + $dillers = DB::table('users')->whereRaw('LOWER(role) = ?', ['diller'])->where('status', 'active')->get(); + return view('auto.create', compact('concerns', 'purposeCases', 'regions', 'appraisers', 'dillers')); } public function store(Request $request) @@ -82,9 +83,11 @@ class AutoController extends Controller { $order = DB::table('auto_orders')->find($id); $concerns = DB::table('concerns')->get(); - $purposes = DB::table('purposes')->get(); + $purposeCases = DB::table('purposes')->get(); $regions = DB::table('regions')->get(); - return view('auto.edit', compact('order', 'concerns', 'purposes', 'regions')); + $appraisers = DB::table('users')->whereRaw('LOWER(role) = ?', ['appraiser'])->where('status', 'active')->get(); + $dillers = DB::table('users')->whereRaw('LOWER(role) = ?', ['diller'])->where('status', 'active')->get(); + return view('auto.edit', compact('order', 'concerns', 'purposeCases', 'regions', 'appraisers', 'dillers')); } public function update(Request $request, $id) diff --git a/app/Http/Controllers/EstateController.php b/app/Http/Controllers/EstateController.php index e5acd9a..8ce7378 100644 --- a/app/Http/Controllers/EstateController.php +++ b/app/Http/Controllers/EstateController.php @@ -47,11 +47,13 @@ class EstateController extends Controller public function create() { - $purposes = DB::table('purposes')->get(); + $purposeCases = DB::table('purposes')->get(); $regions = DB::table('regions')->get(); + $districts = DB::table('districts')->get(); $concerns = DB::table('concerns')->get(); $appraisers = DB::table('users')->whereRaw('LOWER(role) = ?', ['appraiser'])->where('status', 'active')->get(); - return view('estate.create', compact('purposes', 'regions', 'concerns', 'appraisers')); + $dillers = DB::table('users')->whereRaw('LOWER(role) = ?', ['diller'])->where('status', 'active')->get(); + return view('estate.create', compact('purposeCases', 'regions', 'districts', 'concerns', 'appraisers', 'dillers')); } public function store(Request $request) @@ -62,10 +64,13 @@ class EstateController extends Controller public function edit($id) { $order = DB::table('estate_orders')->find($id); - $purposes = DB::table('purposes')->get(); + $purposeCases = DB::table('purposes')->get(); $regions = DB::table('regions')->get(); + $districts = DB::table('districts')->get(); $concerns = DB::table('concerns')->get(); - return view('estate.edit', compact('order', 'purposes', 'regions', 'concerns')); + $appraisers = DB::table('users')->whereRaw('LOWER(role) = ?', ['appraiser'])->where('status', 'active')->get(); + $dillers = DB::table('users')->whereRaw('LOWER(role) = ?', ['diller'])->where('status', 'active')->get(); + return view('estate.edit', compact('order', 'purposeCases', 'regions', 'districts', 'concerns', 'appraisers', 'dillers')); } public function update(Request $request, $id)