@@ -5,23 +5,23 @@ |
||
| 5 | 5 | class Notification extends DatabaseNotification |
| 6 | 6 | { |
| 7 | 7 | |
| 8 | - public function getCreatedAtAttribute($value) |
|
| 9 | - { |
|
| 10 | - return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString(); |
|
| 11 | - } |
|
| 8 | + public function getCreatedAtAttribute($value) |
|
| 9 | + { |
|
| 10 | + return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString(); |
|
| 11 | + } |
|
| 12 | 12 | |
| 13 | - public function getUpdatedAtAttribute($value) |
|
| 14 | - { |
|
| 15 | - return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString(); |
|
| 16 | - } |
|
| 13 | + public function getUpdatedAtAttribute($value) |
|
| 14 | + { |
|
| 15 | + return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString(); |
|
| 16 | + } |
|
| 17 | 17 | |
| 18 | - public function getDeletedAtAttribute($value) |
|
| 19 | - { |
|
| 20 | - return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString(); |
|
| 21 | - } |
|
| 18 | + public function getDeletedAtAttribute($value) |
|
| 19 | + { |
|
| 20 | + return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString(); |
|
| 21 | + } |
|
| 22 | 22 | |
| 23 | - public function getReadAtAttribute($value) |
|
| 24 | - { |
|
| 25 | - return ! $value ? false : \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 26 | - } |
|
| 23 | + public function getReadAtAttribute($value) |
|
| 24 | + { |
|
| 25 | + return ! $value ? false : \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 26 | + } |
|
| 27 | 27 | } |
@@ -1,13 +1,13 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | $factory->define(App\Modules\Notifications\Notification::class, function (Faker\Generator $faker) { |
| 4 | - return [ |
|
| 5 | - 'type' => '', |
|
| 6 | - 'notifiable_type' => '', |
|
| 7 | - 'notifiable_id' => '', |
|
| 8 | - 'data' => '', |
|
| 9 | - 'read_at' => null, |
|
| 10 | - 'created_at' => $faker->dateTimeBetween('-1 years', 'now'), |
|
| 11 | - 'updated_at' => $faker->dateTimeBetween('-1 years', 'now') |
|
| 12 | - ]; |
|
| 4 | + return [ |
|
| 5 | + 'type' => '', |
|
| 6 | + 'notifiable_type' => '', |
|
| 7 | + 'notifiable_id' => '', |
|
| 8 | + 'data' => '', |
|
| 9 | + 'read_at' => null, |
|
| 10 | + 'created_at' => $faker->dateTimeBetween('-1 years', 'now'), |
|
| 11 | + 'updated_at' => $faker->dateTimeBetween('-1 years', 'now') |
|
| 12 | + ]; |
|
| 13 | 13 | }); |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -$factory->define(App\Modules\Notifications\Notification::class, function (Faker\Generator $faker) { |
|
| 3 | +$factory->define(App\Modules\Notifications\Notification::class, function(Faker\Generator $faker) { |
|
| 4 | 4 | return [ |
| 5 | 5 | 'type' => '', |
| 6 | 6 | 'notifiable_type' => '', |
@@ -2,8 +2,8 @@ |
||
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | 4 | |
| 5 | - /** |
|
| 6 | - * Here goes your notification messages. |
|
| 7 | - */ |
|
| 5 | + /** |
|
| 6 | + * Here goes your notification messages. |
|
| 7 | + */ |
|
| 8 | 8 | |
| 9 | 9 | ]; |
@@ -4,65 +4,65 @@ |
||
| 4 | 4 | |
| 5 | 5 | class MakeNotificationsCommand extends GeneratorCommand |
| 6 | 6 | { |
| 7 | - /** |
|
| 8 | - * The name and signature of the console command. |
|
| 9 | - * |
|
| 10 | - * @var string |
|
| 11 | - */ |
|
| 12 | - protected $signature = 'make:module:notification |
|
| 7 | + /** |
|
| 8 | + * The name and signature of the console command. |
|
| 9 | + * |
|
| 10 | + * @var string |
|
| 11 | + */ |
|
| 12 | + protected $signature = 'make:module:notification |
|
| 13 | 13 | {name : The name of the notification class.}'; |
| 14 | - /** |
|
| 15 | - * The console command description. |
|
| 16 | - * |
|
| 17 | - * @var string |
|
| 18 | - */ |
|
| 19 | - protected $description = 'Create a new module notification class'; |
|
| 20 | - /** |
|
| 21 | - * String to store the command type. |
|
| 22 | - * |
|
| 23 | - * @var string |
|
| 24 | - */ |
|
| 25 | - protected $type = 'Module notification'; |
|
| 26 | - /** |
|
| 27 | - * Get the stub file for the generator. |
|
| 28 | - * |
|
| 29 | - * @return string |
|
| 30 | - */ |
|
| 31 | - protected function getStub() |
|
| 32 | - { |
|
| 33 | - return __DIR__.'/stubs/notification.stub'; |
|
| 34 | - } |
|
| 35 | - /** |
|
| 36 | - * Get the destination class path. |
|
| 37 | - * |
|
| 38 | - * @param string $name |
|
| 39 | - * |
|
| 40 | - * @return string |
|
| 41 | - */ |
|
| 42 | - protected function getPath($name) |
|
| 43 | - { |
|
| 44 | - return module_path('notifications', 'Notifications/'.$name.'.php'); |
|
| 45 | - } |
|
| 46 | - /** |
|
| 47 | - * Parse the name and format according to the root namespace. |
|
| 48 | - * |
|
| 49 | - * @param string $name |
|
| 50 | - * |
|
| 51 | - * @return string |
|
| 52 | - */ |
|
| 53 | - protected function qualifyClass($name) |
|
| 54 | - { |
|
| 55 | - return $name; |
|
| 56 | - } |
|
| 57 | - /** |
|
| 58 | - * Replace namespace in notification stub. |
|
| 59 | - * |
|
| 60 | - * @param string $name |
|
| 61 | - * |
|
| 62 | - * @return string |
|
| 63 | - */ |
|
| 64 | - protected function getNamespace($name) |
|
| 65 | - { |
|
| 66 | - return module_class('notifications', 'Notifications'); |
|
| 67 | - } |
|
| 14 | + /** |
|
| 15 | + * The console command description. |
|
| 16 | + * |
|
| 17 | + * @var string |
|
| 18 | + */ |
|
| 19 | + protected $description = 'Create a new module notification class'; |
|
| 20 | + /** |
|
| 21 | + * String to store the command type. |
|
| 22 | + * |
|
| 23 | + * @var string |
|
| 24 | + */ |
|
| 25 | + protected $type = 'Module notification'; |
|
| 26 | + /** |
|
| 27 | + * Get the stub file for the generator. |
|
| 28 | + * |
|
| 29 | + * @return string |
|
| 30 | + */ |
|
| 31 | + protected function getStub() |
|
| 32 | + { |
|
| 33 | + return __DIR__.'/stubs/notification.stub'; |
|
| 34 | + } |
|
| 35 | + /** |
|
| 36 | + * Get the destination class path. |
|
| 37 | + * |
|
| 38 | + * @param string $name |
|
| 39 | + * |
|
| 40 | + * @return string |
|
| 41 | + */ |
|
| 42 | + protected function getPath($name) |
|
| 43 | + { |
|
| 44 | + return module_path('notifications', 'Notifications/'.$name.'.php'); |
|
| 45 | + } |
|
| 46 | + /** |
|
| 47 | + * Parse the name and format according to the root namespace. |
|
| 48 | + * |
|
| 49 | + * @param string $name |
|
| 50 | + * |
|
| 51 | + * @return string |
|
| 52 | + */ |
|
| 53 | + protected function qualifyClass($name) |
|
| 54 | + { |
|
| 55 | + return $name; |
|
| 56 | + } |
|
| 57 | + /** |
|
| 58 | + * Replace namespace in notification stub. |
|
| 59 | + * |
|
| 60 | + * @param string $name |
|
| 61 | + * |
|
| 62 | + * @return string |
|
| 63 | + */ |
|
| 64 | + protected function getNamespace($name) |
|
| 65 | + { |
|
| 66 | + return module_class('notifications', 'Notifications'); |
|
| 67 | + } |
|
| 68 | 68 | } |
@@ -6,53 +6,53 @@ |
||
| 6 | 6 | class NotificationObserver |
| 7 | 7 | { |
| 8 | 8 | |
| 9 | - public function saving($model) |
|
| 10 | - { |
|
| 11 | - // |
|
| 12 | - } |
|
| 13 | - |
|
| 14 | - public function saved($model) |
|
| 15 | - { |
|
| 16 | - // |
|
| 17 | - } |
|
| 18 | - |
|
| 19 | - public function creating($model) |
|
| 20 | - { |
|
| 21 | - // |
|
| 22 | - } |
|
| 23 | - |
|
| 24 | - public function created($model) |
|
| 25 | - { |
|
| 26 | - // |
|
| 27 | - } |
|
| 28 | - |
|
| 29 | - public function updating($model) |
|
| 30 | - { |
|
| 31 | - // |
|
| 32 | - } |
|
| 33 | - |
|
| 34 | - public function updated($model) |
|
| 35 | - { |
|
| 36 | - // |
|
| 37 | - } |
|
| 38 | - |
|
| 39 | - public function deleting($model) |
|
| 40 | - { |
|
| 41 | - // |
|
| 42 | - } |
|
| 43 | - |
|
| 44 | - public function deleted($model) |
|
| 45 | - { |
|
| 46 | - // |
|
| 47 | - } |
|
| 48 | - |
|
| 49 | - public function restoring($model) |
|
| 50 | - { |
|
| 51 | - // |
|
| 52 | - } |
|
| 53 | - |
|
| 54 | - public function restored($model) |
|
| 55 | - { |
|
| 56 | - // |
|
| 57 | - } |
|
| 9 | + public function saving($model) |
|
| 10 | + { |
|
| 11 | + // |
|
| 12 | + } |
|
| 13 | + |
|
| 14 | + public function saved($model) |
|
| 15 | + { |
|
| 16 | + // |
|
| 17 | + } |
|
| 18 | + |
|
| 19 | + public function creating($model) |
|
| 20 | + { |
|
| 21 | + // |
|
| 22 | + } |
|
| 23 | + |
|
| 24 | + public function created($model) |
|
| 25 | + { |
|
| 26 | + // |
|
| 27 | + } |
|
| 28 | + |
|
| 29 | + public function updating($model) |
|
| 30 | + { |
|
| 31 | + // |
|
| 32 | + } |
|
| 33 | + |
|
| 34 | + public function updated($model) |
|
| 35 | + { |
|
| 36 | + // |
|
| 37 | + } |
|
| 38 | + |
|
| 39 | + public function deleting($model) |
|
| 40 | + { |
|
| 41 | + // |
|
| 42 | + } |
|
| 43 | + |
|
| 44 | + public function deleted($model) |
|
| 45 | + { |
|
| 46 | + // |
|
| 47 | + } |
|
| 48 | + |
|
| 49 | + public function restoring($model) |
|
| 50 | + { |
|
| 51 | + // |
|
| 52 | + } |
|
| 53 | + |
|
| 54 | + public function restored($model) |
|
| 55 | + { |
|
| 56 | + // |
|
| 57 | + } |
|
| 58 | 58 | } |
@@ -1,10 +1,10 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | $factory->define(App\Modules\Reporting\Report::class, function (Faker\Generator $faker) { |
| 4 | - return [ |
|
| 5 | - 'report_name' => $faker->randomElement(['Users Count', 'Low Stock Products', 'Active Users']), |
|
| 6 | - 'view_name' => $faker->word(), |
|
| 7 | - 'created_at' => $faker->dateTimeBetween('-1 years', 'now'), |
|
| 8 | - 'updated_at' => $faker->dateTimeBetween('-1 years', 'now') |
|
| 9 | - ]; |
|
| 4 | + return [ |
|
| 5 | + 'report_name' => $faker->randomElement(['Users Count', 'Low Stock Products', 'Active Users']), |
|
| 6 | + 'view_name' => $faker->word(), |
|
| 7 | + 'created_at' => $faker->dateTimeBetween('-1 years', 'now'), |
|
| 8 | + 'updated_at' => $faker->dateTimeBetween('-1 years', 'now') |
|
| 9 | + ]; |
|
| 10 | 10 | }); |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -$factory->define(App\Modules\Reporting\Report::class, function (Faker\Generator $faker) { |
|
| 3 | +$factory->define(App\Modules\Reporting\Report::class, function(Faker\Generator $faker) { |
|
| 4 | 4 | return [ |
| 5 | 5 | 'report_name' => $faker->randomElement(['Users Count', 'Low Stock Products', 'Active Users']), |
| 6 | 6 | 'view_name' => $faker->word(), |
@@ -5,14 +5,14 @@ discard block |
||
| 5 | 5 | |
| 6 | 6 | class SampelReport extends Migration |
| 7 | 7 | { |
| 8 | - /** |
|
| 9 | - * Run the migrations. |
|
| 10 | - * |
|
| 11 | - * @return void |
|
| 12 | - */ |
|
| 13 | - public function up() |
|
| 14 | - { |
|
| 15 | - DB::statement("CREATE VIEW admin_count AS |
|
| 8 | + /** |
|
| 9 | + * Run the migrations. |
|
| 10 | + * |
|
| 11 | + * @return void |
|
| 12 | + */ |
|
| 13 | + public function up() |
|
| 14 | + { |
|
| 15 | + DB::statement("CREATE VIEW admin_count AS |
|
| 16 | 16 | select count(u.id) |
| 17 | 17 | from users u, groups g ,users_groups ug |
| 18 | 18 | where |
@@ -20,25 +20,25 @@ discard block |
||
| 20 | 20 | ug.group_id = g.id |
| 21 | 21 | "); |
| 22 | 22 | |
| 23 | - DB::table('reports')->insert( |
|
| 24 | - [ |
|
| 25 | - [ |
|
| 26 | - 'report_name' => 'admin_count', |
|
| 27 | - 'view_name' => 'admin_count', |
|
| 28 | - 'created_at' => \DB::raw('NOW()'), |
|
| 29 | - 'updated_at' => \DB::raw('NOW()') |
|
| 30 | - ] |
|
| 31 | - ] |
|
| 32 | - ); |
|
| 33 | - } |
|
| 23 | + DB::table('reports')->insert( |
|
| 24 | + [ |
|
| 25 | + [ |
|
| 26 | + 'report_name' => 'admin_count', |
|
| 27 | + 'view_name' => 'admin_count', |
|
| 28 | + 'created_at' => \DB::raw('NOW()'), |
|
| 29 | + 'updated_at' => \DB::raw('NOW()') |
|
| 30 | + ] |
|
| 31 | + ] |
|
| 32 | + ); |
|
| 33 | + } |
|
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * Reverse the migrations. |
|
| 37 | - * |
|
| 38 | - * @return void |
|
| 39 | - */ |
|
| 40 | - public function down() |
|
| 41 | - { |
|
| 42 | - DB::statement("DROP VIEW IF EXISTS admin_count"); |
|
| 43 | - } |
|
| 35 | + /** |
|
| 36 | + * Reverse the migrations. |
|
| 37 | + * |
|
| 38 | + * @return void |
|
| 39 | + */ |
|
| 40 | + public function down() |
|
| 41 | + { |
|
| 42 | + DB::statement("DROP VIEW IF EXISTS admin_count"); |
|
| 43 | + } |
|
| 44 | 44 | } |
@@ -5,29 +5,29 @@ |
||
| 5 | 5 | |
| 6 | 6 | class Reports extends Migration |
| 7 | 7 | { |
| 8 | - /** |
|
| 9 | - * Run the migrations. |
|
| 10 | - * |
|
| 11 | - * @return void |
|
| 12 | - */ |
|
| 13 | - public function up() |
|
| 14 | - { |
|
| 15 | - Schema::create('reports', function (Blueprint $table) { |
|
| 16 | - $table->increments('id'); |
|
| 17 | - $table->string('report_name', 100); |
|
| 18 | - $table->string('view_name', 100); |
|
| 19 | - $table->softDeletes(); |
|
| 20 | - $table->timestamps(); |
|
| 21 | - }); |
|
| 22 | - } |
|
| 8 | + /** |
|
| 9 | + * Run the migrations. |
|
| 10 | + * |
|
| 11 | + * @return void |
|
| 12 | + */ |
|
| 13 | + public function up() |
|
| 14 | + { |
|
| 15 | + Schema::create('reports', function (Blueprint $table) { |
|
| 16 | + $table->increments('id'); |
|
| 17 | + $table->string('report_name', 100); |
|
| 18 | + $table->string('view_name', 100); |
|
| 19 | + $table->softDeletes(); |
|
| 20 | + $table->timestamps(); |
|
| 21 | + }); |
|
| 22 | + } |
|
| 23 | 23 | |
| 24 | - /** |
|
| 25 | - * Reverse the migrations. |
|
| 26 | - * |
|
| 27 | - * @return void |
|
| 28 | - */ |
|
| 29 | - public function down() |
|
| 30 | - { |
|
| 31 | - Schema::dropIfExists('reports'); |
|
| 32 | - } |
|
| 24 | + /** |
|
| 25 | + * Reverse the migrations. |
|
| 26 | + * |
|
| 27 | + * @return void |
|
| 28 | + */ |
|
| 29 | + public function down() |
|
| 30 | + { |
|
| 31 | + Schema::dropIfExists('reports'); |
|
| 32 | + } |
|
| 33 | 33 | } |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('reports', function (Blueprint $table) { |
|
| 15 | + Schema::create('reports', function(Blueprint $table) { |
|
| 16 | 16 | $table->increments('id'); |
| 17 | 17 | $table->string('report_name', 100); |
| 18 | 18 | $table->string('view_name', 100); |
@@ -6,15 +6,15 @@ |
||
| 6 | 6 | |
| 7 | 7 | class ReportingDatabaseSeeder 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(ReportsTableSeeder::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(ReportsTableSeeder::class); |
|
| 18 | + $this->call(AssignRelationsSeeder::class); |
|
| 19 | + } |
|
| 20 | 20 | } |