Skip to content
Code-Schnipsel Gruppen Projekte
Bestätigt Commit 332b9360 erstellt von Henning Leutz's avatar Henning Leutz :martial_arts_uniform:
Dateien durchsuchen

refactor: code style + psr12

Übergeordneter e031d2fd
No related branches found
No related tags found
2 Merge Requests!3Next,!2feat: new versioning
Pipeline #5544 bestanden mit Phase
in 11 Sekunden
......@@ -23,18 +23,12 @@ function ($membershipId, $searchParams) {
$Membership = $Memberships->getChild((int)$membershipId);
$membershipUsers = [];
// $Membership->addUser(QUI::getUserBySession());
foreach ($Membership->searchUsers($searchParams) as $membershipUserId) {
/** @var MembershipUser $MembershipUser */
$MembershipUser = $MembershipUsers->getChild($membershipUserId);
$membershipUsers[] = $MembershipUser->getBackendViewData();
}
/** @var \QUI\Memberships\Users\MembershipUser $TEST */
// $TEST = $MembershipUsers->getChild(26);
// $TEST->startManualCancel();
$Grid = new Grid($searchParams);
return $Grid->parseResult(
......
......@@ -21,22 +21,22 @@ public static function checkMembershipUsers()
'select' => [
'id'
],
'from' => $MembershipUsers->getDataBaseTableName(),
'where' => [
'from' => $MembershipUsers->getDataBaseTableName(),
'where' => [
'archived' => 0
]
]);
$now = time();
$now = time();
$cancelConfirmReminderAfterDays = (int)MembershipUsersHandler::getSetting('cancelReminderDays');
$Now = date_create();
$isLinkedToContracts = Handler::isLinkedToContracts();
$Now = date_create();
$isLinkedToContracts = Handler::isLinkedToContracts();
foreach ($result as $row) {
try {
/** @var MembershipUser $MembershipUser */
$MembershipUser = $MembershipUsers->getChild($row['id']);
$Membership = $MembershipUser->getMembership();
$Membership = $MembershipUser->getMembership();
try {
$MembershipUser->getUser();
......@@ -51,16 +51,22 @@ public static function checkMembershipUsers()
// Check if cancellation of membership has been started but NOT yet confirmed.
// Send reminder e-mail after X days of unconfirmed cancellation.
if (!empty($cancelConfirmReminderAfterDays)
&& (int)$MembershipUser->getAttribute('cancelStatus') === MembershipUsersHandler::CANCEL_STATUS_CANCEL_CONFIRM_PENDING) {
if (
!empty($cancelConfirmReminderAfterDays)
&& (int)$MembershipUser->getAttribute(
'cancelStatus'
) === MembershipUsersHandler::CANCEL_STATUS_CANCEL_CONFIRM_PENDING
) {
$CancelDate = \date_create($MembershipUser->getAttribute('cancelDate'));
if ($CancelDate) {
$RemindDate = $CancelDate->add(new \DateInterval('P'.$cancelConfirmReminderAfterDays.'D'));
$User = $MembershipUser->getUser();
$RemindDate = $CancelDate->add(new \DateInterval('P' . $cancelConfirmReminderAfterDays . 'D'));
$User = $MembershipUser->getUser();
if (!$User->getAttribute(MembershipUsersHandler::USER_ATTR_CANCEL_REMINDER_SENT)
&& $Now > $RemindDate) {
if (
!$User->getAttribute(MembershipUsersHandler::USER_ATTR_CANCEL_REMINDER_SENT)
&& $Now > $RemindDate
) {
$sent = $MembershipUser->sendConfirmCancelReminderMail();
if ($sent) {
......@@ -107,7 +113,7 @@ public static function checkMembershipUsers()
$MembershipUser->expire();
} catch (\Exception $Exception) {
QUI\System\Log::addError(
self::class.' :: checkMembershipUsers() -> '.$Exception->getMessage()
self::class . ' :: checkMembershipUsers() -> ' . $Exception->getMessage()
);
QUI\System\Log::writeException($Exception);
......
......@@ -196,15 +196,11 @@ public function search($searchParams, $countOnly = false)
}
// ORDER
if (!empty($searchParams['sortOn'])
) {
if (!empty($searchParams['sortOn'])) {
$sortOn = Orthos::clear($searchParams['sortOn']);
$order = "ORDER BY " . $sortOn;
if (
isset($searchParams['sortBy']) &&
!empty($searchParams['sortBy'])
) {
if (!empty($searchParams['sortBy'])) {
$order .= " " . Orthos::clear($searchParams['sortBy']);
} else {
$order .= " ASC";
......@@ -214,10 +210,7 @@ public function search($searchParams, $countOnly = false)
}
// LIMIT
if (
!empty($gridParams['limit'])
&& !$countOnly
) {
if (!empty($gridParams['limit']) && !$countOnly) {
$sql .= " LIMIT " . $gridParams['limit'];
} else {
if (!$countOnly) {
......
......@@ -113,7 +113,7 @@ public function getContent($Locale = null)
*
* @return bool
*/
public function isAutoExtend()
public function isAutoExtend(): bool
{
return $this->getAttribute('autoExtend') ? true : false;
}
......@@ -129,8 +129,7 @@ public function update()
$attributes = $this->getAttributes();
// check groups
if (empty($attributes['groupIds'])
) {
if (empty($attributes['groupIds'])) {
throw new QUI\Memberships\Exception([
'quiqqer/memberships',
'exception.handler.no.groups'
......
0% oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren