fix solve conflict

.drone.yml

@@ -38,6 +38,7 @@ steps:
       - docker exec willaengine-staging_php bash -c "php artisan route:clear"
        - docker exec willaengine-staging_php bash -c "php artisan route:cache"
       # - docker exec willaengine-staging_php service supervisor start
+      # - docker exec willaengine-staging_php service supervisor start
       # - docker exec willaengine-staging_php bash -c "php artisan db:seed --class=CalculationMethodSeeder"
       # - docker exec willaengine-staging_php php artisan migrate --path=vendor/wm/finance/database/migrations
       # - docker exec willaengine-staging_php php artisan migrate --path=vendor/wm/finance/database/migrations

Jenkinsfile

@@ -48,3 +48,4 @@ pipeline {
         IMAGE_NAME = 'willaengine'
     }
 }
+

composer.json

@@ -89,7 +89,7 @@
     "repositories": [
         {
             "type": "path",
-            "url": "./modules/wm-crm"
+            "url": "./modules/crm"
         },
         {
             "type": "path",

config/logging.php

@@ -99,6 +99,11 @@ return [
         'emergency' => [
             'path' => storage_path('logs/laravel.log'),
         ],
+        'sentry' => [
+            'driver' => 'sentry',
+            'level'  => 'debug',
+            'bubble' => true,
+        ],
     ],
 
 ];

database/seeds/DatabaseSeeder.php

@@ -12,15 +12,12 @@ class DatabaseSeeder extends Seeder
      */
     public function run()
     {
-        $this->call(ModuleSeeder::class);
+        $this->call(CoreSeeder::class);
-        $this->call(CategorySeeder::class);
+        $this->call(CommonSeeder::class);
-        $this->call(BusinessSeeder::class);
+        $this->call(CRMSeeder::class);
-        $this->call(UserSeeder::class);
+        $this->call(ProductSeeder::class);
-        $this->call(CitySeeder::class);
+        $this->call(StoreSeeder::class);
-        $this->call(DistrictSeeder::class);
+        $this->call(ServiceSeeder::class);
-        $this->call(DomainSeeder::class);
+        $this->call(FinanceSeeder::class);
-        $this->call(HelpSeeder::class);
-        $this->call(PermissionCategorySeeder::class);
-        $this->call(RoleSeeder::class);
     }
 }