fix enrollment logic, add financial aid, fix class distribution
Tests / PHPUnit (push) Failing after 1m6s
Tests / PHPUnit (push) Failing after 1m6s
This commit is contained in:
+32
-13
@@ -70,21 +70,26 @@ class Services extends BaseService
|
||||
|
||||
$mail = new PHPMailer(true);
|
||||
|
||||
// Set up your PHPMailer configuration
|
||||
$host = (string) env('MAIL_DEFAULT_HOST', env('SMTP_HOST', 'smtp.gmail.com'));
|
||||
$user = (string) env('MAIL_DEFAULT_USER', env('SMTP_USER', ''));
|
||||
$pass = (string) env('MAIL_DEFAULT_PASS', env('SMTP_PASS', ''));
|
||||
$port = (int) env('MAIL_DEFAULT_PORT', env('SMTP_PORT', 465));
|
||||
$encryption = strtolower((string) env('MAIL_DEFAULT_ENCRYPTION', env('SMTP_ENCRYPTION', 'ssl')));
|
||||
|
||||
$mail->isSMTP();
|
||||
$mail->Host = 'smtp.gmail.com'; // Your SMTP host
|
||||
$mail->Host = $host;
|
||||
$mail->SMTPAuth = true;
|
||||
$mail->Username = 'alrahma.sunday.school@gmail.com'; // Your email
|
||||
$mail->Password = 'psnp emdq dykw ypul'; // Your email password
|
||||
$mail->SMTPSecure = PHPMailer::ENCRYPTION_SMTPS;
|
||||
$mail->Port = 465;
|
||||
$mail->Username = $user;
|
||||
$mail->Password = $pass;
|
||||
$mail->SMTPSecure = in_array($encryption, ['tls', 'starttls'], true)
|
||||
? PHPMailer::ENCRYPTION_STARTTLS
|
||||
: PHPMailer::ENCRYPTION_SMTPS;
|
||||
$mail->Port = $port > 0 ? $port : 465;
|
||||
|
||||
$mail->Timeout = 10; // ⏱ 10-second timeout max
|
||||
$mail->SMTPKeepAlive = false; // Prevent hanging connections
|
||||
$mail->SMTPDebug = 0; // Set to 2 temporarily for debugging
|
||||
|
||||
$mail->SMTPDebug = 2; // You can set it to 1, 2, or 3 for increasing verbosity
|
||||
$mail->Debugoutput = 'html'; // You can output it to 'html' or 'error_log'
|
||||
$mail->Timeout = 10;
|
||||
$mail->SMTPKeepAlive = false;
|
||||
$mail->SMTPDebug = 0;
|
||||
$mail->Debugoutput = 'error_log';
|
||||
|
||||
return $mail;
|
||||
}
|
||||
@@ -274,7 +279,6 @@ class Services extends BaseService
|
||||
model(\App\Models\SchoolYearModel::class),
|
||||
model(\App\Models\SchoolYearClosingBatchModel::class),
|
||||
model(\App\Models\SchoolYearClosingItemModel::class),
|
||||
model(\App\Models\ConfigurationModel::class),
|
||||
static::schoolYearManagement(),
|
||||
\Config\Database::connect()
|
||||
);
|
||||
@@ -301,4 +305,19 @@ class Services extends BaseService
|
||||
static::emailService()
|
||||
);
|
||||
}
|
||||
|
||||
public static function financialAid(bool $getShared = true): \App\Services\FinancialAidService
|
||||
{
|
||||
if ($getShared) {
|
||||
return static::getSharedInstance('financialAid');
|
||||
}
|
||||
|
||||
return new \App\Services\FinancialAidService(
|
||||
model(\App\Models\FinancialAidRequestModel::class),
|
||||
model(\App\Models\InvoiceModel::class),
|
||||
model(\App\Models\DiscountVoucherModel::class),
|
||||
model(\App\Models\DiscountUsageModel::class),
|
||||
new \App\Libraries\InvoiceLedgerService()
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user