Problems fixed.

codenteq · Aug 24, 2021 · b0eb0c0 · b0eb0c0
1 parent 5f10f96
commit b0eb0c0
Show file tree

Hide file tree

Showing 291 changed files with 262 additions and 100 deletions.
diff --git a/.editorconfig b/.editorconfig
diff --git a/.env.example → .env.dev b/.env.example → .env.dev
diff --git a/.env.prod b/.env.prod
@@ -0,0 +1,51 @@
+APP_NAME=Laravel
+APP_ENV=production
+APP_KEY=
+APP_DEBUG=false
+APP_URL=http://localhost
+
+LOG_CHANNEL=stack
+LOG_LEVEL=debug
+
+DB_CONNECTION=mysql
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=drivinglicenceapp
+DB_USERNAME=root
+DB_PASSWORD=
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+FILESYSTEM_DRIVER=local
+QUEUE_CONNECTION=sync
+SESSION_DRIVER=file
+SESSION_LIFETIME=120
+
+MEMCACHED_HOST=127.0.0.1
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_MAILER=smtp
+MAIL_HOST=mailhog
+MAIL_PORT=1025
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS=null
+MAIL_FROM_NAME="${APP_NAME}"
+
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_DEFAULT_REGION=us-east-1
+AWS_BUCKET=
+AWS_USE_PATH_STYLE_ENDPOINT=false
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
+PUSHER_APP_CLUSTER=mt1
+
+MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitignore b/.gitignore
diff --git a/.styleci.yml b/.styleci.yml
diff --git a/README.md b/README.md
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
@@ -1,9 +1,14 @@
 <?php
 
+use App\Models\AppointmentSetting;
+use App\Models\Invoice;
+use Carbon\Carbon;
+use Carbon\CarbonPeriod;
+
 if (!function_exists('ignoreDateCheck')) {
     function ignoreDateCheck($date): bool
     {
-        return (bool)\App\Models\AppointmentSetting::where('ignore_date', $date)->where('companyId', companyId())->first();
+        return (bool)AppointmentSetting::where('ignore_date', $date)->where('companyId', companyId())->first();
     }
 }
 
@@ -17,11 +22,20 @@ function companyId() : int
 if (!function_exists('currentMounth')) {
     function currentMounth(): array
     {
-        $result = \Carbon\CarbonPeriod::create(\Carbon\Carbon::now()->format('d-m-Y'), '1 day', \Carbon\Carbon::now()->addMonth()->format('d-m-Y'));
+        $result = CarbonPeriod::create(Carbon::now()->format('d-m-Y'), '1 day', Carbon::now()->addMonth()->format('d-m-Y'));
         foreach ($result as $dt) {
             $months[] = [$dt->format("Y-m-d") => ignoreDateCheck($dt->format("Y-m-d"))];
         }
         return $months;
     }
 }
 
+if (!function_exists('invoiceDiffDate')) {
+    function invoiceDiffDate($id): int
+    {
+        $invoice = Invoice::select('end_date')->where('companyId', $id)->orderBy('id', 'desc')->first();
+        $end = Carbon::parse($invoice->end_date);
+        return $end->diffInDays(Carbon::now());
+    }
+}
+
diff --git a/app/Http/Constants/ResponseMessage.php b/app/Http/Constants/ResponseMessage.php
diff --git a/app/Http/Controllers/API/QuestionController.php b/app/Http/Controllers/API/QuestionController.php
diff --git a/app/Http/Controllers/Admin/AdminController.php b/app/Http/Controllers/Admin/AdminController.php
diff --git a/app/Http/Controllers/Admin/CompanyController.php b/app/Http/Controllers/Admin/CompanyController.php
@@ -76,7 +76,6 @@ public function edit(Company $company)
             'company' => $company,
             'cities' => City::all(),
             'states' => State::all(),
-            'invoice' => Invoice::select('start_date', 'end_date')->where('companyId', $company->id)->orderBy('id', 'desc')->first(),
             'packages' => Package::all(),
             'countries' => Country::all()
         ]);

