Revize 887
Přidáno uživatelem Michal Kliment před více než 13 roky(ů)
| freenetis/trunk/kohana/application/controllers/transfers.php | ||
|---|---|---|
|
$max_month = $max_date['month'];
|
||
|
$max_year = $max_date['year'];
|
||
|
// round max date
|
||
|
if ($max_day <= 15)
|
||
|
if ($max_day < 15)
|
||
|
{
|
||
|
$max_month--;
|
||
|
if ($max_month == 0)
|
||
| freenetis/trunk/kohana/application/controllers/votes.php | ||
|---|---|---|
|
$transfer->save();
|
||
|
*
|
||
|
*/
|
||
|
$operating = $account_model->where('account_attribute_id', Account_attribute_Model::$operating)->find();
|
||
|
$credit = $account_model->where('member_id', $work->user->member_id)->where('account_attribute_id', Account_attribute_Model::$credit)->find();
|
||
|
$transfer_id = Transfer_Model::insert_transfer($operating->id, $credit->id, null, null,
|
||
|
$this->session->get('user_id'), null, date('Y-m-d'), date('Y-m-d H:i:s'), url_lang::lang('texts.Work approval'), $work->suggest_amount);
|
||
|
$operating_id = $account_model->where('account_attribute_id', Account_attribute_Model::$operating)->find()->id;
|
||
|
$credit_id = $account_model->where('member_id', $work->user->member_id)->where('account_attribute_id', Account_attribute_Model::$credit)->find()->id;
|
||
|
|
||
|
$transfer_id = Transfer_Model::insert_transfer(
|
||
|
$operating_id,
|
||
|
$credit_id,
|
||
|
null,
|
||
|
null,
|
||
|
$this->session->get('user_id'),
|
||
|
null,
|
||
|
date('Y-m-d'),
|
||
|
date('Y-m-d H:i:s'),
|
||
|
url_lang::lang('texts.Work approval'),
|
||
|
$work->suggest_amount
|
||
|
);
|
||
|
|
||
|
$work->transfer_id = $transfer_id;
|
||
|
}
|
||
|
|
||
| freenetis/trunk/kohana/application/controllers/works.php | ||
|---|---|---|
|
$transfer->save();
|
||
|
*
|
||
|
*/
|
||
|
$operating = $account_model->where('account_attribute_id', Account_attribute_Model::$operating)->find();
|
||
|
$credit = $account_model->where('member_id', $work->user->member_id)->where('account_attribute_id', Account_attribute_Model::$credit)->find();
|
||
|
$transfer_id = Transfer_Model::insert_transfer($operating->id, $credit->id, null, null,
|
||
|
$this->session->get('user_id'), null, date('Y-m-d'), date('Y-m-d H:i:s'), url_lang::lang('texts.Work approval'), $work->suggest_amount);
|
||
|
$operating_id = $account_model->where('account_attribute_id', Account_attribute_Model::$operating)->find()->id;
|
||
|
$credit_id = $account_model->where('member_id', $work->user->member_id)->where('account_attribute_id', Account_attribute_Model::$credit)->find()->id;
|
||
|
|
||
|
$transfer_id = Transfer_Model::insert_transfer(
|
||
|
$operating_id,
|
||
|
$credit_id,
|
||
|
null,
|
||
|
null,
|
||
|
$this->session->get('user_id'),
|
||
|
null,
|
||
|
date('Y-m-d'),
|
||
|
date('Y-m-d H:i:s'),
|
||
|
url_lang::lang('texts.Work approval'),
|
||
|
$work->suggest_amount
|
||
|
);
|
||
|
|
||
|
$work->transfer_id = $transfer_id;
|
||
|
}
|
||
| ... | ... | |
|
$transfer->save();
|
||
|
*/
|
||
|
|
||
|
$operating = $account_model->where('account_attribute_id', Account_attribute_Model::$operating)->find();
|
||
|
$credit = $account_model->where('member_id', $work->user->member_id)->where('account_attribute_id', Account_attribute_Model::$credit)->find();
|
||
|
$transfer_id = Transfer_Model::insert_transfer($operating->id, $credit->id, null, null,
|
||
|
$this->session->get('user_id'), null, date('Y-m-d'), date('Y-m-d H:i:s'), url_lang::lang('texts.Work approval'), $work->suggest_amount);
|
||
|
$operating_id = $account_model->where('account_attribute_id', Account_attribute_Model::$operating)->find()->id;
|
||
|
$credit_id = $account_model->where('member_id', $work->user->member_id)->where('account_attribute_id', Account_attribute_Model::$credit)->find()->id;
|
||
|
|
||
|
$transfer_id = Transfer_Model::insert_transfer(
|
||
|
$operating_id,
|
||
|
$credit_id,
|
||
|
null,
|
||
|
null,
|
||
|
$this->session->get('user_id'),
|
||
|
null,
|
||
|
date('Y-m-d'),
|
||
|
date('Y-m-d H:i:s'),
|
||
|
url_lang::lang('texts.Work approval'),
|
||
|
$work->suggest_amount
|
||
|
);
|
||
|
|
||
|
$work->transfer_id = $transfer_id;
|
||
|
}
|
||
|
|
||
Také k dispozici: Unified diff
Merge z testingu - opraveno prepocitavani clenskych prispevku clena (nebyl strzen posledni mesic). Opraveno schvalovani praci - pri schvalovani se jako zdrojovy i cilovy ucet spatne nastavit kreditni ucet clena. Zahadny bug v vytvoreni vice (obvykle tri) prevodu misto jednoho pri schvaleni prace nebyl odhalen a zustava i nadale zahadny...