Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 367

Přidáno uživatelem Jiří Sviták před asi 15 roky(ů)

Pridany upravy prace se clenem. Pridany vstupni a transakcni poplatek do ostre db. System nyni nacita poplatky z db pri pridavani clena a pri prirazovani neidentifikovanych plateb.

Zobrazit rozdíly:

freenetis/trunk/kohana/application/i18n/cs_CZ/texts.php
'error - cant delete work' => 'Chyba - nelze smazat práci.',
'error - can\'t delete translation' => 'Chyba - nelze smazat překlad.',
'error - cant do the transfer' => 'Chyba - nelze provést transakci.',
'error - cant edit fee' => 'Chyba - nelze upravit poplatek.',
'error - cant change password' => 'Chyba - nelze změnit heslo',
'error - cant update account' => 'Chyba - nelze upravit účet.',
'error - cant update additional contacts' => 'Chyba - nelze upravit další kontakty.',
......
'member has been successfully updated' => 'Člen byl úspěšně upraven.',
'member name' => 'Jméno člena (organizace)',
'members account' => 'Účet člena',
'members first name and surname' => 'Jméno a příjmení člena (název organizace)',
'members name' => 'Jméno člena (organizace)',
'members' => 'Členové',
'membership can be ended only to former member' => 'Členství může být ukončeno jen bývalému členovi.',
......
'my works' => 'Moje práce',
'name' => 'Jméno',
'name of the association' => 'Název sdružení',
'name of organization' => 'Název organizace',
'netmask' => 'Maska',
'network address' => 'Síťová adresa',
'network address does not match the mask' => 'Síťová adresa neodpovídá zadané masce.',
......
'outbound' => 'Odchozí',
'owner of account' => 'Vlastník účtu',
'page title' => 'Titulek stránky',
'password successfully changed' => 'Heslo úspěšně změněno',
'password has been successfully changed' => 'Heslo bylo úspěšně změněno.',
'password' => 'Heslo',
'pay from account' => 'Platit z účtu',
'payment' => 'Platba',
freenetis/trunk/kohana/application/controllers/members.php
if($this->acl_check_view('Users_Controller','users',$member_id))
$user_grid->action_field('id') ->label(url_lang::lang('texts.User'))->url(url_lang::base().'users/show')->action(url_lang::lang('texts.Show'));
if($this->acl_check_edit('Users_Controller','users',$member_id))
$user_grid->action_field('id') ->label(url_lang::lang('texts.User'))->url(url_lang::base().'users/edit')->action(url_lang::lang('texts.Edit'));
$user_grid->action_field('id') ->label(url_lang::lang('texts.User'))->url(url_lang::base().'users/edit')->action(url_lang::lang('texts.Edit'));
if ($this->acl_check_edit('Users_Controller', 'password', $member_id))
$user_grid->action_field('id') ->label(url_lang::lang('texts.Password'))->url(url_lang::base().'users/chngpass')->action(url_lang::lang('texts.Edit'));
// $user_grid->action_field('id') ->label(url_lang::lang('texts.Delete'))->url(url_lang::base().'users/delete')->action(url_lang::lang('texts.Delete'))->script('onclick="return potvrd(\''.url_lang::lang('texts.delete_user').'\');"');;
$user_grid->datasource($users);
......
// regular member by default
$type_id = $enum_types->get_type_id('Regular member');
// entrance fee
$fee_model = new Fee_Model();
$fee = $fee_model->get_by_date_type(date('Y-m-d'), 'entrance fee');
if (is_object($fee) && $fee->id)
$entrance_fee = $fee->fee;
else
$entrance_fee = 0;
// form
$form = new Forge(url_lang::base().'members/add', '', 'POST', array('id' => 'article_form'));
$form->set_attr('class', 'form_class')->set_attr('method', 'post');
$form->group('')->label(url_lang::lang('texts.Basic information'));
$form->input('membername')->label(url_lang::lang('texts.Members first name and surname').':')->rules('length[3,60]');
$form->input('login')->label(url_lang::lang('texts.username').':')
->rules('required|length[3,50]')
->callback(array($this, 'valid_username'));
$form->input('title1')->label(url_lang::lang('texts.pre title').':')
->rules('length[3,40]');
$form->input('name')->label(url_lang::lang('texts.name').':')->rules('required|length[3,30]');
$form->input('middle_name')->label(url_lang::lang('texts.middle name').':')->rules('length[3,30]');
$form->input('surname')->label(url_lang::lang('texts.surname').':')->rules('required|length[3,60]');
$form->input('title2')->label(url_lang::lang('texts.post title').':')->rules('length[3,30]');
$form->input('name')->label(url_lang::lang('texts.name').':')->rules('required|length[1,30]');
$form->input('middle_name')->label(url_lang::lang('texts.middle name').':')->rules('length[1,30]');
$form->input('surname')->label(url_lang::lang('texts.surname').':')->rules('required|length[1,60]');
$form->input('title2')->label(url_lang::lang('texts.post title').':')->rules('length[1,30]');
$form->dropdown('type')->label(url_lang::lang('texts.Type').':')
->options($types)->rules('required')->selected($type_id);
$form->input('membername')->label(url_lang::lang('texts.Name of organization').':')->rules('length[1,60]');
$form->input('organization_identifier')->label(url_lang::lang('texts.Organization identifier').':')->rules('length[3,20]');
$form->group('')->label(url_lang::lang('texts.Password'));
$form->group('')->label(url_lang::lang('texts.Login data'));
$form->input('login')->label(url_lang::lang('texts.username').':')
->rules('required|length[1,50]')
->callback(array($this, 'valid_username'));
$form->password('passwd')->label(url_lang::lang('texts.password').':')->rules('required|length[3,50]')->class('required');
$form->password('confirm_password')->label(url_lang::lang('texts.confirm password').':')->rules('required|length[3,50]')->matches($form->passwd);
$form->group('')->label(url_lang::lang('texts.Contact information'));
$form->input('street')->label(url_lang::lang('texts.street').':')->rules('required|length[1,200]');
$form->input('street_number')->label(url_lang::lang('texts.street number').':')->rules('required|length[1,50]');
$form->input('street_number')->label(url_lang::lang('texts.street number').':')->rules('required|length[1,50]|valid_numeric');
$form->input('quarter')->label(url_lang::lang('texts.Quarter').':')->rules('length[1,50]');
$form->input('town')->label(url_lang::lang('texts.town').':')->rules('required|length[3,200]');
$form->input('town')->label(url_lang::lang('texts.town').':')->rules('required|length[1,200]');
$form->input('zip_code')->label(url_lang::lang('texts.zip code').':')->rules('required|length[5,10]');
$form->input('phone')->label(url_lang::lang('texts.phone').':')->rules('required|length[9,40]')->callback(array($this, 'valid_phone'));
$form->input('email')->label(url_lang::lang('texts.email').':')
->rules('length[3,50]|valid_email')
->callback(array($this, 'valid_email'));
$form->group('')->label(url_lang::lang('texts.Account information'));
$form->input('entrance_fee')->label(url_lang::lang('texts.Entrance fee').':')->rules('valid_numeric')->value(2000);
$form->input('entrance_fee_left')->label(url_lang::lang('texts.Entrance fee left').':')->rules('valid_numeric')->value(2000);
$form->input('entrance_fee')->label(url_lang::lang('texts.Entrance fee').':')->rules('valid_numeric')->value($entrance_fee);
//$form->input('entrance_fee_left')->label(url_lang::lang('texts.Entrance fee left').':')->rules('valid_numeric')->value(2000);
$form->input('debt_payment_rate')->label(url_lang::lang('texts.Debit payment rate').':')->rules('valid_numeric');
$form->group('')->label(url_lang::lang('texts.Additional information'));
$form->input('qos_ceil')->label(url_lang::lang('texts.qos ceil').':')->rules('valid_numeric');
......
$account->name = $form_data['surname'].' '.$form_data['name'];
else
$account->name = $form_data['membername'];
$user->name = $form_data['name'];
$user->middle_name = $form_data['middle_name'];
$user->login = $form_data['login'];
......
$form->set_attr('class', 'form_class')->set_attr('method', 'post');
$form->group('')->label(url_lang::lang('texts.Basic information'));
if ($this->acl_check_edit('Users_Controller','login',$member_id))
$form->input('login')->label(url_lang::lang('texts.username').':')
->rules('required|length[3,50]')
->callback(array($this, 'valid_username'))
->value($member_data->login);
$form->input('title1')->label(url_lang::lang('texts.pre title').':')->rules('length[3,40]')->value($member_data->pre_title);
$form->input('title1')->label(url_lang::lang('texts.pre title').':')->rules('length[1,40]')->value($member_data->pre_title);
if ($this->acl_check_edit('Users_Controller','name',$member_id))
$form->input('name')->label(url_lang::lang('texts.name').':')->rules('required|length[3,30]')->value($member_data->name);
$form->input('middle_name')->label(url_lang::lang('texts.middle name').':')->rules('length[3,30]')->value($member_data->middle_name);
$form->input('name')->label(url_lang::lang('texts.name').':')->rules('required|length[1,30]')->value($member_data->name);
$form->input('middle_name')->label(url_lang::lang('texts.middle name').':')->rules('length[1,30]')->value($member_data->middle_name);
if ($this->acl_check_edit('Users_Controller','surname',$member_id))
$form->input('surname')->label(url_lang::lang('texts.surname').':')->rules('required|length[3,60]')->value($member_data->surname);
$form->input('title2')->label(url_lang::lang('texts.post title').':')->rules('length[3,30]')->value($member_data->post_title);
$form->input('surname')->label(url_lang::lang('texts.surname').':')->rules('required|length[1,60]')->value($member_data->surname);
$form->input('title2')->label(url_lang::lang('texts.post title').':')->rules('length[1,30]')->value($member_data->post_title);
if ($this->acl_check_edit(get_class($this),'type',$member_id))
{
$enum_types = new Enum_type_Model();
$types = $enum_types->get_values(Enum_type_Model::$member_type_id);
$form->dropdown('type')->label(url_lang::lang('texts.Type').':')->options($types)->selected($member_data->typem)->callback(array($this, 'valid_member_type'));
}
if ($this->acl_check_edit(get_class($this),'name',$member_id))
$form->input('membername')->label(url_lang::lang('texts.Name of organization').':')->rules('required|length[1,60]')->value($member_data->namem);
if ($this->acl_check_edit(get_class($this),'organization_id', $member_id))
$form->input('organization_identifier')->label(url_lang::lang('texts.Organization identifier').':')->rules('length[3,20]')->value($member_data->organization_identifier);
if ($this->acl_check_edit(get_class($this),'name',$member_id))
$form->input('membername')->label(url_lang::lang('texts.Members first name and surname').':')->rules('required|length[3,60]')->value($member_data->namem);
$form->group('')->label(url_lang::lang('texts.Login data'));
if ($this->acl_check_edit('Users_Controller','login',$member_id))
$form->input('login')->label(url_lang::lang('texts.username').':')
->rules('required|length[3,50]')
->callback(array($this, 'valid_username'))
->value($member_data->login);
$form->group('')->label(url_lang::lang('texts.Contact information'));
if ($this->acl_check_edit(get_class($this),'address',$member_id))
{
$form->input('street')->label(url_lang::lang('texts.street').':')->rules('required|length[1,200]')->value($member_data->street);
$form->input('street_number')->label(url_lang::lang('texts.street number').':')->rules('required|length[1,50]')->value($member_data->street_number);
$form->input('town')->label(url_lang::lang('texts.town').':')->rules('required|length[3,200]')->value($member_data->town);
$form->input('street_number')->label(url_lang::lang('texts.street number').':')->rules('required|length[1,50]|valid_numeric')->value($member_data->street_number);
$form->input('town')->label(url_lang::lang('texts.town').':')->rules('required|length[1,200]')->value($member_data->town);
$form->input('quarter')->label(url_lang::lang('texts.quarter').':')->rules('length[1,50]')->value($member_data->quarter);
$form->input('zip_code')->label(url_lang::lang('texts.zip code').':')->rules('required|length[5,10]')->value($member_data->ZIP_code);
}
......
$user_data->where('type!=', User_Model::$user);
$user_data->find_by_member_id($member_id);
// user data
if ($this->acl_check_edit(get_class($this),'name',$member_id))
$user_data->name = $form_data['name'];
$user_data->middle_name = $form_data['middle_name'];
......
$member_data->organization_identifier = $form_data['organization_identifier'];
if ($this->acl_check_edit(get_class($this),'comment',$member_id))
$member_data->comment = $form_data['comment'];
// member data
if ($this->acl_check_edit(get_class($this),'entrance_date',$member_id))
$member_data->entrance_date = date("Y-m-d",$form_data['entrance_date']);
if ($this->acl_check_edit(get_class($this),'leaving_date',$member_id))
......
$member_data->quarter = $form_data['quarter'];
$member_data->ZIP_code = $form_data['zip_code'];
}
if ($this->acl_check_edit(get_class($this),'qos_ceil',$member_id))
$member_data->qos_ceil = $form_data['qos_ceil'];
if ($this->acl_check_edit(get_class($this),'qos_rate',$member_id))
......
$member_data->entrance_fee_left = $form_data['entrance_fee_left'];
if ($this->acl_check_edit(get_class($this),'debit',$member_id))
$member_data->debt_payment_rate = $form_data['debt_payment_rate'];
$member_saved = $member_data->save();
$user_data->member_id = $member_data->id;
freenetis/trunk/kohana/application/controllers/installation.php
$form->input('name')->label(url_lang::lang('texts.Name of the association').':')->rules('required|length[3,30]');
$form->date('foundation')->label(url_lang::lang('texts.Date of foundation').':')->years(date('Y')-100, date('Y'))->rules('required');
$form->input('street')->label(url_lang::lang('texts.street').':')->rules('required|length[1,200]');
$form->input('street_number')->label(url_lang::lang('texts.street number').':')->rules('required|length[1,50]');
$form->input('town')->label(url_lang::lang('texts.town').':')->rules('required|length[3,200]');
$form->input('street_number')->label(url_lang::lang('texts.street number').':')->rules('required|length[1,50]|valid_numeric');
$form->input('town')->label(url_lang::lang('texts.town').':')->rules('required|length[1,200]');
$form->input('quarter')->label(url_lang::lang('texts.quarter').':')->rules('length[1,50]');
$form->input('zip_code')->label(url_lang::lang('texts.zip code').':')->rules('required|length[5,10]');
$form->input('phone')->label(url_lang::lang('texts.phone').':')->rules('required|length[9,40]')->callback(array($this, 'valid_phone'));
$form->input('email')->label(url_lang::lang('texts.email').':')->rules('length[3,50]');
......
$form->input('SWIFT')->label(url_lang::lang('texts.SWIFT'));
// fees
$form->group('')->label(url_lang::lang('texts.Fees'));
$form->input('entrance_fee')->label(url_lang::lang('texts.Entrance fee'))->rules('required');
$form->input('regular_member_fee')->label(url_lang::lang('texts.Monthly member fee'))->rules('required');
$form->input('transfer_fee')->label(url_lang::lang('texts.Transfer fee'));
$form->input('penalty')->label(url_lang::lang('texts.Penalty'));
$form->input('entrance_fee')->label(url_lang::lang('texts.Entrance fee'))->rules('required|valid_numeric');
$form->input('regular_member_fee')->label(url_lang::lang('texts.Monthly member fee'))->rules('required|valid_numeric');
$form->input('transfer_fee')->label(url_lang::lang('texts.Transfer fee'))->rules('valid_numeric');
$form->input('penalty')->label(url_lang::lang('texts.Penalty'))->rules('valid_numeric');
// submit button
$form->submit('submit')->value(url_lang::lang('texts.Install'));
special::required_forge_style($form, ' *', 'required');
......
$member->street_number = $form_data["street_number"];
$member->street = $form_data["street"];
$member->town = $form_data["town"];
$member->quarter = $form_data["quarter"];
$member->ZIP_code = $form_data["zip_code"];
$enum_type = new Enum_type_Model();
$member->type = $enum_type->get_type_id('Honorary member');
freenetis/trunk/kohana/application/controllers/users.php
}
} // end of additional_contacts function
/**
* Function changes password of user.
* @param $user_id
* @return unknown_type
*/
function chngpass ($user_id = null)
{
if (isset($user_id))
......
if ($user_data->save())
{
$this->session->set_flash('message', url_lang::lang('texts.Password successfully changed.'));
$this->session->set_flash('message', url_lang::lang('texts.Password has been successfully changed.'));
}
else
{
$this->session->set_flash('message', url_lang::lang('texts.Error - cant change password.'));
}
url::redirect(url_lang::base().'users/show/'.(int)$user_id);
url::redirect(url_lang::base().'users/chngpass/'.(int)$user_id);
}
else
......
$view->header = new View('base/header');
$view->content = new View('users/chngpass');
$view->footer = new View('base/footer');
$view->header->menu = Controller::render_menu();
$view->header->title = url_lang::lang('texts.Change password');
//$view->header->other_styles = html::stylesheet('media/css/forms.css');
$view->content->form = $form->html();
$view->content->user_id = $user_id;
$view->content->member_id = $user->member_id;
$view->content->message = $this->session->get_once('message');
$view->render(TRUE);
}
freenetis/trunk/kohana/application/controllers/bank_transfers.php
$t->member_id = $member_id;
$t->save();
// new amount should be calculated, if association has fee for bank transfers
$fee_model = new Fee_Model();
$fee = $fee_model->get_by_date_type(date('Y-m-d'), 'transfer fee');
if (is_object($fee) && $fee->id)
$transfer_fee = $fee->fee;
else
$transfer_fee = 0;
$amount = $bt->amount - $transfer_fee;
// then we create a new transfer to the selected member's account:
$t->clear();
$time_now = date("Y-m-d H:i:s", time());
......
$t->datetime = $time_now;
$t->creation_datetime = $time_now;
$t->text = $form_data['text'];
$t->amount = $bt->amount;
$t->amount = $amount;
$new_save = $t->save();
// assign also all subsequent transfers to the selected member
freenetis/trunk/kohana/application/controllers/fees.php
}
else
{
$this->session->set_flash('message', url_lang::lang('texts.Error - can\'t add new fee.'));
$this->session->set_flash('message', url_lang::lang('texts.Error - cant edit fee.'));
}
}
......
$view->content->months = $months;
$view->content->years = $years;
$view->content->types = $enum_types;
$view->content->message = $this->session->get_once('message');
$view->render(TRUE);
}
freenetis/trunk/kohana/application/views/fees/edit.php
<h2><?php echo url_lang::lang('texts.Edit fee') ?></h2><br />
<?php echo $message ? '<div class="message">'.$message.'</div>' : '' ?>
<br />
<?php echo html::anchor(url_lang::base().'fees/show_all',url_lang::lang('texts.Back to list of all fees')) ?>
<br /><br />
......
</tr>
<tr>
<th></th>
<td><?php echo form::submit('submit', url_lang::lang('texts.Add'), ' class=submit') ?></td>
<td><?php echo form::submit('submit', url_lang::lang('texts.Edit'), ' class=submit') ?></td>
</tr>
</table>
<?php echo form::close() ?>
freenetis/trunk/kohana/application/views/members/show.php
if ($this->acl_check_edit('Members_Controller', 'members', $member_data->member_id))
$links[] = html::anchor(url_lang::base().'members/edit/'.$member_data->member_id,url_lang::lang('texts.Edit member'));
//if ($this->acl_check_edit('Users_Controller', 'password', $_SESSION['member_id']))
// $links[] = html::anchor(url_lang::base().'users/chngpass/'.$member_data->user_id,url_lang::lang('texts.Change password'));
if ($this->acl_check_edit('Users_Controller', 'password', $member_data->id))
$links[] = html::anchor(url_lang::base().'users/chngpass/'.$member_data->id, url_lang::lang('texts.Change password'));
if ($this->acl_check_view('Devices_Controller', 'devices', $member_data->member_id))
$links[] = html::anchor(url_lang::base().'devices/show_by_member/'.$member_data->member_id,url_lang::lang('texts.Show his devices'));
......
<?php if ($this->acl_check_view('Members_Controller', 'comment', $member_data->member_id)) { ?>
<tr>
<th><?php echo url_lang::lang('texts.Comment') ?></th>
<td><?php echo $member_data->comment ?></td>
<td style="padding:0px"><textarea readonly="readonly" style="border:0px"><?php echo $member_data->comment ?></textarea></td>
</tr>
<?php } ?>
<?php if ($this->acl_check_view('Users_Controller', 'application_password', $member_data->member_id)) { ?>
<tr>
<?php if ($this->acl_check_view('Users_Controller', 'application_password', $member_data->member_id)) { ?>
<tr>
<th><?php echo url_lang::lang('texts.Application password') ?></th>
<td><?php echo $member_data->application_password ?></td>
</tr>
<?php } ?>
<?php } ?>
</table>
<br class="clear" /><br />
freenetis/trunk/kohana/application/views/users/show.php
$links = array();
if ($this->acl_check_view('Members_Controller','members', $user_data->member_id))
$links[] = html::anchor(url_lang::base().'members/show/'.$user_data->member_id, url_lang::lang('texts.Back to the member'));
if ($this->acl_check_edit(get_class($this),'users',$user_data->member_id))
$links[] = html::anchor(url_lang::base().'users/edit/'.$user_data->id,url_lang::lang('texts.Edit user'));
freenetis/trunk/kohana/application/views/users/chngpass.php
<h2><?php echo url_lang::lang('texts.Change password') ?></h2><br />
<?php echo html::anchor(url_lang::base().'users/show/'.$user_id,url_lang::lang('texts.Back to this user.')) ?>
<?php echo $message ? '<div class="message">'.$message.'</div>' : '' ?>
<?php
$links = array();
if ($this->acl_check_view('Members_Controller','members', $member_id))
$links[] = html::anchor(url_lang::base().'members/show/'.$member_id, url_lang::lang('texts.Back to the member'));
if ($this->acl_check_view('Members_Controller','members', $member_id))
$links[] = html::anchor(url_lang::base().'users/show/'.$user_id,url_lang::lang('texts.Back to this user'));
echo implode (' | ', $links)
?>
<br /><br />
<?php echo $form?>

Také k dispozici: Unified diff