diff --git a/app/Notifications/AgentCreated.php b/app/Notifications/AgentCreated.php index 7cdcd92..b4a67c4 100644 --- a/app/Notifications/AgentCreated.php +++ b/app/Notifications/AgentCreated.php @@ -39,6 +39,7 @@ public function via(object $notifiable): array public function toMail(object $notifiable): MailMessage { return (new MailMessage) + ->from(env('MAIL_FROM_ADDRESS'), config('app.name', 'Партнерский кабинет')) ->subject(__('Agent was created')) ->line(__('Your account was attached as agent')) ->line($this->agent->company->name) diff --git a/app/Notifications/ContractUpdated.php b/app/Notifications/ContractUpdated.php index 169df0b..541b67b 100644 --- a/app/Notifications/ContractUpdated.php +++ b/app/Notifications/ContractUpdated.php @@ -42,6 +42,7 @@ public function via(object $notifiable): array public function toMail(object $notifiable): MailMessage { return (new MailMessage) + ->from(env('MAIL_FROM_ADDRESS'), config('app.name', 'Партнерский кабинет')) ->line('The introduction to the notification.') ->action('Notification Action', url('/')) ->line('Thank you for using our application!'); diff --git a/app/Notifications/NotUniqueContact.php b/app/Notifications/NotUniqueContact.php index 0a9029d..85776a4 100644 --- a/app/Notifications/NotUniqueContact.php +++ b/app/Notifications/NotUniqueContact.php @@ -42,6 +42,7 @@ public function via(object $notifiable): array public function toMail(object $notifiable): MailMessage { return (new MailMessage) + ->from(env('MAIL_FROM_ADDRESS'), config('app.name', 'Партнерский кабинет')) ->line('The introduction to the notification.') ->action('Notification Action', url('/')) ->line('Thank you for using our application!'); diff --git a/app/Notifications/UniqueContact.php b/app/Notifications/UniqueContact.php index f3f30c7..9c2f5c3 100644 --- a/app/Notifications/UniqueContact.php +++ b/app/Notifications/UniqueContact.php @@ -42,6 +42,7 @@ public function via(object $notifiable): array public function toMail(object $notifiable): MailMessage { return (new MailMessage) + ->from(env('MAIL_FROM_ADDRESS'), config('app.name', 'Партнерский кабинет')) ->line('The introduction to the notification.') ->action('Notification Action', url('/')) ->line('Thank you for using our application!'); diff --git a/app/Notifications/UserRegistered.php b/app/Notifications/UserRegistered.php index fbdabf9..900f824 100644 --- a/app/Notifications/UserRegistered.php +++ b/app/Notifications/UserRegistered.php @@ -38,6 +38,7 @@ public function via(object $notifiable): array public function toMail(object $notifiable): MailMessage { return (new MailMessage) + ->from(env('MAIL_FROM_ADDRESS'), config('app.name', 'Партнерский кабинет')) ->subject(__('Account was created')) ->line(__('Your account was created')) ->line(__('Your login', ['login' => $this->login])) diff --git a/config/app.php b/config/app.php index 32dde96..0f6dc96 100644 --- a/config/app.php +++ b/config/app.php @@ -16,7 +16,7 @@ | */ - 'name' => env('APP_NAME', 'Laravel'), + 'name' => env('APP_NAME', 'Партнерский кабинет'), /* |-------------------------------------------------------------------------- diff --git a/public/pull.php b/public/pull.php index ea8cd76..95cc9f9 100644 --- a/public/pull.php +++ b/public/pull.php @@ -24,8 +24,8 @@ 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"); + //$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"); echo "
$result
"; } diff --git a/resources/views/livewire/clients-table.blade.php b/resources/views/livewire/clients-table.blade.php index fad54d9..af4847a 100644 --- a/resources/views/livewire/clients-table.blade.php +++ b/resources/views/livewire/clients-table.blade.php @@ -14,7 +14,7 @@ foreach ($clientDeals as $deal) { //echo 'dId:' . $deal->id; $filterRow[] = 'filter[deal_id][]=' . $deal->id; - $complexesNames[] = $deal->complex->name; + $complexesNames[] = $deal->complex()->withTrashed()->name; } $filterRow = implode('&', $filterRow); $complexesNames = array_unique($complexesNames);