@@ -42,9 +42,9 @@ |
||
42 | 42 | /** |
43 | 43 | * Check report existance and permission. |
44 | 44 | */ |
45 | - if (! $report) { |
|
45 | + if ( ! $report) { |
|
46 | 46 | \ErrorHandler::notFound('report'); |
47 | - } elseif (! $skipPermission && ! \Core::users()->can($report->view_name, 'reports')) { |
|
47 | + } elseif ( ! $skipPermission && ! \Core::users()->can($report->view_name, 'reports')) { |
|
48 | 48 | \ErrorHandler::noPermissions(); |
49 | 49 | } |
50 | 50 |
@@ -5,65 +5,65 @@ |
||
5 | 5 | |
6 | 6 | class ReportRepository extends BaseRepository |
7 | 7 | { |
8 | - /** |
|
9 | - * Init new object. |
|
10 | - * |
|
11 | - * @param Report $model |
|
12 | - * @return void |
|
13 | - */ |
|
14 | - public function __construct(Report $model) |
|
15 | - { |
|
16 | - parent::__construct($model); |
|
17 | - } |
|
8 | + /** |
|
9 | + * Init new object. |
|
10 | + * |
|
11 | + * @param Report $model |
|
12 | + * @return void |
|
13 | + */ |
|
14 | + public function __construct(Report $model) |
|
15 | + { |
|
16 | + parent::__construct($model); |
|
17 | + } |
|
18 | 18 | |
19 | - /** |
|
20 | - * Render the given report db view based on the given |
|
21 | - * condition. |
|
22 | - * |
|
23 | - * @param string $reportName |
|
24 | - * @param array $conditions |
|
25 | - * @param integer $perPage |
|
26 | - * @param array $relations |
|
27 | - * @param boolean $skipPermission |
|
28 | - * @return object |
|
29 | - */ |
|
30 | - public function getReport($reportName, $conditions = [], $perPage = 0, $relations = [], $skipPermission = false) |
|
31 | - { |
|
32 | - /** |
|
33 | - * Fetch the report from db. |
|
34 | - */ |
|
35 | - $reportConditions = $this->constructConditions(['report_name' => $reportName], $this->model); |
|
36 | - $report = $this->model->with($relations) |
|
37 | - ->whereRaw( |
|
38 | - $reportConditions['conditionString'], |
|
39 | - $reportConditions['conditionValues'] |
|
40 | - )->first(); |
|
19 | + /** |
|
20 | + * Render the given report db view based on the given |
|
21 | + * condition. |
|
22 | + * |
|
23 | + * @param string $reportName |
|
24 | + * @param array $conditions |
|
25 | + * @param integer $perPage |
|
26 | + * @param array $relations |
|
27 | + * @param boolean $skipPermission |
|
28 | + * @return object |
|
29 | + */ |
|
30 | + public function getReport($reportName, $conditions = [], $perPage = 0, $relations = [], $skipPermission = false) |
|
31 | + { |
|
32 | + /** |
|
33 | + * Fetch the report from db. |
|
34 | + */ |
|
35 | + $reportConditions = $this->constructConditions(['report_name' => $reportName], $this->model); |
|
36 | + $report = $this->model->with($relations) |
|
37 | + ->whereRaw( |
|
38 | + $reportConditions['conditionString'], |
|
39 | + $reportConditions['conditionValues'] |
|
40 | + )->first(); |
|
41 | 41 | |
42 | - /** |
|
43 | - * Check report existance and permission. |
|
44 | - */ |
|
45 | - if (! $report) { |
|
46 | - \ErrorHandler::notFound('report'); |
|
47 | - } elseif (! $skipPermission && ! \Core::users()->can($report->view_name, 'reports')) { |
|
48 | - \ErrorHandler::noPermissions(); |
|
49 | - } |
|
42 | + /** |
|
43 | + * Check report existance and permission. |
|
44 | + */ |
|
45 | + if (! $report) { |
|
46 | + \ErrorHandler::notFound('report'); |
|
47 | + } elseif (! $skipPermission && ! \Core::users()->can($report->view_name, 'reports')) { |
|
48 | + \ErrorHandler::noPermissions(); |
|
49 | + } |
|
50 | 50 | |
51 | - /** |
|
52 | - * Fetch data from the report based on the given conditions. |
|
53 | - */ |
|
54 | - $report = \DB::table($report->view_name); |
|
55 | - unset($conditions['page']); |
|
56 | - if (count($conditions)) { |
|
57 | - $conditions = $this->constructConditions($conditions, $this->model); |
|
58 | - $report->whereRaw($conditions['conditionString'], $conditions['conditionValues']); |
|
59 | - } |
|
60 | - /** |
|
61 | - * Paginate or all data. |
|
62 | - */ |
|
63 | - if ($perPage) { |
|
64 | - return $report->paginate($perPage); |
|
65 | - } else { |
|
66 | - return $report->get(); |
|
67 | - } |
|
68 | - } |
|
51 | + /** |
|
52 | + * Fetch data from the report based on the given conditions. |
|
53 | + */ |
|
54 | + $report = \DB::table($report->view_name); |
|
55 | + unset($conditions['page']); |
|
56 | + if (count($conditions)) { |
|
57 | + $conditions = $this->constructConditions($conditions, $this->model); |
|
58 | + $report->whereRaw($conditions['conditionString'], $conditions['conditionValues']); |
|
59 | + } |
|
60 | + /** |
|
61 | + * Paginate or all data. |
|
62 | + */ |
|
63 | + if ($perPage) { |
|
64 | + return $report->paginate($perPage); |
|
65 | + } else { |
|
66 | + return $report->get(); |
|
67 | + } |
|
68 | + } |
|
69 | 69 | } |
@@ -1,11 +1,11 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | $factory->define(App\Modules\Core\Settings::class, function (Faker\Generator $faker) { |
4 | - return [ |
|
5 | - 'name' => $faker->randomElement(['Company Name', 'Title', 'Header Image']), |
|
6 | - 'value' => $faker->word(), |
|
7 | - 'key' => $faker->word(), |
|
8 | - 'created_at' => $faker->dateTimeBetween('-1 years', 'now'), |
|
9 | - 'updated_at' => $faker->dateTimeBetween('-1 years', 'now') |
|
10 | - ]; |
|
4 | + return [ |
|
5 | + 'name' => $faker->randomElement(['Company Name', 'Title', 'Header Image']), |
|
6 | + 'value' => $faker->word(), |
|
7 | + 'key' => $faker->word(), |
|
8 | + 'created_at' => $faker->dateTimeBetween('-1 years', 'now'), |
|
9 | + 'updated_at' => $faker->dateTimeBetween('-1 years', 'now') |
|
10 | + ]; |
|
11 | 11 | }); |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -$factory->define(App\Modules\Core\Settings::class, function (Faker\Generator $faker) { |
|
3 | +$factory->define(App\Modules\Core\Settings::class, function(Faker\Generator $faker) { |
|
4 | 4 | return [ |
5 | 5 | 'name' => $faker->randomElement(['Company Name', 'Title', 'Header Image']), |
6 | 6 | 'value' => $faker->word(), |
@@ -5,30 +5,30 @@ |
||
5 | 5 | |
6 | 6 | class Settings extends Migration |
7 | 7 | { |
8 | - /** |
|
9 | - * Run the migrations. |
|
10 | - * |
|
11 | - * @return void |
|
12 | - */ |
|
13 | - public function up() |
|
14 | - { |
|
15 | - Schema::create('settings', function (Blueprint $table) { |
|
16 | - $table->increments('id'); |
|
17 | - $table->string('name', 100); |
|
18 | - $table->string('key', 100)->unique(); |
|
19 | - $table->text('value')->nullable(); |
|
20 | - $table->softDeletes(); |
|
21 | - $table->timestamps(); |
|
22 | - }); |
|
23 | - } |
|
8 | + /** |
|
9 | + * Run the migrations. |
|
10 | + * |
|
11 | + * @return void |
|
12 | + */ |
|
13 | + public function up() |
|
14 | + { |
|
15 | + Schema::create('settings', function (Blueprint $table) { |
|
16 | + $table->increments('id'); |
|
17 | + $table->string('name', 100); |
|
18 | + $table->string('key', 100)->unique(); |
|
19 | + $table->text('value')->nullable(); |
|
20 | + $table->softDeletes(); |
|
21 | + $table->timestamps(); |
|
22 | + }); |
|
23 | + } |
|
24 | 24 | |
25 | - /** |
|
26 | - * Reverse the migrations. |
|
27 | - * |
|
28 | - * @return void |
|
29 | - */ |
|
30 | - public function down() |
|
31 | - { |
|
32 | - Schema::dropIfExists('settings'); |
|
33 | - } |
|
25 | + /** |
|
26 | + * Reverse the migrations. |
|
27 | + * |
|
28 | + * @return void |
|
29 | + */ |
|
30 | + public function down() |
|
31 | + { |
|
32 | + Schema::dropIfExists('settings'); |
|
33 | + } |
|
34 | 34 | } |
@@ -12,7 +12,7 @@ |
||
12 | 12 | */ |
13 | 13 | public function up() |
14 | 14 | { |
15 | - Schema::create('settings', function (Blueprint $table) { |
|
15 | + Schema::create('settings', function(Blueprint $table) { |
|
16 | 16 | $table->increments('id'); |
17 | 17 | $table->string('name', 100); |
18 | 18 | $table->string('key', 100)->unique(); |
@@ -6,15 +6,15 @@ |
||
6 | 6 | |
7 | 7 | class CoreDatabaseSeeder extends Seeder |
8 | 8 | { |
9 | - /** |
|
10 | - * Run the database seeds. |
|
11 | - * |
|
12 | - * @return void |
|
13 | - */ |
|
14 | - public function run() |
|
15 | - { |
|
16 | - $this->call(ClearDataSeeder::class); |
|
17 | - $this->call(SettingsTableSeeder::class); |
|
18 | - $this->call(AssignRelationsSeeder::class); |
|
19 | - } |
|
9 | + /** |
|
10 | + * Run the database seeds. |
|
11 | + * |
|
12 | + * @return void |
|
13 | + */ |
|
14 | + public function run() |
|
15 | + { |
|
16 | + $this->call(ClearDataSeeder::class); |
|
17 | + $this->call(SettingsTableSeeder::class); |
|
18 | + $this->call(AssignRelationsSeeder::class); |
|
19 | + } |
|
20 | 20 | } |
@@ -83,7 +83,7 @@ |
||
83 | 83 | if ($this->cacheConfig && $this->cacheConfig == 'cache') { |
84 | 84 | $page = \Request::get('page') !== null ? \Request::get('page') : '1'; |
85 | 85 | $cacheKey = $name.$page.\Session::get('locale').serialize($arguments); |
86 | - return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function () use ($arguments, $name) { |
|
86 | + return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function() use ($arguments, $name) { |
|
87 | 87 | return call_user_func_array([$this->repo, $name], $arguments); |
88 | 88 | }); |
89 | 89 | } elseif ($this->cacheConfig) { |
@@ -5,116 +5,116 @@ |
||
5 | 5 | |
6 | 6 | class CachingDecorator |
7 | 7 | { |
8 | - /** |
|
9 | - * The repo implementation. |
|
10 | - * |
|
11 | - * @var string |
|
12 | - */ |
|
13 | - public $repo; |
|
8 | + /** |
|
9 | + * The repo implementation. |
|
10 | + * |
|
11 | + * @var string |
|
12 | + */ |
|
13 | + public $repo; |
|
14 | 14 | |
15 | - /** |
|
16 | - * The cache implementation. |
|
17 | - * |
|
18 | - * @var object |
|
19 | - */ |
|
20 | - protected $cache; |
|
15 | + /** |
|
16 | + * The cache implementation. |
|
17 | + * |
|
18 | + * @var object |
|
19 | + */ |
|
20 | + protected $cache; |
|
21 | 21 | |
22 | - /** |
|
23 | - * The modelKey implementation. |
|
24 | - * |
|
25 | - * @var string |
|
26 | - */ |
|
27 | - public $modelKey; |
|
22 | + /** |
|
23 | + * The modelKey implementation. |
|
24 | + * |
|
25 | + * @var string |
|
26 | + */ |
|
27 | + public $modelKey; |
|
28 | 28 | |
29 | - /** |
|
30 | - * The model implementation. |
|
31 | - * |
|
32 | - * @var string |
|
33 | - */ |
|
34 | - public $model; |
|
29 | + /** |
|
30 | + * The model implementation. |
|
31 | + * |
|
32 | + * @var string |
|
33 | + */ |
|
34 | + public $model; |
|
35 | 35 | |
36 | - /** |
|
37 | - * The modelClass implementation. |
|
38 | - * |
|
39 | - * @var string |
|
40 | - */ |
|
41 | - public $modelClass; |
|
36 | + /** |
|
37 | + * The modelClass implementation. |
|
38 | + * |
|
39 | + * @var string |
|
40 | + */ |
|
41 | + public $modelClass; |
|
42 | 42 | |
43 | - /** |
|
44 | - * The cacheConfig implementation. |
|
45 | - * |
|
46 | - * @var mixed |
|
47 | - */ |
|
48 | - public $cacheConfig; |
|
43 | + /** |
|
44 | + * The cacheConfig implementation. |
|
45 | + * |
|
46 | + * @var mixed |
|
47 | + */ |
|
48 | + public $cacheConfig; |
|
49 | 49 | |
50 | - /** |
|
51 | - * The cacheTag implementation. |
|
52 | - * |
|
53 | - * @var string |
|
54 | - */ |
|
55 | - public $cacheTag; |
|
50 | + /** |
|
51 | + * The cacheTag implementation. |
|
52 | + * |
|
53 | + * @var string |
|
54 | + */ |
|
55 | + public $cacheTag; |
|
56 | 56 | |
57 | - /** |
|
58 | - * Init new object. |
|
59 | - * |
|
60 | - * @param string $repo |
|
61 | - * @param Cache $cache |
|
62 | - * |
|
63 | - * @return void |
|
64 | - */ |
|
65 | - public function __construct($repo, Cache $cache) |
|
66 | - { |
|
67 | - $this->repo = $repo; |
|
68 | - $this->cache = $cache; |
|
69 | - $this->model = $this->repo->model; |
|
70 | - $this->modelClass = get_class($this->model); |
|
71 | - $repoClass = explode('\\', get_class($this->repo)); |
|
72 | - $repoName = end($repoClass); |
|
73 | - $this->cacheTag = lcfirst(substr($repoName, 0, strpos($repoName, 'Repository'))); |
|
74 | - } |
|
57 | + /** |
|
58 | + * Init new object. |
|
59 | + * |
|
60 | + * @param string $repo |
|
61 | + * @param Cache $cache |
|
62 | + * |
|
63 | + * @return void |
|
64 | + */ |
|
65 | + public function __construct($repo, Cache $cache) |
|
66 | + { |
|
67 | + $this->repo = $repo; |
|
68 | + $this->cache = $cache; |
|
69 | + $this->model = $this->repo->model; |
|
70 | + $this->modelClass = get_class($this->model); |
|
71 | + $repoClass = explode('\\', get_class($this->repo)); |
|
72 | + $repoName = end($repoClass); |
|
73 | + $this->cacheTag = lcfirst(substr($repoName, 0, strpos($repoName, 'Repository'))); |
|
74 | + } |
|
75 | 75 | |
76 | - /** |
|
77 | - * Handle the cache mechanism for the called method |
|
78 | - * based the configurations. |
|
79 | - * |
|
80 | - * @param string $name the called method name |
|
81 | - * @param array $arguments the method arguments |
|
82 | - * @return object |
|
83 | - */ |
|
84 | - public function __call($name, $arguments) |
|
85 | - { |
|
86 | - $this->setCacheConfig($name); |
|
76 | + /** |
|
77 | + * Handle the cache mechanism for the called method |
|
78 | + * based the configurations. |
|
79 | + * |
|
80 | + * @param string $name the called method name |
|
81 | + * @param array $arguments the method arguments |
|
82 | + * @return object |
|
83 | + */ |
|
84 | + public function __call($name, $arguments) |
|
85 | + { |
|
86 | + $this->setCacheConfig($name); |
|
87 | 87 | |
88 | - if ($this->cacheConfig && $this->cacheConfig == 'cache') { |
|
89 | - $page = \Request::get('page') !== null ? \Request::get('page') : '1'; |
|
90 | - $cacheKey = $name.$page.\Session::get('locale').serialize($arguments); |
|
91 | - return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function () use ($arguments, $name) { |
|
92 | - return call_user_func_array([$this->repo, $name], $arguments); |
|
93 | - }); |
|
94 | - } elseif ($this->cacheConfig) { |
|
95 | - $this->cache->tags($this->cacheConfig)->flush(); |
|
96 | - return call_user_func_array([$this->repo, $name], $arguments); |
|
97 | - } |
|
88 | + if ($this->cacheConfig && $this->cacheConfig == 'cache') { |
|
89 | + $page = \Request::get('page') !== null ? \Request::get('page') : '1'; |
|
90 | + $cacheKey = $name.$page.\Session::get('locale').serialize($arguments); |
|
91 | + return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function () use ($arguments, $name) { |
|
92 | + return call_user_func_array([$this->repo, $name], $arguments); |
|
93 | + }); |
|
94 | + } elseif ($this->cacheConfig) { |
|
95 | + $this->cache->tags($this->cacheConfig)->flush(); |
|
96 | + return call_user_func_array([$this->repo, $name], $arguments); |
|
97 | + } |
|
98 | 98 | |
99 | - return call_user_func_array([$this->repo, $name], $arguments); |
|
100 | - } |
|
99 | + return call_user_func_array([$this->repo, $name], $arguments); |
|
100 | + } |
|
101 | 101 | |
102 | - /** |
|
103 | - * Set cache config based on the called method. |
|
104 | - * |
|
105 | - * @param string $name |
|
106 | - * @return void |
|
107 | - */ |
|
108 | - private function setCacheConfig($name) |
|
109 | - { |
|
110 | - $config = \CoreConfig::getConfig(); |
|
111 | - $cacheConfig = Arr::get($config['cacheConfig'], $this->cacheTag, false); |
|
112 | - $this->cacheConfig = false; |
|
102 | + /** |
|
103 | + * Set cache config based on the called method. |
|
104 | + * |
|
105 | + * @param string $name |
|
106 | + * @return void |
|
107 | + */ |
|
108 | + private function setCacheConfig($name) |
|
109 | + { |
|
110 | + $config = \CoreConfig::getConfig(); |
|
111 | + $cacheConfig = Arr::get($config['cacheConfig'], $this->cacheTag, false); |
|
112 | + $this->cacheConfig = false; |
|
113 | 113 | |
114 | - if ($cacheConfig && in_array($name, $cacheConfig['cache'])) { |
|
115 | - $this->cacheConfig = 'cache'; |
|
116 | - } elseif ($cacheConfig && isset($cacheConfig['clear'][$name])) { |
|
117 | - $this->cacheConfig = $cacheConfig['clear'][$name]; |
|
118 | - } |
|
119 | - } |
|
114 | + if ($cacheConfig && in_array($name, $cacheConfig['cache'])) { |
|
115 | + $this->cacheConfig = 'cache'; |
|
116 | + } elseif ($cacheConfig && isset($cacheConfig['clear'][$name])) { |
|
117 | + $this->cacheConfig = $cacheConfig['clear'][$name]; |
|
118 | + } |
|
119 | + } |
|
120 | 120 | } |
@@ -5,70 +5,70 @@ |
||
5 | 5 | |
6 | 6 | class ApiDocumentController extends Controller |
7 | 7 | { |
8 | - public function index() |
|
9 | - { |
|
10 | - $jsonDoc = json_decode(file_get_contents(app_path('Modules/Core/Resources/api.json')), true); |
|
11 | - $modules = $jsonDoc['modules']; |
|
12 | - $reports = $jsonDoc['reports']; |
|
13 | - $errors = $jsonDoc['errors']; |
|
14 | - $models = $jsonDoc['models']; |
|
15 | - $conditions = [ |
|
16 | - [ |
|
17 | - 'title' => 'email equal [email protected]:', |
|
18 | - 'content' => ['email' => '[email protected]'] |
|
19 | - ], |
|
20 | - [ |
|
21 | - 'title' => 'email equal [email protected] and user is blocked:', |
|
22 | - 'content' => ['and' => ['email' => '[email protected]', 'blocked' => 1]] |
|
23 | - ], |
|
24 | - [ |
|
25 | - 'title' => 'email equal [email protected] or user is blocked:', |
|
26 | - 'content' => ['or' => ['email' => '[email protected]', 'blocked' => 1]] |
|
27 | - ], |
|
28 | - [ |
|
29 | - 'title' => 'email contain John:', |
|
30 | - 'content' => ['email' => ['op' => 'like', 'val' => '%John%']] |
|
31 | - ], |
|
32 | - [ |
|
33 | - 'title' => 'user created after 2016-10-25:', |
|
34 | - 'content' => ['created_at' => ['op' => '>', 'val' => '2016-10-25']] |
|
35 | - ], |
|
36 | - [ |
|
37 | - 'title' => 'user created between 2016-10-20 and 2016-10-25:', |
|
38 | - 'content' => ['created_at' => ['op' => 'between', 'val1' => '2016-10-20', 'val2' => '2016-10-25']] |
|
39 | - ], |
|
40 | - [ |
|
41 | - 'title' => 'user id in 1,2,3:', |
|
42 | - 'content' => ['id' => ['op' => 'in', 'val' => [1, 2, 3]]] |
|
43 | - ], |
|
44 | - [ |
|
45 | - 'title' => 'user name is null:', |
|
46 | - 'content' => ['name' => ['op' => 'null']] |
|
47 | - ], |
|
48 | - [ |
|
49 | - 'title' => 'user name is not null:', |
|
50 | - 'content' => ['name' => ['op' => 'not null']] |
|
51 | - ], |
|
52 | - [ |
|
53 | - 'title' => 'user has group admin:', |
|
54 | - 'content' => ['groups' => ['op' => 'has', 'val' => ['name' => 'Admin']]] |
|
55 | - ] |
|
56 | - ]; |
|
8 | + public function index() |
|
9 | + { |
|
10 | + $jsonDoc = json_decode(file_get_contents(app_path('Modules/Core/Resources/api.json')), true); |
|
11 | + $modules = $jsonDoc['modules']; |
|
12 | + $reports = $jsonDoc['reports']; |
|
13 | + $errors = $jsonDoc['errors']; |
|
14 | + $models = $jsonDoc['models']; |
|
15 | + $conditions = [ |
|
16 | + [ |
|
17 | + 'title' => 'email equal [email protected]:', |
|
18 | + 'content' => ['email' => '[email protected]'] |
|
19 | + ], |
|
20 | + [ |
|
21 | + 'title' => 'email equal [email protected] and user is blocked:', |
|
22 | + 'content' => ['and' => ['email' => '[email protected]', 'blocked' => 1]] |
|
23 | + ], |
|
24 | + [ |
|
25 | + 'title' => 'email equal [email protected] or user is blocked:', |
|
26 | + 'content' => ['or' => ['email' => '[email protected]', 'blocked' => 1]] |
|
27 | + ], |
|
28 | + [ |
|
29 | + 'title' => 'email contain John:', |
|
30 | + 'content' => ['email' => ['op' => 'like', 'val' => '%John%']] |
|
31 | + ], |
|
32 | + [ |
|
33 | + 'title' => 'user created after 2016-10-25:', |
|
34 | + 'content' => ['created_at' => ['op' => '>', 'val' => '2016-10-25']] |
|
35 | + ], |
|
36 | + [ |
|
37 | + 'title' => 'user created between 2016-10-20 and 2016-10-25:', |
|
38 | + 'content' => ['created_at' => ['op' => 'between', 'val1' => '2016-10-20', 'val2' => '2016-10-25']] |
|
39 | + ], |
|
40 | + [ |
|
41 | + 'title' => 'user id in 1,2,3:', |
|
42 | + 'content' => ['id' => ['op' => 'in', 'val' => [1, 2, 3]]] |
|
43 | + ], |
|
44 | + [ |
|
45 | + 'title' => 'user name is null:', |
|
46 | + 'content' => ['name' => ['op' => 'null']] |
|
47 | + ], |
|
48 | + [ |
|
49 | + 'title' => 'user name is not null:', |
|
50 | + 'content' => ['name' => ['op' => 'not null']] |
|
51 | + ], |
|
52 | + [ |
|
53 | + 'title' => 'user has group admin:', |
|
54 | + 'content' => ['groups' => ['op' => 'has', 'val' => ['name' => 'Admin']]] |
|
55 | + ] |
|
56 | + ]; |
|
57 | 57 | |
58 | - $paginateObject = [ |
|
59 | - 'total' => 50, |
|
60 | - 'per_page' => 15, |
|
61 | - 'current_page' => 1, |
|
62 | - 'last_page' => 4, |
|
63 | - 'next_page_url' => 'apiUrl?page=2', |
|
64 | - 'prev_page_url' => null, |
|
65 | - 'from' => 1, |
|
66 | - 'to' => 15, |
|
67 | - 'data' => ['The model object'] |
|
68 | - ]; |
|
58 | + $paginateObject = [ |
|
59 | + 'total' => 50, |
|
60 | + 'per_page' => 15, |
|
61 | + 'current_page' => 1, |
|
62 | + 'last_page' => 4, |
|
63 | + 'next_page_url' => 'apiUrl?page=2', |
|
64 | + 'prev_page_url' => null, |
|
65 | + 'from' => 1, |
|
66 | + 'to' => 15, |
|
67 | + 'data' => ['The model object'] |
|
68 | + ]; |
|
69 | 69 | |
70 | - $avaialableReports = \Core::reports()->all(); |
|
70 | + $avaialableReports = \Core::reports()->all(); |
|
71 | 71 | |
72 | - return view('core::doc', ['modules' => $modules, 'reports' => $reports, 'errors' => $errors, 'conditions' => $conditions, 'models' => $models, 'paginateObject' => json_encode($paginateObject, JSON_PRETTY_PRINT), 'avaialableReports' => $avaialableReports]); |
|
73 | - } |
|
72 | + return view('core::doc', ['modules' => $modules, 'reports' => $reports, 'errors' => $errors, 'conditions' => $conditions, 'models' => $models, 'paginateObject' => json_encode($paginateObject, JSON_PRETTY_PRINT), 'avaialableReports' => $avaialableReports]); |
|
73 | + } |
|
74 | 74 | } |
@@ -2,28 +2,28 @@ |
||
2 | 2 | |
3 | 3 | return [ |
4 | 4 | |
5 | - /** |
|
6 | - * List of error messages used in core module. |
|
7 | - */ |
|
8 | - 'unAuthorized' => 'من فضلك قم بتسجيل الدخول', |
|
9 | - 'invalidRefreshToken' => 'رمز التحديث غير صالح', |
|
10 | - 'noPermissions' => 'لا توجد صلاحية', |
|
11 | - 'loginFailed' => 'خطأ في البريد لاكتروني او كلمة المرور', |
|
12 | - 'noSocialEmail' => 'لا يمكن الحصول علي تابريد الاكتروني', |
|
13 | - 'userAlreadyRegistered' => 'المستخد مسجل بالفعل.سجل الدخول بالبريد الاكتروني و كلمة السر', |
|
14 | - 'connectionError' => 'خطأ في الاتصال', |
|
15 | - 'redisNotRunning' => 'سيرفير الاشعارات لايعمل', |
|
16 | - 'dbQueryError' => 'خطا في البيانات', |
|
17 | - 'cannotCreateSetting' => 'لا يمكن اضافة اعدادات', |
|
18 | - 'cannotUpdateSettingKey' => 'لا يمكن تعديل اعدادات', |
|
19 | - 'userIsBlocked' => 'لقد تم حظرك', |
|
20 | - 'invalidResetToken' => 'رمز تعديل كلمة المرور خطا', |
|
21 | - 'invalidResetPassword' => 'خطا في نعديل كلمة المرور', |
|
22 | - 'invalidOldPassword' => 'كلمة السر القديمه خطا', |
|
23 | - 'invalidConfirmationCode' => 'لينك التاكيد غير صالح اة مستخدم من قبل', |
|
24 | - 'notFound' => 'ال :replace المطلوب غير موجود', |
|
25 | - 'generalError' => 'حدث خطا ما', |
|
26 | - 'emailNotConfirmed' => 'بريدك الاكتروني غير مفعل', |
|
27 | - 'emailAlreadyConfirmed' => 'البريد الاكتروني مفع بالقعل' |
|
5 | + /** |
|
6 | + * List of error messages used in core module. |
|
7 | + */ |
|
8 | + 'unAuthorized' => 'من فضلك قم بتسجيل الدخول', |
|
9 | + 'invalidRefreshToken' => 'رمز التحديث غير صالح', |
|
10 | + 'noPermissions' => 'لا توجد صلاحية', |
|
11 | + 'loginFailed' => 'خطأ في البريد لاكتروني او كلمة المرور', |
|
12 | + 'noSocialEmail' => 'لا يمكن الحصول علي تابريد الاكتروني', |
|
13 | + 'userAlreadyRegistered' => 'المستخد مسجل بالفعل.سجل الدخول بالبريد الاكتروني و كلمة السر', |
|
14 | + 'connectionError' => 'خطأ في الاتصال', |
|
15 | + 'redisNotRunning' => 'سيرفير الاشعارات لايعمل', |
|
16 | + 'dbQueryError' => 'خطا في البيانات', |
|
17 | + 'cannotCreateSetting' => 'لا يمكن اضافة اعدادات', |
|
18 | + 'cannotUpdateSettingKey' => 'لا يمكن تعديل اعدادات', |
|
19 | + 'userIsBlocked' => 'لقد تم حظرك', |
|
20 | + 'invalidResetToken' => 'رمز تعديل كلمة المرور خطا', |
|
21 | + 'invalidResetPassword' => 'خطا في نعديل كلمة المرور', |
|
22 | + 'invalidOldPassword' => 'كلمة السر القديمه خطا', |
|
23 | + 'invalidConfirmationCode' => 'لينك التاكيد غير صالح اة مستخدم من قبل', |
|
24 | + 'notFound' => 'ال :replace المطلوب غير موجود', |
|
25 | + 'generalError' => 'حدث خطا ما', |
|
26 | + 'emailNotConfirmed' => 'بريدك الاكتروني غير مفعل', |
|
27 | + 'emailAlreadyConfirmed' => 'البريد الاكتروني مفع بالقعل' |
|
28 | 28 | |
29 | 29 | ]; |
@@ -2,28 +2,28 @@ |
||
2 | 2 | |
3 | 3 | return [ |
4 | 4 | |
5 | - /** |
|
6 | - * List of error messages used in core module. |
|
7 | - */ |
|
8 | - 'unAuthorized' => 'Please login before any action', |
|
9 | - 'invalidRefreshToken' => 'Invalid refresh token', |
|
10 | - 'noPermissions' => 'No permissions', |
|
11 | - 'loginFailed' => 'Wrong mail or password', |
|
12 | - 'noSocialEmail' => 'Couldn\'t retrieve email', |
|
13 | - 'userAlreadyRegistered' => 'User already registered. Please login using email and password', |
|
14 | - 'connectionError' => 'Connection error', |
|
15 | - 'redisNotRunning' => 'Your redis notification server is\'t running', |
|
16 | - 'dbQueryError' => 'Please check the given inputes', |
|
17 | - 'cannotCreateSetting' => 'Can\'t create setting', |
|
18 | - 'cannotUpdateSettingKey' => 'Can\'t update setting key', |
|
19 | - 'userIsBlocked' => 'You have been blocked', |
|
20 | - 'invalidResetToken' => 'Reset password token is invalid', |
|
21 | - 'invalidResetPassword' => 'Reset password is invalid', |
|
22 | - 'invalidOldPassword' => 'Old password is invalid', |
|
23 | - 'invalidConfirmationCode' => 'Confirmation link expired or already used', |
|
24 | - 'notFound' => 'The requested :replace not found', |
|
25 | - 'generalError' => 'Something went wrong', |
|
26 | - 'emailNotConfirmed' => 'Your email isn\'t confirmed', |
|
27 | - 'emailAlreadyConfirmed' => 'Your email is already confirmed' |
|
5 | + /** |
|
6 | + * List of error messages used in core module. |
|
7 | + */ |
|
8 | + 'unAuthorized' => 'Please login before any action', |
|
9 | + 'invalidRefreshToken' => 'Invalid refresh token', |
|
10 | + 'noPermissions' => 'No permissions', |
|
11 | + 'loginFailed' => 'Wrong mail or password', |
|
12 | + 'noSocialEmail' => 'Couldn\'t retrieve email', |
|
13 | + 'userAlreadyRegistered' => 'User already registered. Please login using email and password', |
|
14 | + 'connectionError' => 'Connection error', |
|
15 | + 'redisNotRunning' => 'Your redis notification server is\'t running', |
|
16 | + 'dbQueryError' => 'Please check the given inputes', |
|
17 | + 'cannotCreateSetting' => 'Can\'t create setting', |
|
18 | + 'cannotUpdateSettingKey' => 'Can\'t update setting key', |
|
19 | + 'userIsBlocked' => 'You have been blocked', |
|
20 | + 'invalidResetToken' => 'Reset password token is invalid', |
|
21 | + 'invalidResetPassword' => 'Reset password is invalid', |
|
22 | + 'invalidOldPassword' => 'Old password is invalid', |
|
23 | + 'invalidConfirmationCode' => 'Confirmation link expired or already used', |
|
24 | + 'notFound' => 'The requested :replace not found', |
|
25 | + 'generalError' => 'Something went wrong', |
|
26 | + 'emailNotConfirmed' => 'Your email isn\'t confirmed', |
|
27 | + 'emailAlreadyConfirmed' => 'Your email is already confirmed' |
|
28 | 28 | |
29 | 29 | ]; |
@@ -4,8 +4,8 @@ |
||
4 | 4 | |
5 | 5 | class CoreConfig extends Facade |
6 | 6 | { |
7 | - protected static function getFacadeAccessor() |
|
8 | - { |
|
9 | - return 'CoreConfig'; |
|
10 | - } |
|
7 | + protected static function getFacadeAccessor() |
|
8 | + { |
|
9 | + return 'CoreConfig'; |
|
10 | + } |
|
11 | 11 | } |