Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 1817

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

Opravy:
- fixes #372: Nelze specifikovat cislo uctu sdruzeni na exportu prihlasky

Zobrazit rozdíly:

freenetis/branches/1.1/application/controllers/members.php
// --------------- INFO ABOUT ASSOCIATION -----------------
$page .= '<div style="float:right">';
$a_member = new Member_Model(1);
$a_member = new Member_Model(Member_Model::ASSOCIATION);
$bank_account_model = new Bank_account_Model();
$a_bank_account = $bank_account_model->get_assoc_bank_accounts()->current();
$ba_model = new Bank_account_Model();
$a_bank_account_number = NULL;
if (Settings::get('export_header_bank_account'))
{
$ba_model->find(Settings::get('export_header_bank_account'));
}
// not set in settings
if (!$ba_model->id)
{
$bank_accounts = $ba_model->get_assoc_bank_accounts();
if ($bank_accounts->count())
{
$a_bank_account_number = $bank_accounts->current()->account_number;
}
}
else
{
$a_bank_account_number = $ba_model->account_nr . '/' . $ba_model->bank_nr;
}
$page .= $a_member->name ."</br>";
$page .= __('organization identifier').
': '.$a_member->organization_identifier. "</br>";
$page .= __('account number').': '
.$a_bank_account->account_number. "</br>";
$page .= __('account number').': ' . $a_bank_account_number. "</br>";
$page .= $a_member->address_point->street->street.' '.
$a_member->address_point->street_number. "</br>";
$page .= $a_member->address_point->town->zip_code .' '.
......
$pdf->SetTextColor(185, 185, 185);
$a_member = new Member_Model(1);
$a_member = new Member_Model(Member_Model::ASSOCIATION);
$bank_account_model = new Bank_account_Model();
$a_bank_account = $bank_account_model->get_assoc_bank_accounts()->current();
$ba_model = new Bank_account_Model();
$a_bank_account_number = NULL;
if (Settings::get('export_header_bank_account'))
{
$ba_model->find(Settings::get('export_header_bank_account'));
}
// not set in settings
if (!$ba_model->id)
{
$bank_accounts = $ba_model->get_assoc_bank_accounts();
if ($bank_accounts->count())
{
$a_bank_account_number = $bank_accounts->current()->account_number;
}
}
else
{
$a_bank_account_number = $ba_model->account_nr . '/' . $ba_model->bank_nr;
}
$pdf->SetXY(98, 9.7);
$pdf->Write(10, $a_member->name);
......
$pdf->SetXY(98, 17.7);
$pdf->Write(
10, __('account number').': '
.$a_bank_account->account_number
10, __('account number').': '.$a_bank_account_number
);
$pdf->SetXY(98, 21.7);
freenetis/branches/1.1/application/controllers/settings.php
$this->form->group('Export of registration');
$bank_account = new Bank_account_Model();
$concat = "CONCAT(account_nr, '/', bank_nr, IF(name IS NULL, '', CONCAT(' - ', name)))";
$this->form->dropdown('export_header_bank_account')
->label('Bank account')
->options($bank_account->where('member_id', Member_Model::ASSOCIATION)->select_list('id', $concat))
->selected(Settings::get('export_header_bank_account'))
->rules('required');
// directory is writable
if (is_writable('upload'))
{
freenetis/branches/1.1/application/libraries/Settings.php
'security_password_level' => 3,
// default minimal password length
'security_password_length' => 8,
// ID of bank account that is shown on registration (if null random is used)
'export_header_bank_account' => NULL,
);
/**

Také k dispozici: Unified diff