Revize 2096
Přidáno uživatelem David Raška před asi 11 roky(ů)
freenetis/branches/1.1/application/controllers/accounts.php | ||
---|---|---|
$amount = $fee_model->get_regular_member_fee_by_member_date(
|
||
$account->member_id, $date
|
||
);
|
||
|
||
$name = $fee_model->get_regular_member_fee_name_by_member_date(
|
||
$account->member_id, $date
|
||
);
|
||
|
||
if ($name === NULL)
|
||
$name = __('Member fee');
|
||
|
||
if ($amount)
|
||
{
|
||
... | ... | |
$account->id, $operating->id, null, null,
|
||
Session::instance()->get('user_id'),
|
||
Transfer_Model::DEDUCT_MEMBER_FEE,
|
||
$date, $creation_datetime, __('Member fee'),
|
||
$date, $creation_datetime, $name,
|
||
$amount
|
||
);
|
||
}
|
freenetis/branches/1.1/application/models/fee.php | ||
---|---|---|
}
|
||
|
||
/**
|
||
* Returns regular member fee name of member in date
|
||
*
|
||
* @author David Raška
|
||
* @param int $member_id
|
||
* @param string $date
|
||
* @return string|NULL
|
||
*/
|
||
public function get_regular_member_fee_name_by_member_date($member_id, $date)
|
||
{
|
||
$fee = $this->get_fee_by_member_date_type($member_id, $date, 'regular member fee');
|
||
|
||
if ($fee && $fee->id)
|
||
{
|
||
return $fee->name;
|
||
}
|
||
|
||
return NULL;
|
||
}
|
||
|
||
/**
|
||
* Gets transfer fee by date
|
||
*
|
||
* @author Michal Kliment
|
Také k dispozici: Unified diff
Opravy:
- fixes #705 - Oprava jmena tarifu pri prepoctu clenskych prispevku