RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] Do not treat disabled notification as error

Browse Source 
Fixes #1582 once merged.
This commit is contained in:
Sebastian Grewe 2014-01-25 13:10:38 +01:00
parent 7a8238b56e
commit 9e6a2a3bea
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cronjobs/payouts.php
View File

@ -82,7 +82,7 @@ if ($setting->getValue('disable_manual_payouts') != 1) {
$aMailData['amount'] = $dBalance - $config['txfee_manual']; $aMailData['amount'] = $dBalance - $config['txfee_manual'];
$aMailData['payout_id'] = $aData['id']; $aMailData['payout_id'] = $aData['id'];
if (!$notification->sendNotification($aData['account_id'], 'manual_payout', $aMailData)) if (!$notification->sendNotification($aData['account_id'], 'manual_payout', $aMailData))
$log->logError('Failed to send notification email to users address: ' . $aMailData['email']); $log->logError('Failed to send notification email to users address ' . $aMailData['email'] . ' : ' . $notification->getCronError);
// Recheck the users balance to make sure it is now 0 // Recheck the users balance to make sure it is now 0
$aBalance = $transaction->getBalance($aData['account_id']); $aBalance = $transaction->getBalance($aData['account_id']);
if ($aBalance['confirmed'] > 0) { if ($aBalance['confirmed'] > 0) {

2
public/include/classes/notification.class.php
View File

@ -148,7 +148,7 @@ class Notification extends Mail {
} }
} else { } else {
$this->setErrorMessage('User disabled ' . $strType . ' notifications'); $this->setErrorMessage('User disabled ' . $strType . ' notifications');
return false; return true;
} }
$this->setErrorMessage('Error sending mail notification'); $this->setErrorMessage('Error sending mail notification');
return false; return false;