Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 1961

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

Novinky:
- closes #560: volitelne omezeni prijeti clena bez prihlasky
- closes #552: volitelne zapnuti doplatku pri schvalovani clena

Zobrazit rozdíly:

freenetis/branches/1.1/application/i18n/cs_CZ/texts.php
'added' => 'Přidáno',
'added by' => 'Přidal',
'additional demolition of membership fees' => 'Dodatečné stržení členských příspěvků',
'additional payment form services provided before membership' => 'Doplatek za využívání služeb v době kdy nebyl uživatel členem',
'additional payment for member fees before membership' => 'Doplatek členských přispěvků v době kdy nebyl uživatel členem',
'another contact information' => 'Další kontaktní informace',
'additional information' => 'Doplňkové informace',
'address' => 'Adresa',
......
'e-mails' => 'E-maily',
'encoding' => 'Kódování',
'enable action logs' => 'Zapnout logy akcí',
'enable additional member fee during the approval of membership' => 'Povolit dodatečné členské přispěvky během přijetí členství',
'enable allowed subnets' => 'Zapnout povolené podsítě',
'enable approval of membership without submited registration' => 'Povolit přijetí členství bez odevzdané přihlášky',
'enable automatic fio import' => 'Povolit automatický import Fio',
'enable integrity test (all numbers in invoice has to be in extended statement)' => 'Povolit test na celistvost (každé číslo ve faktuře musí být v podrobném výpisu)',
'enable mysql event scheduler' => 'Povolit MySQL plánovač akcí',
freenetis/branches/1.1/application/helpers/condition.php
return ($item->state == Connection_request_Model::STATE_UNDECIDED);
}
/**
* Check whether the approval of applicant can be made without submited
* registration or applicant has submited the registration.
*
* @param object $item Member object
* @return boolen
*/
public static function is_applicant_registration($item)
{
return Settings::get('self_registration_enable_approval_without_registration') ||
$item->registration;
}
/**
* Is item in the new state?
*
* @param object $item
* @return boolena
*/
public static function is_item_new($item)
{
return ($item->state == Vote_Model::STATE_NEW);
freenetis/branches/1.1/application/controllers/members.php
if ($this->acl_check_edit(get_class($this), 'members'))
{
$actions->add_action('id')
$actions->add_conditional_action('id')
->condition('is_applicant_registration')
->icon_action('member')
->url('members/approve_applicant')
->label('Approve application for membership')
......
$association = new Member_Model(Member_Model::ASSOCIATION);
$member = new Member_Model($member_id);
if (!condition::is_applicant_registration($member))
{
self::error(RECORD);
}
if (Settings::get('finance_enabled'))
{
$member_fee = new Members_fee_Model();
......
->selected($member->registration);
}
if (Settings::get('finance_enabled') && $this->acl_check_edit('Variable_Symbols_Controller', 'variable_symbols'))
if (Settings::get('finance_enabled') &&
$this->acl_check_edit('Variable_Symbols_Controller', 'variable_symbols'))
{
$form->input('variable_symbol')
->rules('length[1,10]')
......
->value($member->comment);
}
if (Settings::get('finance_enabled'))
if (Settings::get('finance_enabled') &&
Settings::get('self_registration_enable_additional_payment'))
{
$form->group(__('Additional demolition of membership fees') . ' ' . help::hint('applicant_additional_payment'));
......
null, $this->session->get('user_id'),
null, $member->entrance_date,
date('Y-m-d H:i:s'),
__('Additional payment form services provided before membership'),
__('Additional payment for member fees before membership'),
$form_data['connection_payment_amount']
);
}
......
. ' ('. __('I') .')' : $type . ' '.$member->name;
if ($is_applicant &&
condition::is_applicant_registration($member) &&
$this->acl_check_edit(get_class($this), 'members', $member->id))
{
$title .= ' <small style="font-size: 60%; font-weight: normal">(' . html::anchor(
freenetis/branches/1.1/application/controllers/settings.php
->value(Settings::get('membership_interrupt_maximum'));
}
if (Settings::get('self_registration'))
{
$this->form->group('Applicant for membership');
$this->form->checkbox('self_registration_enable_approval_without_registration')
->label('Enable approval of membership without submited registration')
->checked(Settings::get('self_registration_enable_additional_payment'));
if (Settings::get('finance_enabled'))
{
$this->form->checkbox('self_registration_enable_additional_payment')
->label('Enable additional member fee during the approval of membership')
->checked(Settings::get('self_registration_enable_additional_payment'));
}
}
$this->form->group('Export of registration');
if (Settings::get('finance_enabled'))
freenetis/branches/1.1/application/libraries/Settings.php
// self applicant registration is enabled by default
'self_registration' => 1,
'self_registration_enable_approval_without_registration' => 1,
'self_registration_enable_additional_payment' => 1,
// default title of system
'title' => 'FreenetIS',

Také k dispozici: Unified diff