Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 513

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

Pro radne cleny pridana moznost sledovat neidentifikovane platby. V tabulce members vymazane uz davno zastarale sloupce pro ukladani adresy. Adresy uz jsou nejakou dobu resene pres adresni body. Pridan typ zarizeni AP.

Zobrazit rozdíly:

freenetis/trunk/kohana/application/controllers/transfers.php
$transfer = new Transfer_Model($ca->transfer_id);
}
$transfer->origin_id = $ca->id;
$transfer->destination_id = $operating->id;
$transfer->user_id = $this->session->get('user_id');
$transfer->type = Transfer_Model::$deduct_member_fee;
$transfer->datetime = $start_date;
$transfer->datetime = $ca->start_date;
$transfer->creation_datetime = $creation_datetime;
$transfer->text = $form_data['text'];
$transfer->amount = $ca->months * $form_data['fee'];
freenetis/trunk/kohana/application/controllers/bank_transfers.php
));
$grid->order_field('id')->label('ID');
$grid->order_field('datetime')->label(url_lang::lang('texts.Date and time'));
$grid->order_field('account_nr')->label(url_lang::lang('texts.Account number'));
$grid->order_field('bank_nr')->label(url_lang::lang('texts.Bank code'));
if ($this->acl_check_view('Accounts_Controller', 'bank_accounts'))
{
$grid->order_field('account_nr')->label(url_lang::lang('texts.Account number'));
$grid->order_field('bank_nr')->label(url_lang::lang('texts.Bank code'));
}
$grid->order_field('name')->label(url_lang::lang('texts.Account name'));
//$grid->order_field('text')->label(url_lang::lang('texts.Text'));
$grid->order_field('variable_symbol')->label(url_lang::lang('texts.Variable symbol'));
freenetis/trunk/kohana/application/upgrade_sql/upgrade_sql.php
// array of sql queries that upgrade database
$upgrade_sql[get_SVN_rev()] = array(
"ALTER TABLE `fees` CHANGE `fee` `fee` DOUBLE NOT NULL ",
"ALTER TABLE `transfers` CHANGE `member_id` `member_id` INT( 11 ) NULL DEFAULT NULL COMMENT 'id of the member, to whom the transaction is assigned',
CHANGE `amount` `amount` DOUBLE NOT NULL ",
"ALTER TABLE `accounts_bank_accounts` DEFAULT CHARACTER SET utf8 COLLATE utf8_czech_ci",
"INSERT INTO `enum_types` (
`id` ,
`type_id` ,
......
`read_only`
)
VALUES (
NULL , '9', '802.11b/g', '1'
NULL , '2', 'AP', '1'
);
",
"ALTER TABLE `members` DROP `street_number` ,
DROP `street` ,
DROP `town` ,
DROP `quarter` ,
DROP `ZIP_code` ;
",
"INSERT INTO `acl` (
`id` ,
`section_value` ,
`allow` ,
`enabled` ,
`return_value` ,
`note` ,
`updated_date`
)
VALUES (
'42', 'user', '1', '1', NULL , 'Regular members can see unidentified transfers.', '1248160179'
);",
"INSERT INTO `aco_map` (
`acl_id` ,
`section_value` ,
`value`
)
VALUES (
'42', 'freenetis', 'view_all'
);
",
"INSERT INTO `aro_groups_map` (
`acl_id` ,
`group_id`
)
VALUES (
'42', '22'
);
",
"INSERT INTO `axo_map` (
`acl_id` ,
`section_value` ,
`value`
)
VALUES (
'42', 'Accounts_Controller', 'unidentified_transfers'
);
",
"INSERT INTO `aco_map` (
`acl_id` ,
`section_value` ,
`value`
)
VALUES (
'34', 'menu', 'unidentified_transfers'
);"
);
freenetis/trunk/kohana/application/upgrade_sql/upgrade_sql_505.php
<?php
$upgrade_sql[505] = array(
"ALTER TABLE `fees` CHANGE `fee` `fee` DOUBLE NOT NULL ",
"ALTER TABLE `transfers` CHANGE `member_id` `member_id` INT( 11 ) NULL DEFAULT NULL COMMENT 'id of the member, to whom the transaction is assigned',
CHANGE `amount` `amount` DOUBLE NOT NULL ",
"ALTER TABLE `accounts_bank_accounts` DEFAULT CHARACTER SET utf8 COLLATE utf8_czech_ci",
"INSERT INTO `enum_types` (
`id` ,
`type_id` ,
`value` ,
`read_only`
)
VALUES (
NULL , '9', '802.11b/g', '1'
);"
);
?>
freenetis/trunk/kohana/application/views/menu.php
</ul>
</li>
<?php if ($this->acl_check_2D('menu', 'accounts')) { ?>
<?php if ($this->acl_check_2D('menu', 'accounts') || $this->acl_check_2D('menu', 'unidentified_transfers')) { ?>
<li class="transfer"><h2><?php echo url_lang::lang('texts.Finances') ?></h2>
<ul>
<?php if ($this->acl_check_2D('menu', 'unconfirmed_works')) { ?>

Také k dispozici: Unified diff