diff --git a/app/Http/Controllers/Admin/GroupController.php b/app/Http/Controllers/Admin/GroupController.php
diff --git a/app/Http/Controllers/Admin/LanguageController.php b/app/Http/Controllers/Admin/LanguageController.php
diff --git a/app/Http/Controllers/Admin/ManagerUserController.php b/app/Http/Controllers/Admin/ManagerUserController.php
diff --git a/app/Http/Controllers/Admin/PeriodController.php b/app/Http/Controllers/Admin/PeriodController.php
diff --git a/app/Http/Controllers/Auth/ConfirmPasswordController.php b/app/Http/Controllers/Auth/ConfirmPasswordController.php
diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
diff --git a/app/Http/Controllers/Auth/VerificationController.php b/app/Http/Controllers/Auth/VerificationController.php
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
diff --git a/app/Http/Controllers/Manager/AppointmentController.php b/app/Http/Controllers/Manager/AppointmentController.php
diff --git a/app/Http/Controllers/Manager/CarController.php b/app/Http/Controllers/Manager/CarController.php
diff --git a/app/Http/Controllers/Manager/CourseTeacherController.php b/app/Http/Controllers/Manager/CourseTeacherController.php
diff --git a/app/Http/Controllers/Manager/LiveLessonController.php b/app/Http/Controllers/Manager/LiveLessonController.php
diff --git a/app/Http/Controllers/Manager/ManagerController.php b/app/Http/Controllers/Manager/ManagerController.php
diff --git a/app/Http/Controllers/Manager/NotificationController.php b/app/Http/Controllers/Manager/NotificationController.php
diff --git a/app/Http/Controllers/Manager/QuestionController.php b/app/Http/Controllers/Manager/QuestionController.php
diff --git a/app/Http/Controllers/Manager/SupportController.php b/app/Http/Controllers/Manager/SupportController.php
diff --git a/app/Http/Controllers/Manager/UserController.php b/app/Http/Controllers/Manager/UserController.php
diff --git a/app/Http/Controllers/User/AppointmentController.php b/app/Http/Controllers/User/AppointmentController.php
diff --git a/app/Http/Controllers/User/HomeController.php b/app/Http/Controllers/User/HomeController.php
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php
diff --git a/app/Http/Middleware/PreventRequestsDuringMaintenance.php b/app/Http/Middleware/PreventRequestsDuringMaintenance.php
diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
diff --git a/app/Http/Middleware/TrimStrings.php b/app/Http/Middleware/TrimStrings.php
diff --git a/app/Http/Middleware/TrustHosts.php b/app/Http/Middleware/TrustHosts.php
diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php
diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php
diff --git a/app/Http/Requests/Admin/CompanyRequest.php b/app/Http/Requests/Admin/CompanyRequest.php
diff --git a/app/Http/Requests/Admin/GroupRequest.php b/app/Http/Requests/Admin/GroupRequest.php
diff --git a/app/Http/Requests/Admin/LanguageRequest.php b/app/Http/Requests/Admin/LanguageRequest.php
diff --git a/app/Http/Requests/Admin/ManagerUserRequest.php b/app/Http/Requests/Admin/ManagerUserRequest.php
diff --git a/app/Http/Requests/Admin/PeriodRequest.php b/app/Http/Requests/Admin/PeriodRequest.php
diff --git a/app/Http/Requests/Manager/AppointmentRequest.php b/app/Http/Requests/Manager/AppointmentRequest.php
diff --git a/app/Http/Requests/Manager/CarRequest.php b/app/Http/Requests/Manager/CarRequest.php
diff --git a/app/Http/Requests/Manager/CourseTeacherRequest.php b/app/Http/Requests/Manager/CourseTeacherRequest.php
diff --git a/app/Http/Requests/Manager/LiveLessonRequest.php b/app/Http/Requests/Manager/LiveLessonRequest.php
diff --git a/app/Http/Requests/Manager/QuestionRequest.php b/app/Http/Requests/Manager/QuestionRequest.php
diff --git a/app/Http/Requests/Manager/UserRequest.php b/app/Http/Requests/Manager/UserRequest.php
diff --git a/app/Http/Resources/QuestionChoiceResource.php b/app/Http/Resources/QuestionChoiceResource.php
diff --git a/app/Http/Resources/QuestionResource.php b/app/Http/Resources/QuestionResource.php
diff --git a/app/Models/Appointment.php b/app/Models/Appointment.php
diff --git a/app/Models/AppointmentSetting.php b/app/Models/AppointmentSetting.php
diff --git a/app/Models/Car.php b/app/Models/Car.php
diff --git a/app/Models/CarType.php b/app/Models/CarType.php
diff --git a/app/Models/City.php b/app/Models/City.php
diff --git a/app/Models/ClassExam.php b/app/Models/ClassExam.php
diff --git a/app/Models/Company.php b/app/Models/Company.php
@@ -22,4 +22,9 @@ public function info()
     {
         return $this->hasOne(CompanyInfo::class,'companyId');
     }
