Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 369

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

Opravy chyb, nejake vylepsovaky.

Zobrazit rozdíly:

freenetis/trunk/kohana/application/i18n/cs_CZ/texts.php
'debit payment rate' => 'Výše splátek',
'debtors' => 'Dlužníci',
'deduct' => 'Strhnout',
'deduction of membership fees' => 'Stržení členských příspěvků',
'deduction of member fees' => 'Stržení členských příspěvků',
'deduction of entrance fees' => 'Stržení vstupních příspěvků',
'delete this contact' => 'Smazat tento kontakt',
'delete_member' => 'Smazat tohoto člena',
'delete_user' => 'Smazat tohoto uživatele',
freenetis/trunk/kohana/application/models/account.php
*/
public function get_account($account_id = null)
{
return self::$db->query("SELECT a.id, a.name, m.name AS mname, aa.name AS type
return self::$db->query("SELECT a.id, a.member_id, a.name, m.name AS mname, aa.name AS type
FROM accounts a
LEFT JOIN members m ON m.id = a.member_id
LEFT JOIN account_attributes aa ON aa.id = a.account_attribute_id
freenetis/trunk/kohana/application/controllers/transfers.php
/**
* @author Jiri Svitak
* By default, it redirects user to his member's transfers.
* By default, it redirects user to day book - list of all double-entry transfers.
* @return unknown_type
*/
function index()
{
$member_id = $this->session->get('member_id');
url::redirect(url_lang::base().'transfers/show_by_member/'.$member_id);
url::redirect(url_lang::base().'transfers/show_all');
}
/**
......
'limit_results' => $limit_results
));
if ($this->acl_check_edit('Accounts_Controller', 'transfers'))
$grid->add_new_button(url_lang::base().'transfers/deduct_fees', url_lang::lang('texts.Deduction of membership fees'));
$grid->add_new_button(url_lang::base().'transfers/deduct_fees', url_lang::lang('texts.Deduction of member fees'));
if ($this->acl_check_edit('Accounts_Controller', 'transfers'))
$grid->add_new_button(url_lang::base().'transfers/deduct_entrance_fees', url_lang::lang('texts.Deduction of entrance fees'));
$grid->order_field('id')->label('ID');
$grid->field('origin')->label(url_lang::lang('texts.Origin account'));
$grid->order_field('o_attribute')->label(url_lang::lang('texts.Type'));
......
*/
function show_by_account($account_id = NULL, $limit_results = 500, $order_by = 'id', $order_by_direction = 'asc', $page_word = null, $page = 1)
{
if ($this->acl_check_view('Accounts_Controller', 'transfers'))
if (!$this->acl_check_view('Accounts_Controller', 'transfers'))
Controller::error(1);
$this->session->del('ssMember_id');
$this->session->set('ssAccount_id', $account_id);
......
function deduct_fees()
{
// access rights
if (!$this->acl_check_add('Accounts_Controller', 'transfers'))
if (!$this->acl_check_new('Accounts_Controller', 'transfers'))
Controller::error(1);
// content of dropdown for months
for ($i = 1; $i <= 12; $i++)
......
$form->dropdown('year')->label(url_lang::lang('texts.Year').':')->rules('required')->options($arr_years)->selected(20);
$form->dropdown('month')->label(url_lang::lang('texts.Month from').':')->rules('required')->options($arr_months)->selected(1);
$form->dropdown('months')->label(url_lang::lang('texts.Number of months').':')->rules('required')->options($arr_months)->selected(1)->callback(array($this, 'valid_months'));
$form->input('fee')->label(url_lang::lang('texts.Monthly members fee').':')->rules('required|valid_numeric');
$form->input('fee')->label(url_lang::lang('texts.Monthly member fee').':')->rules('required|valid_numeric');
$form->input('text')->label(url_lang::lang('texts.Text').':');
$form->submit('submit')->value(url_lang::lang('texts.Deduct'));
special::required_forge_style($form, ' *', 'required');
......
}
else
{
$headline = url_lang::lang('texts.Deduction of member fees');
$view = new View('template');
$view->header = new View('base/header');
$view->header->title = url_lang::lang('texts.Deduction of membership fees');
$view->header->title = $headline;
$view->header->menu = Controller::render_menu();
$view->content = new View('transfers/deduct_fees');
$view->content->headline = $headline;
$view->content->form = $form->html();
$view->content->message = $this->session->get_once('message');
$view->footer = new View('base/footer');
......
}
/**
* Function deducts entrance fees. This fee is deducted only one once to each member.
* It checks each member if his fee was deducted, and if it is not, then
* the fee is deducted.
* @return unknown_type
*/
function deduct_entrance_fees()
{
// access rights
if (!$this->acl_check_new('Accounts_Controller', 'transfers'))
Controller::error(1);
// form
$form = new Forge(url_lang::base().'transfers/deduct_fees', '', 'POST', array('id' => 'article_form'));
$form->set_attr('class', 'form_class')->set_attr('method', 'post');
$form->submit('submit')->value(url_lang::lang('texts.Deduct'));
special::required_forge_style($form, ' *', 'required');
// validation
if ($form->validate())
{
}
else
{
$headline = url_lang::lang('texts.Deduction of entrance fees');
$view = new View('template');
$view->header = new View('base/header');
$view->header->title = $headline;
$view->header->menu = Controller::render_menu();
$view->content = new View('transfers/deduct_fees');
$view->content->headline = $headline;
$view->content->form = $form->html();
$view->content->message = $this->session->get_once('message');
$view->footer = new View('base/footer');
$view->render(TRUE);
}
}
/**
* Function validates amount of money to send from double-entry account.
* @param $input
* @return unknown_type
freenetis/trunk/kohana/application/controllers/bank_transfers.php
function unidentified_transfers($limit_results = 500, $order_by = 'id', $order_by_direction = 'asc', $page_word = null, $page = 1)
{
// access rights
if (!$this->acl_check_view(get_class($this), 'unidentified_transfers'))
if (!$this->acl_check_view('Accounts_Controller', 'unidentified_transfers'))
Controller::error(1);
// get new selector
......
$bt_model = new Bank_transfer_Model();
$bt = $bt_model->get_unidentified_transfer($trans_id);
$fee_model = new Fee_Model();
$fee = $fee_model->get_by_date_type(date('Y-m-d'), 'penalty');
if (is_object($fee) && $fee->id)
$penalty_fee = $fee->fee;
else
$penalty_fee = 0;
$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->dropdown('name')->label(url_lang::lang('texts.Destination credit account').':')->options($arr_accounts)->rules('required');
$form->input('text')->label(url_lang::lang('texts.Text'));
$form->group('')->label(url_lang::lang('texts.Penalty'));
$form->input('penalty')->label(url_lang::lang('texts.Penalty'))->value('0')->rules('valid_numeric');
$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->submit('submit')->value(url_lang::lang('texts.Assign'));
special::required_forge_style($form, ' *', 'required');
......
$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;
freenetis/trunk/kohana/application/controllers/accounts.php
protected $parsed_bank_acc = NULL;
protected $time_now;
protected $stats;
function index()
{
url::redirect(url_lang::base().'accounts/show_all');
}
/**
* @author Jiri Svitak
* It shows all double-entry accounts. They are shown by selected group in filter.
freenetis/trunk/kohana/application/views/transfers/deduct_fees.php
<h2><?php echo url_lang::lang('texts.Deduction of membership fees'); ?></h2>
<h2><?php echo $headline ?></h2>
<?php echo $message ? '<div class="message">'.$message.'</div>' : '' ?>
<br />
<?php echo html::anchor(url_lang::base().'transfers/show_all',url_lang::lang('texts.Back to day book'))?>
freenetis/trunk/kohana/application/views/transfers/show_by_account.php
<table class="extended" style="float:left; margin-left:25px">
<tr>
<th><?php echo url_lang::lang('texts.Owner of account')?></th>
<td><?php echo $account->mname ?></td>
<td><?php echo html::anchor(url_lang::base().'members/show/'.$account->member_id, $account->mname) ?></td>
</tr>
<tr>
<th><?php echo url_lang::lang('texts.Type of double-entry account')?></th>

Také k dispozici: Unified diff