Completed
Push — master ( 7f4033...c0246b )
by Sherif
02:56
created
src/Modules/Reporting/Repositories/ReportRepository.php 1 patch
Indentation   +45 added lines, -45 removed lines patch added patch discarded remove patch
@@ -11,63 +11,63 @@
 block discarded – undo
11 11
 	 */
12 12
 	protected function getModel()
13 13
 	{
14
-        $apiVersion = \Request::header('api-version') ?: 1;
14
+		$apiVersion = \Request::header('api-version') ?: 1;
15 15
 		return 'App\Modules\Reporting\Report';
16 16
 	}
17 17
 
18 18
 	/**
19
-     * Render the given report db view.
20
-     * 
21
-     * @param  integer $id
22
-     * @param  array   $relations
23
-     * @param  array   $columns
24
-     * @return object
25
-     */
26
-    public function find($id, $relations = [], $columns = array('*'))
27
-    {
19
+	 * Render the given report db view.
20
+	 * 
21
+	 * @param  integer $id
22
+	 * @param  array   $relations
23
+	 * @param  array   $columns
24
+	 * @return object
25
+	 */
26
+	public function find($id, $relations = [], $columns = array('*'))
27
+	{
28 28
 		$report = call_user_func_array("{$this->getModel()}::with", array($relations))->find($id, $columns);
29 29
 
30
-        if ( ! $report) 
31
-        {
32
-            $error = \ErrorHandler::notFound('report');
33
-            abort($error['status'], $error['message']);
34
-        }
30
+		if ( ! $report) 
31
+		{
32
+			$error = \ErrorHandler::notFound('report');
33
+			abort($error['status'], $error['message']);
34
+		}
35 35
 
36
-        if ( ! \Core::users()->can($report->view_name, 'reports'))
37
-        {
38
-            $error = \ErrorHandler::noPermissions();
39
-            abort($error['status'], $error['message']);
40
-        }
36
+		if ( ! \Core::users()->can($report->view_name, 'reports'))
37
+		{
38
+			$error = \ErrorHandler::noPermissions();
39
+			abort($error['status'], $error['message']);
40
+		}
41 41
 
42
-        return \DB::table($report->view_name)->get();
43
-    }
42
+		return \DB::table($report->view_name)->get();
43
+	}
44 44
 
45
-    /**
46
-     * Render the given report db view based on the given
47
-     * condition.
48
-     *
49
-     * @param  array   $conditions array of conditions
50
-     * @param  array   $relations
51
-     * @param  array   $colunmns
52
-     * @return object
53
-     */
54
-    public function first($conditions, $relations = [], $columns = array('*'))
55
-    {
45
+	/**
46
+	 * Render the given report db view based on the given
47
+	 * condition.
48
+	 *
49
+	 * @param  array   $conditions array of conditions
50
+	 * @param  array   $relations
51
+	 * @param  array   $colunmns
52
+	 * @return object
53
+	 */
54
+	public function first($conditions, $relations = [], $columns = array('*'))
55
+	{
56 56
 		$conditions = $this->constructConditions($conditions);
57 57
 		$report     = call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->first($columns);
58 58
         
59
-        if ( ! $report) 
60
-        {
61
-            $error = \ErrorHandler::notFound('report');
62
-            abort($error['status'], $error['message']);
63
-        }
59
+		if ( ! $report) 
60
+		{
61
+			$error = \ErrorHandler::notFound('report');
62
+			abort($error['status'], $error['message']);
63
+		}
64 64
         
65
-        if ( ! \Core::users()->can($report->view_name, 'reports'))
66
-        {
67
-            $error = \ErrorHandler::noPermissions();
68
-            abort($error['status'], $error['message']);
69
-        }
65
+		if ( ! \Core::users()->can($report->view_name, 'reports'))
66
+		{
67
+			$error = \ErrorHandler::noPermissions();
68
+			abort($error['status'], $error['message']);
69
+		}
70 70
 		
71
-        return \DB::table($report->view_name)->get();  
72
-    }
71
+		return \DB::table($report->view_name)->get();  
72
+	}
73 73
 }