+
+    public function invoice()
+    {
+        return $this->hasOne(Invoice::class,'companyId');
+    }
 }
diff --git a/app/Models/CompanyInfo.php b/app/Models/CompanyInfo.php
diff --git a/app/Models/Country.php b/app/Models/Country.php
diff --git a/app/Models/Coupon.php b/app/Models/Coupon.php
diff --git a/app/Models/Group.php b/app/Models/Group.php
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
diff --git a/app/Models/Language.php b/app/Models/Language.php
diff --git a/app/Models/LiveLesson.php b/app/Models/LiveLesson.php
diff --git a/app/Models/Month.php b/app/Models/Month.php
diff --git a/app/Models/Notification.php b/app/Models/Notification.php
diff --git a/app/Models/NotificationUser.php b/app/Models/NotificationUser.php
diff --git a/app/Models/Package.php b/app/Models/Package.php
diff --git a/app/Models/Period.php b/app/Models/Period.php
diff --git a/app/Models/Question.php b/app/Models/Question.php
diff --git a/app/Models/QuestionChoice.php b/app/Models/QuestionChoice.php
diff --git a/app/Models/QuestionChoiceKey.php b/app/Models/QuestionChoiceKey.php
diff --git a/app/Models/QuestionType.php b/app/Models/QuestionType.php
diff --git a/app/Models/State.php b/app/Models/State.php
diff --git a/app/Models/Support.php b/app/Models/Support.php
diff --git a/app/Models/Test.php b/app/Models/Test.php
diff --git a/app/Models/TestQuestion.php b/app/Models/TestQuestion.php
diff --git a/app/Models/User.php b/app/Models/User.php
diff --git a/app/Models/UserAnswer.php b/app/Models/UserAnswer.php
diff --git a/app/Models/UserInfo.php b/app/Models/UserInfo.php
diff --git a/app/Observers/AppointmentObserver.php b/app/Observers/AppointmentObserver.php
diff --git a/app/Observers/NotificationObserver.php b/app/Observers/NotificationObserver.php
diff --git a/app/Observers/QuestionObserver.php b/app/Observers/QuestionObserver.php
diff --git a/app/Observers/UserObserver.php b/app/Observers/UserObserver.php
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
diff --git a/app/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
diff --git a/app/Services/Admin/CompanyInfoService.php b/app/Services/Admin/CompanyInfoService.php
diff --git a/app/Services/Admin/CompanyService.php b/app/Services/Admin/CompanyService.php
diff --git a/app/Services/Admin/GroupService.php b/app/Services/Admin/GroupService.php
diff --git a/app/Services/Admin/InvoiceService.php b/app/Services/Admin/InvoiceService.php
diff --git a/app/Services/Admin/LanguageService.php b/app/Services/Admin/LanguageService.php
diff --git a/app/Services/Admin/PeriodService.php b/app/Services/Admin/PeriodService.php
diff --git a/app/Services/GlobalService.php b/app/Services/GlobalService.php
diff --git a/app/Services/Manager/QuestionService.php b/app/Services/Manager/QuestionService.php
diff --git a/artisan b/artisan
diff --git a/bootstrap/app.php b/bootstrap/app.php
diff --git a/bootstrap/cache/.gitignore b/bootstrap/cache/.gitignore
diff --git a/composer.json b/composer.json
@@ -27,7 +27,10 @@
             "App\\": "app/",
             "Database\\Factories\\": "database/factories/",
             "Database\\Seeders\\": "database/seeders/"
-        }
+        },
+        "files": [
+            "app/Helpers/Helper.php"
+        ]
     },
     "autoload-dev": {
         "psr-4": {