Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 1942

Přidáno uživatelem Ondřej Fibich před více než 11 roky(ů)

Opravy:
- imunity pri reaktivaci zprav
- aktivace reaktivace zprav u editace clena/aplikanta a odhlasovani pracovniho vykazu

Zobrazit rozdíly:

freenetis/branches/1.1/application/models/member.php
continue; // no other messages for applicants
}
// variables
$idi = Settings::get('initial_debtor_immunity');
$ii = Settings::get('initial_immunity');
$ed_diff = (time() - strtotime($member->entrance_date)) / 86400;
// member is debtor
if (!$has_membership_interrupt &&
$balance < Settings::get('debtor_boundary'))
$balance < Settings::get('debtor_boundary') &&
($ed_diff >= $idi))
{
$messages_ip_addresses_model
->add_redirection_to_ip_address(
......
// member is almost debtor
if (!$has_membership_interrupt &&
$balance >= Settings::get('debtor_boundary') &&
$balance < Settings::get('payment_notice_boundary'))
$balance < Settings::get('payment_notice_boundary') && (
$balance >= Settings::get('debtor_boundary') &&
($ed_diff >= $idi)
) || (($ed_diff < $idi) && ($ed_diff >= $ii)))
{
$messages_ip_addresses_model
->add_redirection_to_ip_address(
freenetis/branches/1.1/application/controllers/members.php
);
}
// reload messages of worker
ORM::factory('member')->reactivate_messages($member_id);
// inform new member
Message_Model::activate_special_notice(
Message_Model::APPLICANT_APPROVE_MEMBERSHIP,
......
) + ORM::factory('town')->select_list_with_quater();
// engineers
$member = new Member_Model($member_id);
$concat = "CONCAT(
COALESCE(surname, ''), ' ',
COALESCE(name, ''), ' - ',
......
if ($member_saved)
{
ORM::factory('member')->reactivate_messages($member->id);
status::success('Member has been successfully updated.');
}
else
......
// remove membership transfer from member (if exist)
$membership_transfer_model->delete_transfer_from_member($member->id);
// reload messages of worker
ORM::factory('member')->reactivate_messages($member->id);
$member->transaction_commit();
status::success('Membership of the member has been successfully restored.');
}
freenetis/branches/1.1/application/controllers/membership_interrupts.php
// success
if ($membership_interrupt->delete() && $members_fee->delete())
{
ORM::factory ('member')
->reactivate_messages($member_id);
ORM::factory('member')->reactivate_messages($member_id);
status::success('Membership interruption has been succesfully deleted');
}
freenetis/branches/1.1/application/controllers/work_reports.php
$approved_work->transfer_id = $transfer_id;
$approved_work->save_throwable();
}
// reload messages of worker
ORM::factory('member')->reactivate_messages($member_id);
}
$subject = mail_message::format('work_report_approve_subject');

Také k dispozici: Unified diff