Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 434

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

Opravy chyb, nejake vylepsovaky, pridano pridavani plateb clenskych prispevku hotove pres pokladnu.

Zobrazit rozdíly:

freenetis/trunk/kohana/application/i18n/cs_CZ/texts.php
'arrival' => 'Příchozí',
'assign' => 'Přiřadit',
'assign transfer' => 'Přiřadit převod',
'assigning of unidentified payment' => 'Přiřazení neidentifikované platby',
'association has not got credit account' => 'Sdružení nemá kreditní účet.',
'association information' => 'Informace o sdružení',
'association members' => 'Členové sdružení',
......
'error - cant add new account' => 'Chyba - nelze vytvořit účet.',
'error - cant add new member' => 'Chyba - nelze vytvořit člena.',
'error - cant add new template' => 'Chyba - nelze přidat novou šablonu.',
'error - cant add new transfer' => 'Chyba -nelze přidat nový převod.',
'error - cant add new user' => 'Chyba - nelze vytvořit uživatele.',
'error - cant add new work' => 'Chyba - nelze přidat novou práci.',
'error - cant deduct entrance fee' => 'Chyba - nelze strhnout vstupní příspěvek.',
......
'member' => 'Člen',
'member cannot left association before entrance' => 'Člen nemůže opustit sdružení před vstupem.',
'member cannot be former, if his membership was not ended' => 'Člen nemůže být bývalý, pokud jeho členství nebylo ukončeno.',
'member fee payment by cash' => 'Platba členského příspěvku hotově',
'member has been successfully added' => 'Člen byl úspěšně přidán.',
'member has been successfully updated' => 'Člen byl úspěšně upraven.',
'member id' => 'ID člena',
'member name' => 'Jméno člena (organizace)',
'members account' => 'Účet člena',
'members name' => 'Jméno člena (organizace)',
......
'payment information' => 'Informace o platbě',
'penalty' => 'Pokuta',
'penalty and fee' => 'Poplatky a pokuty',
'penalty for unidentified transfer' => 'Pokuta za neidentifikovanou platbu',
'penalty have to be a number' => 'Pokuta musí být číslo',
'phone' => 'Telefon',
'phone already exists in database' => 'Telefon je již v databázi',
......
'the parsed account is unknown' => 'Parsovaný účet je neznámý',
'the transfer successfully done' => 'Převod úspěšně dokončen',
'there are no items yet' => 'Neobsahuje žádné záznamy.',
'this account does not exist' => 'Tento účet neexistuje.',
'time' => 'čas',
'timestamp' => 'Čas',
'to' => 'Komu',
......
'upload bank transfers listing' => 'Nahrát bankovní výpis',
'user' => 'Uživatel',
'user cannot be deleted, he has some dependent items in database' => 'Uživatel nelze smazat, má závislé objekty v databázi.',
'user id' => 'ID uživatele',
'user identification' => 'Identifikace uživatele',
'user has been successfully added' => 'Uživatel byl úspěšně přidán.',
'user has been successfully deleted' => 'Uživatel byl úspěšně smazán.',
freenetis/trunk/kohana/application/controllers/members.php
Controller::error(ACCESS);
$model_members = new Member_Model();
if (count($model_members->get_member($member_id)) == 0)
url::redirect(url_lang::base().'members/show_all');
Controller::error(RECORD);
$member_data = $model_members->get_member($member_id)->current();
$address_point = new Address_point_Model($member_data->address_point_id);
freenetis/trunk/kohana/application/controllers/transfers.php
if ($this->acl_check_edit('Accounts_Controller', 'transfers'))
$grid->action_field('id')->label(url_lang::lang('texts.Transfer'))->url(url_lang::base().'transfers/edit')->action(url_lang::lang('texts.Edit'));
$grid->datasource($alltransfers);
$view = new View('template');
$view->header = new View('base/header');
$view = new View('main');
$view->title = $headline;
$view->content = $grid;
$view->footer = new View('base/footer');
$view->header->menu = Controller::render_menu();
$view->header->title = $headline;
$view->render(TRUE);
}
......
$bt = $bt_model->get_bank_transfer($transfer_id);
}
$headline = url_lang::lang('texts.Detail of transfer number').' '.$transfer->id;
$view = new View('template');
$view->header = new View('base/header');
$view = new View('main');
$view->title = $headline;
$view->content = new View('transfers/show');
$view->content->headline = $headline;
$view->content->transfer = $transfer;
$view->content->previous = $previous;
$view->content->bt = $bt;
$view->content->message = $this->session->get_once('message');
$view->footer = new View('base/footer');
$view->header->menu = Controller::render_menu();
$view->header->title = $headline;
$view->render(TRUE);
}
else
......
if ($this->acl_check_edit('Accounts_Controller','transfers',$member_id))
$grid->action_field('id')->label(url_lang::lang('texts.Transfer'))->url(url_lang::base().'transfers/edit')->action(url_lang::lang('texts.Edit'));
$grid->datasource($transfers);
$view = new View('template');
$view->header = new View('base/header');
$view = new View('main');
$view->title = $headline;
$view->content = new View('transfers/show_by_member');
$view->content->headline = $headline;
$view->content->account = $account;
......
$view->content->inbound = $inbound;
$view->content->outbound = $outbound;
$view->content->grid = $grid;
$view->footer = new View('base/footer');
$view->header->menu = Controller::render_menu();
$view->header->title = $headline;
$view->render(TRUE);
} // end of show_by_member function
......
if ($this->acl_check_edit('Accounts_Controller', 'transfers'))
$grid->action_field('id')->label(url_lang::lang('texts.Transfer'))->url(url_lang::base().'transfers/edit')->action(url_lang::lang('texts.Edit'));
$grid->datasource($transfers);
$view = new View('template');
$view->header = new View('base/header');
$view = new View('main');
$view->title = $headline;
$view->content = new View('transfers/show_by_account');
$view->content->headline = $headline;
$view->content->account = $account;
......
$view->content->outbound = $outbound;
$view->content->grid = $grid;
$view->content->message = $this->session->get_once('message');
$view->footer = new View('base/footer');
$view->header->menu = Controller::render_menu();
$view->header->title = $headline;
$view->render(TRUE);
} // end of show_by_bank_account function
......
$form->set_attr('class', 'form_class')->set_attr('method', 'post');
$form->group('')->label(url_lang::lang('texts.Transfer'));
$form->dropdown('aname')->label(url_lang::lang('texts.Destination credit account').':')->options($arr_accounts)->rules('required');
$form->date('datetime')->label(url_lang::lang('texts.Date and time').':')->years(date('Y')-20, date('Y'))->rules('required');
$form->input('amount')->label(url_lang::lang('texts.Amount').':')->rules('required|valid_numeric')->callback(array($this, 'valid_amount_to_send'));
$form->input('text')->label(url_lang::lang('texts.Text'))->rules('required');
$form->submit('submit')->value(url_lang::lang('texts.Send'));
......
{
$form_data[$key] = htmlspecialchars($value);
}
$mt = new Transfer_Model();
$mt->origin_id = $origin_account;
$mt->destination_id = $form_data['aname'];
$mt->datetime = date('Y-m-d H:i:s', time());
$mt->text = $form_data['text'];
$mt->amount = $form_data['amount'];
if ($mt->save())
$transfer = new Transfer_Model();
$transfer->origin_id = $origin_account;
$transfer->destination_id = $form_data['aname'];
$transfer->datetime = $form_data['datetime'];
$transfer->creation_datetime = date('Y-m-d H:i:s', time());
$transfer->text = $form_data['text'];
$transfer->amount = $form_data['amount'];
if ($transfer->save())
{
$this->session->set_flash('message', url_lang::lang('texts.Transfer has been successfully added'));
if ($ssMember_id)
......
}
}
$headline = url_lang::lang('texts.Add new transfer');
$view = new View('template');
$view->header = new View('base/header');
$view->header->menu = Controller::render_menu();
$view->header->title = $headline;
$view = new View('main');
$view->title = $headline;
$view->content = new View('form');
$view->content->headline = $headline;
$view->content->form = $form->html();
......
$view->content->link_back = html::anchor(url_lang::base().'transfers/show_by_member/'.$ssMember_id, url_lang::lang('texts.Back to transfers of member'));
else
$view->content->link_back = html::anchor(url_lang::base().'transfers/show_by_account/'.$origin_account, url_lang::lang('texts.Back to transfers of account'));
$view->footer = new View('base/footer');
$view->render(TRUE);
}
......
else
{
$headline = url_lang::lang('texts.Editing of transfer');
$view->form = new View('registration');
$view = new View('template');
$view->header = new View('base/header');
$view = new View('main');
$view->title = $headline;
$view->content = new View('form');
$view->footer = new View('base/footer');
$view->header->menu = Controller::render_menu();
$view->header->title = $headline;
$view->content->headline = $headline;
$view->content->form = $form->html();
if ($ssMember_id)
......
{
$db->query("COMMIT;");
$this->session->set_flash('message', url_lang::lang('texts.Fees have been successfully deducted.'));
url::redirect(url_lang::base().'transfers/show_all');
}
else
{
$db->query("ROLLBACK;");
$this->session->set_flash('message', url_lang::lang('texts.Error - some fees have not been deducted.'));
}
}
url::redirect(url_lang::base().'transfers/show_all');
}
else
{
$headline = url_lang::lang('texts.Deduction of member fees');
$view = new View('template');
$view->header = new View('base/header');
$view->header->title = $headline;
$view->header->menu = Controller::render_menu();
$view = new View('main');
$view->title = $headline;
$view->content = new View('form');
$view->content->headline = $headline;
$view->content->form = $form->html();
//$view->content->message = $this->session->get_once('message');
$view->content->link_back = html::anchor(url_lang::base().'transfers/show_all',url_lang::lang('texts.Back to day book'));
$view->footer = new View('base/footer');
$view->render(TRUE);
}
}
......
* @param $member_id
* @return unknown_type
*/
function add_member_fee_payment_by_cash($member_id)
function add_member_fee_payment_by_cash($member_id = null)
{
if (!isset($member_id))
Controller::warning(PARAMETER);
......
$accounts[$credit->id] = $credit->name;
$form = new Forge(url_lang::base().'transfers/add_member_fee_payment_by_cash/'.$member_id, '', 'POST', array('id' => 'article_form'));
$form->set_attr('class', 'form_class')->set_attr('method', 'post');
$form->dropdown('credit')->label(url_lang::lang('texts.Credit account').":")->options($accounts);
$form->dropdown('credit')->label(url_lang::lang('texts.Destination account').":")->options($accounts);
$form->date('datetime')->label(url_lang::lang('texts.Date and time').':')->years(date('Y')-20, date('Y'))->rules('required');
$form->input('amount')->label(url_lang::lang('texts.Amount').':')->rules('required|valid_numeric')->callback(array($this, 'valid_amount'));
$form->input('text')->label(url_lang::lang('texts.Text'))->value(url_lang::lang('texts.Member fee payment by cash'))->rules('required');
$form->submit('submit')->value(url_lang::lang('texts.Add'));
special::required_forge_style($form, ' *', 'required');
if ($form->validate())
{
$form_data = $form->as_array();
foreach($form_data as $key => $value)
{
$form_data[$key] = htmlspecialchars($value);
}
$member_fees = ORM::factory('account')->find_by_account_attribute_id(Account_attribute_Model::$member_fees);
$cash = ORM::factory('account')->find_by_account_attribute_id(Account_attribute_Model::$cash);
$operating = ORM::factory('account')->find_by_account_attribute_id(Account_attribute_Model::$operating);
$transfer1 = new Transfer_Model();
$transfer1->origin_id = $member_fees->id;
$transfer1->destination_id = $cash->id;
$transfer1->datetime = $form_data['datetime'];
$transfer1->creation_datetime = date('Y-m-d H:i:s', time());
$transfer1->text = $form_data['text'];
$transfer1->amount = $form_data['amount'];
$transfer1_saved = $transfer1->save();
$transfer2 = new Transfer_Model();
$transfer2->origin_id = $operating->id;
$transfer2->destination_id = $credit->id;
$transfer2->datetime = $form_data['datetime'];
$transfer2->creation_datetime = date('Y-m-d H:i:s', time());
$transfer2->text = $form_data['text'];
$transfer2->amount = $form_data['amount'];
$transfer2_saved = $transfer2->save();
if ($transfer1_saved && $transfer2_saved)
{
$this->session->set_flash('message', url_lang::lang('texts.Transfer has been successfully added.'));
}
else
{
$this->session->set_flash('message', url_lang::lang('texts.Error - cant add new transfer.'));
}
url::redirect(url_lang::base().'transfers/show_by_member/'.$member_id);
}
else
{
......
$view->content = new View('form');
$view->content->headline = $headline;
$view->content->form = $form->html();
$view->content->link_back = html::anchor(url_lang::base().'transfers/show_all',url_lang::lang('texts.Back to day book'));
$view->content->link_back = html::anchor(url_lang::base().'transfers/show_by_member/'.$member_id,url_lang::lang('texts.Back to transfers of member'));
$view->render(TRUE);
}
freenetis/trunk/kohana/application/controllers/login.php
$login->title = url_lang::lang('texts.Login to');
if (!$error) $error = $this->session->get_once('err_message');
$login->error = $error;
//commented by Jiri Svitak (commented in View too)
// not fully functional and should be available only after whole system is complete
$login->registration = html::anchor(url_lang::base().'registration', url_lang::lang('texts.New member'));
$login->render(TRUE);
freenetis/trunk/kohana/application/controllers/bank_transfers.php
$arr_accounts[$account->id] = $account->name;
}
asort($arr_accounts, SORT_LOCALE_STRING);
$arr_accounts[0] = '----- '.url_lang::lang('texts.Select').' -----';
$bt_model = new Bank_transfer_Model();
$bt = $bt_model->get_bank_transfer($trans_id);
......
$form = new Forge(url_lang::base().'bank_transfers/assign_transfer/'.$trans_id, '', 'POST', array('id' => 'article_form'));
$form->set_attr('class', 'form_class')->set_attr('method', 'post');
$form->group('')->label(url_lang::lang('texts.Payment'));
$form->dropdown('name')->label(url_lang::lang('texts.Destination credit account').':')->options($arr_accounts)->rules('required');
$form->input('text')->label(url_lang::lang('texts.Text').':')->rules('required');
$form->dropdown('name')->label(url_lang::lang('texts.Destination credit account').':')->options($arr_accounts)->rules('required')->selected(0);
$form->input('text')->label(url_lang::lang('texts.Text').':')->rules('required')->value(url_lang::lang('texts.Assigning of unidentified payment'));
$form->group('')->label(url_lang::lang('texts.Penalty'));
$form->input('penalty')->label(url_lang::lang('texts.Penalty').':')->value($penalty_fee)->rules('valid_numeric');
$form->input('penalty_text')->label(url_lang::lang('texts.Text').':');
$form->input('penalty_text')->label(url_lang::lang('texts.Text').':')->value(url_lang::lang('texts.Penalty for unidentified transfer'));
$form->submit('submit')->value(url_lang::lang('texts.Assign'));
special::required_forge_style($form, ' *', 'required');
......
$form_data[$key] = htmlspecialchars($value);
}
$dst_acc = new Account_Model($form_data['name']);
if ($dst_acc->id == 0)
Controller::error(RECORD);
$member_id = $dst_acc->member_id;
// first we assign the first transfer to the selected member
$t = new Transfer_Model($trans_id);
freenetis/trunk/kohana/application/controllers/accounts.php
$grid->action_field('id')->label(url_lang::lang('texts.Account'))->url(url_lang::base().'accounts/edit')->action(url_lang::lang('texts.Edit'));
$grid->datasource($accounts);
$view = new View('template');
$view->header = new View('base/header');
$view->header->title = $headline;
//$view->header->menu = Controller::render_menu();
$view = new View('main');
$view->title = $headline;
$view->content = $grid;
$view->footer = new View('base/footer');
$view->render(TRUE);
}
freenetis/trunk/kohana/application/views/menu.php
<li><?php echo html::anchor(url_lang::base().'works', url_lang::lang('texts.Works')) ?></li>
<?php } ?>
<?php if ($this->acl_check_2D('menu', 'unidentified_transfers')) { ?>
<li><?php echo html::anchor(url_lang::base().'bank_transfers/unident<?php ified_transfers/', url_lang::lang('texts.Unidentified transfers')) ?></li>
<li><?php echo html::anchor(url_lang::base().'bank_transfers/unidentified_transfers/', url_lang::lang('texts.Unidentified transfers')) ?></li>
<?php } ?>
<?php if ($this->acl_check_2D('menu', 'accounts')) { ?>
<li><?php echo html::anchor(url_lang::base().'bank_accounts/show_all', url_lang::lang('texts.Bank accounts')) ?></li>
freenetis/trunk/kohana/application/views/members/show.php
<th colspan="2"><?php echo url_lang::lang('texts.Basic information') ?></th>
</tr>
<tr>
<th>ID</th>
<td><?php echo $member_data->member_id ?></td>
<th><?php echo url_lang::lang('texts.Member ID')?></th>
<td><?php echo $member_data->member_id ?></td>
</tr>
<tr>
<th><?php echo url_lang::lang('texts.Members name') ?></th>
<td><?php echo $member_data->namem ?></td>
<th><?php echo url_lang::lang('texts.Members name') ?></th>
<td><?php echo $member_data->namem ?></td>
</tr>
<tr>
<th><?php echo url_lang::lang('texts.Organization identifier') ?></th>
<td><?php echo $member_data->organization_identifier ?></td>
<th><?php echo url_lang::lang('texts.Organization identifier') ?></th>
<td><?php echo $member_data->organization_identifier ?></td>
</tr>
<?php if ($this->acl_check_view('Members_Controller', 'entrance_date', $member_data->member_id)) { ?>
<tr>
......
<th colspan="2"><?php echo url_lang::lang('texts.Basic information') ?></th>
</tr>
<tr>
<th><?php echo url_lang::lang('texts.User ID') ?></th>
<td><?php echo $member_data->id ?></td>
</tr>
<tr>
<th><?php echo url_lang::lang('texts.Username') ?></th>
<td><?php echo $member_data->login ?></td>
</tr>

Také k dispozici: Unified diff