Обновлены тексты уведомлений на почту
This commit is contained in:
parent
23abf365de
commit
535b7aa194
@ -39,6 +39,7 @@ public function via(object $notifiable): array
|
|||||||
public function toMail(object $notifiable): MailMessage
|
public function toMail(object $notifiable): MailMessage
|
||||||
{
|
{
|
||||||
return (new MailMessage)
|
return (new MailMessage)
|
||||||
|
->from(env('MAIL_FROM_ADDRESS'), config('app.name', 'Партнерский кабинет'))
|
||||||
->subject(__('Agent was created'))
|
->subject(__('Agent was created'))
|
||||||
->line(__('Your account was attached as agent'))
|
->line(__('Your account was attached as agent'))
|
||||||
->line($this->agent->company->name)
|
->line($this->agent->company->name)
|
||||||
|
|||||||
@ -42,6 +42,7 @@ public function via(object $notifiable): array
|
|||||||
public function toMail(object $notifiable): MailMessage
|
public function toMail(object $notifiable): MailMessage
|
||||||
{
|
{
|
||||||
return (new MailMessage)
|
return (new MailMessage)
|
||||||
|
->from(env('MAIL_FROM_ADDRESS'), config('app.name', 'Партнерский кабинет'))
|
||||||
->line('The introduction to the notification.')
|
->line('The introduction to the notification.')
|
||||||
->action('Notification Action', url('/'))
|
->action('Notification Action', url('/'))
|
||||||
->line('Thank you for using our application!');
|
->line('Thank you for using our application!');
|
||||||
|
|||||||
@ -42,6 +42,7 @@ public function via(object $notifiable): array
|
|||||||
public function toMail(object $notifiable): MailMessage
|
public function toMail(object $notifiable): MailMessage
|
||||||
{
|
{
|
||||||
return (new MailMessage)
|
return (new MailMessage)
|
||||||
|
->from(env('MAIL_FROM_ADDRESS'), config('app.name', 'Партнерский кабинет'))
|
||||||
->line('The introduction to the notification.')
|
->line('The introduction to the notification.')
|
||||||
->action('Notification Action', url('/'))
|
->action('Notification Action', url('/'))
|
||||||
->line('Thank you for using our application!');
|
->line('Thank you for using our application!');
|
||||||
|
|||||||
@ -42,6 +42,7 @@ public function via(object $notifiable): array
|
|||||||
public function toMail(object $notifiable): MailMessage
|
public function toMail(object $notifiable): MailMessage
|
||||||
{
|
{
|
||||||
return (new MailMessage)
|
return (new MailMessage)
|
||||||
|
->from(env('MAIL_FROM_ADDRESS'), config('app.name', 'Партнерский кабинет'))
|
||||||
->line('The introduction to the notification.')
|
->line('The introduction to the notification.')
|
||||||
->action('Notification Action', url('/'))
|
->action('Notification Action', url('/'))
|
||||||
->line('Thank you for using our application!');
|
->line('Thank you for using our application!');
|
||||||
|
|||||||
@ -38,6 +38,7 @@ public function via(object $notifiable): array
|
|||||||
public function toMail(object $notifiable): MailMessage
|
public function toMail(object $notifiable): MailMessage
|
||||||
{
|
{
|
||||||
return (new MailMessage)
|
return (new MailMessage)
|
||||||
|
->from(env('MAIL_FROM_ADDRESS'), config('app.name', 'Партнерский кабинет'))
|
||||||
->subject(__('Account was created'))
|
->subject(__('Account was created'))
|
||||||
->line(__('Your account was created'))
|
->line(__('Your account was created'))
|
||||||
->line(__('Your login', ['login' => $this->login]))
|
->line(__('Your login', ['login' => $this->login]))
|
||||||
|
|||||||
@ -16,7 +16,7 @@
|
|||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'name' => env('APP_NAME', 'Laravel'),
|
'name' => env('APP_NAME', 'Партнерский кабинет'),
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|||||||
@ -24,8 +24,8 @@
|
|||||||
|
|
||||||
if($json['total_commits'] > 0)
|
if($json['total_commits'] > 0)
|
||||||
{
|
{
|
||||||
$result = shell_exec("cd /var/www/lk && git reset --hard HEAD && git pull && npm run build");
|
//$result = shell_exec("cd /var/www/lk && git reset --hard HEAD && git pull && npm run build");
|
||||||
//$result = shell_exec("cd /var/www/lk && git reset --hard HEAD && git pull");
|
$result = shell_exec("cd /var/www/lk && git reset --hard HEAD && git pull");
|
||||||
echo "<p>$result</p>";
|
echo "<p>$result</p>";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -14,7 +14,7 @@
|
|||||||
foreach ($clientDeals as $deal) {
|
foreach ($clientDeals as $deal) {
|
||||||
//echo 'dId:' . $deal->id;
|
//echo 'dId:' . $deal->id;
|
||||||
$filterRow[] = 'filter[deal_id][]=' . $deal->id;
|
$filterRow[] = 'filter[deal_id][]=' . $deal->id;
|
||||||
$complexesNames[] = $deal->complex->name;
|
$complexesNames[] = $deal->complex()->withTrashed()->name;
|
||||||
}
|
}
|
||||||
$filterRow = implode('&', $filterRow);
|
$filterRow = implode('&', $filterRow);
|
||||||
$complexesNames = array_unique($complexesNames);
|
$complexesNames = array_unique($complexesNames);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user