@@ -195,8 +195,7 @@ discard block |
||
| 195 | 195 | $this->model |
| 196 | 196 | ->whereKey(collect($this->model |
| 197 | 197 | ->search(($request->get('query'))) |
| 198 | - ->raw())->get('ids')) : |
|
| 199 | - $this->model; |
|
| 198 | + ->raw())->get('ids')) : $this->model; |
|
| 200 | 199 | if (array_key_exists('file', $request->toArray())) { |
| 201 | 200 | //TODO add relation on top if here and create a tree flatter array in array helper |
| 202 | 201 | return (new ExcelHelper())->setOptions([ |
@@ -521,7 +520,7 @@ discard block |
||
| 521 | 520 | */ |
| 522 | 521 | public function getTrans($method, $status) |
| 523 | 522 | { |
| 524 | - return trans('laravel_smart_restful::'.'controller.'.get_class($this->model) . '.' . $method . '.' . $status); |
|
| 523 | + return trans('laravel_smart_restful::' . 'controller.' . get_class($this->model) . '.' . $method . '.' . $status); |
|
| 525 | 524 | } |
| 526 | 525 | |
| 527 | 526 | public function setLocale() |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | */ |
| 14 | 14 | public function boot() |
| 15 | 15 | { |
| 16 | - $this->loadTranslationsFrom(resource_path('lang/vendor/alive2212'), 'laravel_smart_restful'); |
|
| 16 | + $this->loadTranslationsFrom(resource_path('lang/vendor/alive2212'), 'laravel_smart_restful'); |
|
| 17 | 17 | // $this->loadViewsFrom(__DIR__.'/../resources/views', 'alive2212'); |
| 18 | 18 | // $this->loadMigrationsFrom(__DIR__.'/../database/migrations'); |
| 19 | 19 | // $this->loadRoutesFrom(__DIR__.'/routes.php'); |
@@ -38,7 +38,7 @@ |
||
| 38 | 38 | |
| 39 | 39 | // Publishing the translation files. |
| 40 | 40 | $this->publishes([ |
| 41 | - __DIR__.'/../resources/lang/' => resource_path('lang/vendor/alive2212'), |
|
| 41 | + __DIR__ . '/../resources/lang/' => resource_path('lang/vendor/alive2212'), |
|
| 42 | 42 | ], 'laravel_smart_restful.lang'); |
| 43 | 43 | |
| 44 | 44 | // Registering package commands. |