Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Send email to confim cancel/purge

Browse Source
This commit is contained in:
Hillel Coren 2017-09-03 18:36:40 +03:00
parent 229761bf37
commit eecbb6e558
5 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/AccountController.php
View File

@ -1365,7 +1365,12 @@ class AccountController extends BaseController
$user = Auth::user(); $user = Auth::user();
$account = Auth::user()->account; $account = Auth::user()->account;
\Log::info("Canceled Account: {$account->name} - {$user->email}"); \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; $refunded = false;
if (! $account->hasMultipleAccounts()) { if (! $account->hasMultipleAccounts()) {

7
app/Jobs/PurgeAccountData.php
View File

@ -8,6 +8,7 @@ use App\Models\LookupAccount;
use Auth; use Auth;
use DB; use DB;
use Exception; use Exception;
use App\Ninja\Mailers\UserMailer;
class PurgeAccountData extends Job class PurgeAccountData extends Job
{ {
@ -16,7 +17,7 @@ class PurgeAccountData extends Job
* *
* @return void * @return void
*/ */
public function handle() public function handle(UserMailer $userMailer)
{ {
$user = Auth::user(); $user = Auth::user();
$account = $user->account; $account = $user->account;
@ -73,5 +74,9 @@ class PurgeAccountData extends Job
config(['database.default' => $current]); config(['database.default' => $current]);
} }
$subject = trans('texts.purge_successful');
$message = trans('texts.purge_details', ['account' => $user->account->getDisplayName()]);
$userMailer->sendMessage($user, $subject, $message);
} }
} }

4
app/Ninja/Mailers/UserMailer.php
View File

@ -131,8 +131,8 @@ class UserMailer extends Mailer
$data = $data ?: []; $data = $data ?: [];
$data += [ $data += [
'userName' => $user->getDisplayName(), 'userName' => $user->getDisplayName(),
'primaryMessage' => $subject, 'primaryMessage' => $message,
'secondaryMessage' => $message, //'secondaryMessage' => $message,
'invoiceLink' => $invoice ? $invoice->present()->multiAccountLink : false, 'invoiceLink' => $invoice ? $invoice->present()->multiAccountLink : false,
]; ];

12
resources/lang/en/texts.php
View File

@ -2193,9 +2193,9 @@ $LANG = array(
'error_incorrect_gateway_ids' => 'Error: The gateways table has incorrect ids.', 'error_incorrect_gateway_ids' => 'Error: The gateways table has incorrect ids.',
'purge_data' => 'Purge Data', 'purge_data' => 'Purge Data',
'delete_data' => 'Delete 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.', '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', 'forbidden' => 'Forbidden',
'purge_data_message' => 'Warning: This will permanently erase your data, there is no undo.', 'purge_data_message' => 'Warning: This will permanently erase your data, there is no undo.',
'contact_phone' => 'Contact Phone', 'contact_phone' => 'Contact Phone',
@ -2431,6 +2431,14 @@ $LANG = array(
'created_customer' => 'Successfully created customer', 'created_customer' => 'Successfully created customer',
'created_customers' => 'Successfully created :count customers', '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; return $LANG;

6
resources/views/accounts/management.blade.php
View File

@ -266,7 +266,7 @@
</div> </div>
<div class="modal-footer" style="margin-top: 2px"> <div class="modal-footer" style="margin-top: 2px">
<button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('texts.go_back') }}</button> <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('texts.go_back') }}</button>
<button type="button" class="btn btn-danger" onclick="confirmPurge()">{{ trans('texts.purge_data') }}</button> <button type="button" class="btn btn-danger" id="purgeButton" onclick="confirmPurge()">{{ trans('texts.purge_data') }}</button>
</div> </div>
</div> </div>
</div> </div>
@ -301,7 +301,7 @@
</div> </div>
<div class="modal-footer" style="margin-top: 2px"> <div class="modal-footer" style="margin-top: 2px">
<button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('texts.go_back') }}</button> <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('texts.go_back') }}</button>
<button type="button" class="btn btn-danger" onclick="confirmCancel()">{{ $account->hasMultipleAccounts() ? trans('texts.delete_company') : trans('texts.cancel_account') }}</button> <button type="button" class="btn btn-danger" id="deleteButton" onclick="confirmCancel()">{{ $account->hasMultipleAccounts() ? trans('texts.delete_company') : trans('texts.cancel_account') }}</button>
</div> </div>
</div> </div>
</div> </div>
@ -338,10 +338,12 @@
} }
function confirmCancel() { function confirmCancel() {
$('#deleteButton').prop('disabled', true);
$('form.cancel-account').submit(); $('form.cancel-account').submit();
} }
function confirmPurge() { function confirmPurge() {
$('#purgeButton').prop('disabled', true);
$('form.purge-data').submit(); $('form.purge-data').submit();
} }