diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 8f2a0500e3a3..23e7b5710b54 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -1365,7 +1365,12 @@ class AccountController extends BaseController $user = Auth::user(); $account = Auth::user()->account; + \Log::info("Canceled Account: {$account->name} - {$user->email}"); + $type = $account->hasMultipleAccounts() ? 'company' : 'account'; + $subject = trans("texts.deleted_{$type}"); + $message = trans("texts.deleted_{$type}_details", ['account' => $account->getDisplayName()]); + $this->userMailer->sendMessage($user, $subject, $message); $refunded = false; if (! $account->hasMultipleAccounts()) { diff --git a/app/Jobs/PurgeAccountData.php b/app/Jobs/PurgeAccountData.php index 2430292c76f1..1151d70c7f97 100644 --- a/app/Jobs/PurgeAccountData.php +++ b/app/Jobs/PurgeAccountData.php @@ -8,6 +8,7 @@ use App\Models\LookupAccount; use Auth; use DB; use Exception; +use App\Ninja\Mailers\UserMailer; class PurgeAccountData extends Job { @@ -16,7 +17,7 @@ class PurgeAccountData extends Job * * @return void */ - public function handle() + public function handle(UserMailer $userMailer) { $user = Auth::user(); $account = $user->account; @@ -73,5 +74,9 @@ class PurgeAccountData extends Job config(['database.default' => $current]); } + + $subject = trans('texts.purge_successful'); + $message = trans('texts.purge_details', ['account' => $user->account->getDisplayName()]); + $userMailer->sendMessage($user, $subject, $message); } } diff --git a/app/Ninja/Mailers/UserMailer.php b/app/Ninja/Mailers/UserMailer.php index aacfb530fadb..bc464525e438 100644 --- a/app/Ninja/Mailers/UserMailer.php +++ b/app/Ninja/Mailers/UserMailer.php @@ -131,8 +131,8 @@ class UserMailer extends Mailer $data = $data ?: []; $data += [ 'userName' => $user->getDisplayName(), - 'primaryMessage' => $subject, - 'secondaryMessage' => $message, + 'primaryMessage' => $message, + //'secondaryMessage' => $message, 'invoiceLink' => $invoice ? $invoice->present()->multiAccountLink : false, ]; diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 85ad0b7c8ffc..958d1cf6dc88 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -2193,9 +2193,9 @@ $LANG = array( 'error_incorrect_gateway_ids' => 'Error: The gateways table has incorrect ids.', 'purge_data' => 'Purge Data', 'delete_data' => 'Delete Data', - 'purge_data_help' => 'Permanently delete all data in the account, keeping the account and settings.', + 'purge_data_help' => 'Permanently delete all data but keep the account and settings.', 'cancel_account_help' => 'Permanently delete the account along with all data and setting.', - 'purge_successful' => 'Successfully purged account data', + 'purge_successful' => 'Successfully purged company data', 'forbidden' => 'Forbidden', 'purge_data_message' => 'Warning: This will permanently erase your data, there is no undo.', 'contact_phone' => 'Contact Phone', @@ -2431,6 +2431,14 @@ $LANG = array( 'created_customer' => 'Successfully created customer', 'created_customers' => 'Successfully created :count customers', + 'purge_details' => 'The data in your company (:account) has been successfully purged.', + 'deleted_company' => 'Successfully canceled account', + 'deleted_account' => 'Successfully deleted company', + 'deleted_company_details' => 'Your company (:account) has been successfully deleted.', + 'deleted_account_details' => 'Your account (:account) has been successfully deleted.', + + + ); return $LANG; diff --git a/resources/views/accounts/management.blade.php b/resources/views/accounts/management.blade.php index 8dd73a2be6f7..edc4ad613963 100644 --- a/resources/views/accounts/management.blade.php +++ b/resources/views/accounts/management.blade.php @@ -266,7 +266,7 @@ @@ -301,7 +301,7 @@ @@ -338,10 +338,12 @@ } function confirmCancel() { + $('#deleteButton').prop('disabled', true); $('form.cancel-account').submit(); } function confirmPurge() { + $('#purgeButton').prop('disabled', true); $('form.purge-data').submit(); }