@@ -27,27 +27,27 @@ discard block |
||
| 27 | 27 | |
| 28 | 28 | // Config |
| 29 | 29 | $this->publishes([ |
| 30 | - __DIR__ . '/../../config/uccello.php' => config_path('uccello.php'), |
|
| 30 | + __DIR__.'/../../config/uccello.php' => config_path('uccello.php'), |
|
| 31 | 31 | ], 'config'); |
| 32 | 32 | |
| 33 | 33 | // Views |
| 34 | - $this->loadViewsFrom(__DIR__ . '/../../resources/views', 'uccello'); |
|
| 34 | + $this->loadViewsFrom(__DIR__.'/../../resources/views', 'uccello'); |
|
| 35 | 35 | $this->publishes([ |
| 36 | - __DIR__ . '/../../resources/views' => resource_path('views/vendor/uccello') |
|
| 36 | + __DIR__.'/../../resources/views' => resource_path('views/vendor/uccello') |
|
| 37 | 37 | ], 'views'); |
| 38 | 38 | |
| 39 | 39 | // Publish assets |
| 40 | 40 | $this->publishes([ |
| 41 | - __DIR__ . '/../../public' => public_path('vendor/uccello/uccello'), |
|
| 42 | - __DIR__ . '/../../public/fonts/vendor' => public_path('fonts/vendor'), |
|
| 43 | - __DIR__ . '/../../public/images/vendor' => public_path('images/vendor') |
|
| 41 | + __DIR__.'/../../public' => public_path('vendor/uccello/uccello'), |
|
| 42 | + __DIR__.'/../../public/fonts/vendor' => public_path('fonts/vendor'), |
|
| 43 | + __DIR__.'/../../public/images/vendor' => public_path('images/vendor') |
|
| 44 | 44 | ], 'assets'); |
| 45 | 45 | |
| 46 | 46 | // Translations |
| 47 | - $this->loadTranslationsFrom(__DIR__ . '/../../resources/lang', 'uccello'); |
|
| 47 | + $this->loadTranslationsFrom(__DIR__.'/../../resources/lang', 'uccello'); |
|
| 48 | 48 | |
| 49 | 49 | // Migrations |
| 50 | - $this->loadMigrationsFrom(__DIR__ . '/../../database/migrations'); |
|
| 50 | + $this->loadMigrationsFrom(__DIR__.'/../../database/migrations'); |
|
| 51 | 51 | |
| 52 | 52 | // Commands |
| 53 | 53 | if ($this->app->runningInConsole()) { |
@@ -61,12 +61,12 @@ discard block |
||
| 61 | 61 | { |
| 62 | 62 | // Config |
| 63 | 63 | $this->mergeConfigFrom( |
| 64 | - __DIR__ . '/../../config/uccello.php', |
|
| 64 | + __DIR__.'/../../config/uccello.php', |
|
| 65 | 65 | 'uccello' |
| 66 | 66 | ); |
| 67 | 67 | |
| 68 | 68 | // Helper |
| 69 | - App::bind('uccello', function () { |
|
| 69 | + App::bind('uccello', function() { |
|
| 70 | 70 | return new \Uccello\Core\Helpers\Uccello; |
| 71 | 71 | }); |
| 72 | 72 | |
@@ -20,12 +20,12 @@ |
||
| 20 | 20 | parent::boot(); |
| 21 | 21 | |
| 22 | 22 | // Bind domain |
| 23 | - Route::bind('domain', function ($value) { |
|
| 23 | + Route::bind('domain', function($value) { |
|
| 24 | 24 | return Domain::where('slug', $value)->first() ?? abort(404); |
| 25 | 25 | }); |
| 26 | 26 | |
| 27 | 27 | // Bind module |
| 28 | - Route::bind('module', function ($value) { |
|
| 28 | + Route::bind('module', function($value) { |
|
| 29 | 29 | return Module::where('name', $value)->first() ?? abort(404); |
| 30 | 30 | }); |
| 31 | 31 | } |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | // If the form is not valid display a notification |
| 35 | - if (! $this->isValid()) { |
|
| 35 | + if (!$this->isValid()) { |
|
| 36 | 36 | ucnotify(uctrans('notification.form.not.valid', $module), 'error'); |
| 37 | 37 | } |
| 38 | 38 | |
@@ -211,7 +211,7 @@ |
||
| 211 | 211 | } |
| 212 | 212 | |
| 213 | 213 | // Label |
| 214 | - $label = $menuLink->type === 'module' ? uctrans($menuLink->label, $module) : uctrans($menuLink->label, $this->module);; |
|
| 214 | + $label = $menuLink->type === 'module' ? uctrans($menuLink->label, $module) : uctrans($menuLink->label, $this->module); ; |
|
| 215 | 215 | |
| 216 | 216 | // Icon |
| 217 | 217 | if ($menuLink->type === 'folder') { |
@@ -150,8 +150,7 @@ discard block |
||
| 150 | 150 | $total = $model->$countMethod($relatedList, $recordId); |
| 151 | 151 | $totalFiltered = $total; |
| 152 | 152 | } |
| 153 | - } |
|
| 154 | - elseif ($relatedListId && $action === 'select') { |
|
| 153 | + } elseif ($relatedListId && $action === 'select') { |
|
| 155 | 154 | // Get related list |
| 156 | 155 | $relatedList = Relatedlist::find($relatedListId); |
| 157 | 156 | |
@@ -176,8 +175,7 @@ discard block |
||
| 176 | 175 | $total = $initialQuery->whereNotIn($model->getKeyName(), $filteredRecordIds)->count(); |
| 177 | 176 | $totalFiltered = $total; |
| 178 | 177 | } |
| 179 | - } |
|
| 180 | - else { |
|
| 178 | + } else { |
|
| 181 | 179 | // Make the query |
| 182 | 180 | $records = $query->get(); |
| 183 | 181 | } |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | if ($relatedList && $relatedList->method) { |
| 159 | 159 | // Related list method |
| 160 | 160 | $method = $relatedList->method; |
| 161 | - $recordIdsMethod = $method . 'RecordIds'; |
|
| 161 | + $recordIdsMethod = $method.'RecordIds'; |
|
| 162 | 162 | |
| 163 | 163 | // Get related records ids |
| 164 | 164 | $model = new $modelClass; |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | |
| 167 | 167 | // Add the record id itself to be filtered |
| 168 | 168 | if ($relatedList->related_module_id === $module->id && !empty($recordId) && !$filteredRecordIds->contains($recordId)) { |
| 169 | - $filteredRecordIds[] = (int)$recordId; |
|
| 169 | + $filteredRecordIds[ ] = (int)$recordId; |
|
| 170 | 170 | } |
| 171 | 171 | |
| 172 | 172 | // Make the query |
@@ -22,7 +22,7 @@ |
||
| 22 | 22 | {{-- Badge --}} |
| 23 | 23 | <?php |
| 24 | 24 | $relatedModule = $relatedlist->relatedModule; |
| 25 | - $countMethod = $relatedlist->method . 'Count'; |
|
| 25 | + $countMethod = $relatedlist->method.'Count'; |
|
| 26 | 26 | |
| 27 | 27 | $model = new $relatedModule->model_class; |
| 28 | 28 | $count = $model->$countMethod($relatedlist, $record->id); |