Skip to content

Commit 528e1b7

Browse files
committed
Merge remote-tracking branch 'upstream/master' into update-changelog
2 parents a4b37da + 62b739d commit 528e1b7

File tree

4 files changed

+29
-7
lines changed

4 files changed

+29
-7
lines changed

packages/Webkul/Activity/src/Models/Activity.php

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,31 @@
99

1010
class Activity extends Model implements ActivityContract
1111
{
12+
/**
13+
* Define table name of property
14+
*
15+
* @var string
16+
*/
1217
protected $table = 'activities';
1318

14-
protected $with = ['file', 'user'];
19+
/**
20+
* Define relationships that should be touched on save
21+
*
22+
* @var array
23+
*/
24+
protected $with = [
25+
'file',
26+
'user',
27+
];
1528

16-
protected $dates= [
17-
'schedule_from',
18-
'schedule_to',
29+
/**
30+
* Cast attributes to date time
31+
*
32+
* @var array
33+
*/
34+
protected $casts = [
35+
'schedule_from' => 'datetime',
36+
'schedule_to' => 'datetime',
1937
];
2038

2139
/**

packages/Webkul/Installer/src/Console/Commands/Installer.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ class Installer extends Command
115115
];
116116

117117
/**
118-
* Install and configure bagisto.
118+
* Install and configure krayin.
119119
*/
120120
public function handle()
121121
{
@@ -137,6 +137,10 @@ public function handle()
137137
'currency' => $applicationDetails['currency'] ?? 'USD',
138138
]));
139139

140+
$this->warn('Step: Publishing assets and configurations...');
141+
$result = $this->call('vendor:publish', ['--all' => true, '--force' => true]);
142+
$this->info($result);
143+
140144
$this->warn('Step: Linking storage directory...');
141145
$this->call('storage:link');
142146

packages/Webkul/Installer/src/Listeners/Installer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function __construct(protected UserRepository $userRepository)
2424
}
2525

2626
/**
27-
* After Bagisto is successfully installed
27+
* After Krayin is successfully installed
2828
*
2929
* @return void
3030
*/

packages/Webkul/Installer/src/Providers/InstallerServiceProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function boot()
2424
{
2525
$this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'installer');
2626

27-
Event::listen('bagisto.installed', 'Webkul\Installer\Listeners\Installer@installed');
27+
Event::listen('krayin.installed', 'Webkul\Installer\Listeners\Installer@installed');
2828

2929

3030
/**

0 commit comments

Comments
 (0)