Please login to merge, or discard this patch.
src/Modules/Core/Database/Migrations/2016_01_19_084705_logs.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
 			$table->string('view_name',100);
19 19
 			$table->softDeletes();
20 20
 			$table->timestamps();
21
-        });
21
+		});
22 22
 	}
23 23
 
24 24
 	/**
Please login to merge, or discard this patch.
src/Modules/Core/Database/Migrations/2016_01_24_123631_initialize_Core.php 1 patch
Indentation   +115 added lines, -115 removed lines patch added patch discarded remove patch
@@ -12,129 +12,129 @@
 block discarded – undo
12 12
 	 */
13 13
 	public function up()
14 14
 	{
15
-        /**
16
-         * Delete previous permissions.
17
-         */
15
+		/**
16
+		 * Delete previous permissions.
17
+		 */
18 18
 		DB::table('permissions')->whereIn('model', ['settings'])->delete();
19 19
 
20 20
 		/**
21
-         * Insert the permissions related to this module.
22
-         */
23
-        DB::table('permissions')->insert(
24
-        	[
25
-        		/**
26
-        		 * Users model permissions.
27
-        		 */
28
-	        	[
29
-	        	'name'       => 'save',
30
-	        	'model'      => 'settings',
31
-	        	'created_at' => \DB::raw('NOW()'),
32
-	        	'updated_at' => \DB::raw('NOW()')
33
-	        	],
34
-	        	[
35
-	        	'name'       => 'find',
36
-	        	'model'      => 'settings',
37
-	        	'created_at' => \DB::raw('NOW()'),
38
-	        	'updated_at' => \DB::raw('NOW()')
39
-	        	],
40
-	        	[
41
-	        	'name'       => 'search',
42
-	        	'model'      => 'settings',
43
-	        	'created_at' => \DB::raw('NOW()'),
44
-	        	'updated_at' => \DB::raw('NOW()')
45
-	        	],
46
-	        	[
47
-	        	'name'       => 'list',
48
-	        	'model'      => 'settings',
49
-	        	'created_at' => \DB::raw('NOW()'),
50
-	        	'updated_at' => \DB::raw('NOW()')
51
-	        	],
52
-	        	[
53
-	        	'name'       => 'findby',
54
-	        	'model'      => 'settings',
55
-	        	'created_at' => \DB::raw('NOW()'),
56
-	        	'updated_at' => \DB::raw('NOW()')
57
-	        	],
58
-	        	[
59
-	        	'name'       => 'first',
60
-	        	'model'      => 'settings',
61
-	        	'created_at' => \DB::raw('NOW()'),
62
-	        	'updated_at' => \DB::raw('NOW()')
63
-	        	],
64
-	        	[
65
-	        	'name'       => 'paginate',
66
-	        	'model'      => 'settings',
67
-	        	'created_at' => \DB::raw('NOW()'),
68
-	        	'updated_at' => \DB::raw('NOW()')
69
-	        	],
70
-	        	[
71
-	        	'name'       => 'paginateby',
72
-	        	'model'      => 'settings',
73
-	        	'created_at' => \DB::raw('NOW()'),
74
-	        	'updated_at' => \DB::raw('NOW()')
75
-	        	]
76
-        	]
77
-        );
21
+		 * Insert the permissions related to this module.
22
+		 */
23
+		DB::table('permissions')->insert(
24
+			[
25
+				/**
26
+				 * Users model permissions.
27
+				 */
28
+				[
29
+				'name'       => 'save',
30
+				'model'      => 'settings',
31
+				'created_at' => \DB::raw('NOW()'),
32
+				'updated_at' => \DB::raw('NOW()')
33
+				],
34
+				[
35
+				'name'       => 'find',
36
+				'model'      => 'settings',
37
+				'created_at' => \DB::raw('NOW()'),
38
+				'updated_at' => \DB::raw('NOW()')
39
+				],
40
+				[
41
+				'name'       => 'search',
42
+				'model'      => 'settings',
43
+				'created_at' => \DB::raw('NOW()'),
44
+				'updated_at' => \DB::raw('NOW()')
45
+				],
46
+				[
47
+				'name'       => 'list',
48
+				'model'      => 'settings',
49
+				'created_at' => \DB::raw('NOW()'),
50
+				'updated_at' => \DB::raw('NOW()')
51
+				],
52
+				[
53
+				'name'       => 'findby',
54
+				'model'      => 'settings',
55
+				'created_at' => \DB::raw('NOW()'),
56
+				'updated_at' => \DB::raw('NOW()')
57
+				],
58
+				[
59
+				'name'       => 'first',
60
+				'model'      => 'settings',
61
+				'created_at' => \DB::raw('NOW()'),
62
+				'updated_at' => \DB::raw('NOW()')
63
+				],
64
+				[
65
+				'name'       => 'paginate',
66
+				'model'      => 'settings',
67
+				'created_at' => \DB::raw('NOW()'),
68
+				'updated_at' => \DB::raw('NOW()')
69
+				],
70
+				[
71
+				'name'       => 'paginateby',
72
+				'model'      => 'settings',
73
+				'created_at' => \DB::raw('NOW()'),
74
+				'updated_at' => \DB::raw('NOW()')
75
+				]
76
+			]
77
+		);
78 78
 
79
-         /**
80
-         * Delete previous permissions.
81
-         */
79
+		 /**
80
+		  * Delete previous permissions.
81
+		  */
82 82
 		DB::table('permissions')->whereIn('model', ['logs'])->delete();
83 83
 
84 84
 		 /**
85
-         * Insert the permissions related to this module.
86
-         */
87
-        DB::table('permissions')->insert(
88
-        	[
89
-        		/**
90
-        		 * Logs model permissions.
91
-        		 */
92
-	        	[
93
-	        	'name'       => 'find',
94
-	        	'model'      => 'logs',
95
-	        	'created_at' => \DB::raw('NOW()'),
96
-	        	'updated_at' => \DB::raw('NOW()')
97
-	        	],
98
-	        	[
99
-	        	'name'       => 'search',
100
-	        	'model'      => 'logs',
101
-	        	'created_at' => \DB::raw('NOW()'),
102
-	        	'updated_at' => \DB::raw('NOW()')
103
-	        	],
104
-	        	[
105
-	        	'name'       => 'list',
106
-	        	'model'      => 'logs',
107
-	        	'created_at' => \DB::raw('NOW()'),
108
-	        	'updated_at' => \DB::raw('NOW()')
109
-	        	],
110
-	        	[
111
-	        	'name'       => 'findby',
112
-	        	'model'      => 'logs',
113
-	        	'created_at' => \DB::raw('NOW()'),
114
-	        	'updated_at' => \DB::raw('NOW()')
115
-	        	],
116
-	        	[
117
-	        	'name'       => 'first',
118
-	        	'model'      => 'logs',
119
-	        	'created_at' => \DB::raw('NOW()'),
120
-	        	'updated_at' => \DB::raw('NOW()')
121
-	        	],
122
-	        	[
123
-	        	'name'       => 'paginate',
124
-	        	'model'      => 'logs',
125
-	        	'created_at' => \DB::raw('NOW()'),
126
-	        	'updated_at' => \DB::raw('NOW()')
127
-	        	],
128
-	        	[
129
-	        	'name'       => 'paginateby',
130
-	        	'model'      => 'logs',
131
-	        	'created_at' => \DB::raw('NOW()'),
132
-	        	'updated_at' => \DB::raw('NOW()')
133
-	        	],
134
-        	]
135
-        );
85
+		  * Insert the permissions related to this module.
86
+		  */
87
+		DB::table('permissions')->insert(
88
+			[
89
+				/**
90
+				 * Logs model permissions.
91
+				 */
92
+				[
93
+				'name'       => 'find',
94
+				'model'      => 'logs',
95
+				'created_at' => \DB::raw('NOW()'),
96
+				'updated_at' => \DB::raw('NOW()')
97
+				],
98
+				[
99
+				'name'       => 'search',
100
+				'model'      => 'logs',
101
+				'created_at' => \DB::raw('NOW()'),
102
+				'updated_at' => \DB::raw('NOW()')
103
+				],
104
+				[
105
+				'name'       => 'list',
106
+				'model'      => 'logs',
107
+				'created_at' => \DB::raw('NOW()'),
108
+				'updated_at' => \DB::raw('NOW()')
109
+				],
110
+				[
111
+				'name'       => 'findby',
112
+				'model'      => 'logs',
113
+				'created_at' => \DB::raw('NOW()'),
114
+				'updated_at' => \DB::raw('NOW()')
115
+				],
116
+				[
117
+				'name'       => 'first',
118
+				'model'      => 'logs',
119
+				'created_at' => \DB::raw('NOW()'),
120
+				'updated_at' => \DB::raw('NOW()')
121
+				],
122
+				[
123
+				'name'       => 'paginate',
124
+				'model'      => 'logs',
125
+				'created_at' => \DB::raw('NOW()'),
126
+				'updated_at' => \DB::raw('NOW()')
127
+				],
128
+				[
129
+				'name'       => 'paginateby',
130
+				'model'      => 'logs',
131
+				'created_at' => \DB::raw('NOW()'),
132
+				'updated_at' => \DB::raw('NOW()')
133
+				],
134
+			]
135
+		);
136 136
 
137
-        /**
137
+		/**
138 138
 		 * Assign the permissions to the admin group.
139 139
 		 */
140 140
 		$permissionIds = DB::table('permissions')->whereIn('model', ['settings', 'logs'])->select('id')->lists('id');
Please login to merge, or discard this patch.
src/Modules/Core/Utl/ErrorHandler.php 1 patch
Indentation   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -2,48 +2,48 @@
 block discarded – undo
2 2
 
3 3
 class ErrorHandler
4 4
 {
5
-    public function unAuthorized()
6
-    {
7
-        return ['status' => 401, 'message' => 'Please login before any action'];
8
-    }
9
-
10
-    public function tokenExpired()
11
-    {
12
-        return ['status' => 401, 'message' => 'Login token expired'];
13
-    }
14
-
15
-     public function noPermissions()
16
-    {
17
-        return ['status' => 401, 'message' => 'No permissions'];
18
-    }
19
-
20
-    public function loginFailed()
21
-    {
22
-        return ['status' => 400, 'message' => 'Wrong mail or password'];
23
-    }
24
-
25
-    public function redisNotRunning()
26
-    {
27
-        return ['status' => 400, 'message' => 'Your redis notification server isn\'t running'];
28
-    }
29
-
30
-    public function dbQueryError()
31
-    {
32
-        return ['status' => 400, 'message' => 'Please check the given inputes'];
33
-    }
34
-
35
-    public function cannotCreateSetting()
36
-    {
37
-        return ['status' => 400, 'message' => 'Can\'t create setting'];
38
-    }
39
-
40
-    public function cannotUpdateSettingKey()
41
-    {
42
-        return ['status' => 400, 'message' => 'Can\'t update setting key'];
43
-    }
44
-
45
-    public function notFound($text)
46
-    {
47
-        return ['status' => 404, 'message' => 'The requested ' . $text . ' not found'];
48
-    }
5
+	public function unAuthorized()
6
+	{
7
+		return ['status' => 401, 'message' => 'Please login before any action'];
8
+	}
9
+
10
+	public function tokenExpired()
11
+	{
12
+		return ['status' => 401, 'message' => 'Login token expired'];
13
+	}
14
+
15
+	 public function noPermissions()
16
+	{
17
+		return ['status' => 401, 'message' => 'No permissions'];
18
+	}
19
+
20
+	public function loginFailed()
21
+	{
22
+		return ['status' => 400, 'message' => 'Wrong mail or password'];
23
+	}
24
+
25
+	public function redisNotRunning()
26
+	{
27
+		return ['status' => 400, 'message' => 'Your redis notification server isn\'t running'];
28
+	}
29
+
30
+	public function dbQueryError()
31
+	{
32
+		return ['status' => 400, 'message' => 'Please check the given inputes'];
33
+	}
34
+
35
+	public function cannotCreateSetting()
36
+	{
37
+		return ['status' => 400, 'message' => 'Can\'t create setting'];
38
+	}
39
+
40
+	public function cannotUpdateSettingKey()
41
+	{
42
+		return ['status' => 400, 'message' => 'Can\'t update setting key'];
43
+	}
44
+
45
+	public function notFound($text)
46
+	{
47
+		return ['status' => 404, 'message' => 'The requested ' . $text . ' not found'];
48
+	}
49 49
 }
50 50
\ No newline at end of file
Please login to merge, or discard this patch.
src/Modules/Core/Utl/Logging.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -2,18 +2,18 @@
 block discarded – undo
2 2
 
3 3
 class Log
4 4
 {
5
-    public function saveLog($action, $item_name, $item_type, $item_id, $model = false)
6
-    {
7
-    	if (\Core::logs() && $item_name !== 'Log')
8
-    	{
9
-            $item_name = $item_name;
10
-    		\Core::logs()->save([
11
-	    		'action'      => $action,
12
-	    		'item_name'   => $item_name,
13
-	    		'item_type'   => $item_type,
14
-	    		'item_id'     => $item_id,
15
-	    		'user_id'     => \JWTAuth::parseToken()->authenticate()->id,
16
-	    		], false, false);
17
-    	}
18
-    }
5
+	public function saveLog($action, $item_name, $item_type, $item_id, $model = false)
6
+	{
7
+		if (\Core::logs() && $item_name !== 'Log')
8
+		{
9
+			$item_name = $item_name;
10
+			\Core::logs()->save([
11
+				'action'      => $action,
12
+				'item_name'   => $item_name,
13
+				'item_type'   => $item_type,
14
+				'item_id'     => $item_id,
15
+				'user_id'     => \JWTAuth::parseToken()->authenticate()->id,
16
+				], false, false);
17
+		}
18
+	}
19 19
 }
20 20
\ No newline at end of file
Please login to merge, or discard this patch.
src/Modules/Core/Utl/CoreConfig.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -2,14 +2,14 @@  discard block
 block discarded – undo
2 2
 
3 3
 class CoreConfig
4 4
 {
5
-    public function getConfig()
6
-    {
7
-    	$customSettings = [];
8
-    	Settings::get(['key', 'value'])->each(function ($setting) use (&$customSettings){
9
-    		$customSettings[$setting['key']] = $setting['value'];
10
-    	});
5
+	public function getConfig()
6
+	{
7
+		$customSettings = [];
8
+		Settings::get(['key', 'value'])->each(function ($setting) use (&$customSettings){
9
+			$customSettings[$setting['key']] = $setting['value'];
10
+		});
11 11
 
12
-        return array_merge($customSettings, [
12
+		return array_merge($customSettings, [
13 13
 			/**
14 14
 			 * Specify what relations should be used for every model.
15 15
 			 */
@@ -56,5 +56,5 @@  discard block
 block discarded – undo
56 56
 				],
57 57
 			]
58 58
 		]);
59
-    }
59
+	}
60 60
 }
61 61
\ No newline at end of file
Please login to merge, or discard this patch.
src/Modules/Core/AbstractRepositories/AbstractRepositoryContainer.php 1 patch
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -4,34 +4,34 @@
 block discarded – undo
4 4
 
5 5
 abstract class AbstractRepositoryContainer implements RepositoryContainerInterface
6 6
 {
7
-    /**
8
-     * Construct the repository class name based on
9
-     * the method name called, search in the 
10
-     * given namespaces for the class and 
11
-     * return an instance.
12
-     * 
13
-     * @param  string $name the called method name
14
-     * @param  array  $arguments the method arguments
15
-     * @return object
16
-     */
7
+	/**
8
+	 * Construct the repository class name based on
9
+	 * the method name called, search in the 
10
+	 * given namespaces for the class and 
11
+	 * return an instance.
12
+	 * 
13
+	 * @param  string $name the called method name
14
+	 * @param  array  $arguments the method arguments
15
+	 * @return object
16
+	 */
17 17
 	public function __call($name, $arguments)
18
-    {
19
-    	foreach ($this->getRepoNameSpace() as $repoNameSpace) 
20
-    	{
21
-            $class = rtrim($repoNameSpace, '\\') . '\\' . ucfirst(str_singular($name)) . 'Repository';
22
-    		if (class_exists($class)) 
23
-    		{
24
-        		return \App::make($class);
25
-    		}
26
-    	}
27
-    }
18
+	{
19
+		foreach ($this->getRepoNameSpace() as $repoNameSpace) 
20
+		{
21
+			$class = rtrim($repoNameSpace, '\\') . '\\' . ucfirst(str_singular($name)) . 'Repository';
22
+			if (class_exists($class)) 
23
+			{
24
+				return \App::make($class);
25
+			}
26
+		}
27
+	}
28 28
 
29
-     /**
30
-     * Abstract methods that return the necessary 
31
-     * information (repositories namespaces)
32
-     * needed to preform the previous actions.
33
-     * 
34
-     * @return array
35
-     */
36
-    abstract protected function getRepoNameSpace();
29
+	 /**
30
+	  * Abstract methods that return the necessary 
31
+	  * information (repositories namespaces)
32
+	  * needed to preform the previous actions.
33
+	  * 
34
+	  * @return array
35
+	  */
36
+	abstract protected function getRepoNameSpace();
37 37
 }
38 38
\ No newline at end of file
Please login to merge, or discard this patch.
src/Modules/Core/Http/Controllers/LogsController.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -8,9 +8,9 @@
 block discarded – undo
8 8
 class LogsController extends BaseApiController
9 9
 {
10 10
 	/**
11
-     * The name of the model that is used by the base api controller 
12
-     * to preform actions like (add, edit ... etc).
13
-     * @var string
14
-     */
15
-    protected $model            = 'logs';
11
+	 * The name of the model that is used by the base api controller 
12
+	 * to preform actions like (add, edit ... etc).
13
+	 * @var string
14
+	 */
15
+	protected $model            = 'logs';
16 16
 }
Please login to merge, or discard this patch.
src/Modules/Reporting/Report.php 1 patch
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@  discard block
 block discarded – undo
5 5
 
6 6
 class Report extends Model{
7 7
 
8
-    use SoftDeletes;
8
+	use SoftDeletes;
9 9
 	protected $table    = 'reports';
10 10
 	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
11 11
 	protected $hidden   = ['deleted_at'];
@@ -13,23 +13,23 @@  discard block
 block discarded – undo
13 13
 	protected $fillable = ['report_name', 'view_name'];
14 14
 
15 15
 	public function getCreatedAtAttribute($value)
16
-    {
17
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
18
-    }
16
+	{
17
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
18
+	}
19 19
 
20
-    public function getUpdatedAtAttribute($value)
21
-    {
22
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
23
-    }
20
+	public function getUpdatedAtAttribute($value)
21
+	{
22
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
23
+	}
24 24
 
25
-    public function getDeletedAtAttribute($value)
26
-    {
27
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
28
-    }
25
+	public function getDeletedAtAttribute($value)
26
+	{
27
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
28
+	}
29 29
     
30
-    public static function boot()
31
-    {
32
-        parent::boot();
33
-        parent::observe(\App::make('App\Modules\Reporting\ModelObservers\ReprotObserver'));
34
-    }
30
+	public static function boot()
31
+	{
32
+		parent::boot();
33
+		parent::observe(\App::make('App\Modules\Reporting\ModelObservers\ReprotObserver'));
34
+	}
35 35
 }
Please login to merge, or discard this patch.