Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 2291

Přidáno uživatelem Ondřej Fibich před téměř 11 roky(ů)

Upravy:
- closes #840: Zpusob platby Placeno jinak u pracovnich vykazu

Zobrazit rozdíly:

freenetis/branches/1.2/application/controllers/work_reports.php
if (count($states[Vote_Model::STATE_APPROVED]))
{
// send money
if (Settings::get('finance_enabled') && $work_report_model->payment_type == Job_report_Model::PAYMENT_BY_CREDIT)
if (Settings::get('finance_enabled') &&
$work_report_model->payment_type == Job_report_Model::PAYMENT_BY_CREDIT)
{
$transfer_id = Transfer_Model::insert_transfer_for_work_approve(
$work_report_model->user->member_id, $amount
freenetis/branches/1.2/application/i18n/cs_CZ/texts.php
'other information' => 'Další informace',
'other phones' => 'další telefony',
'other settings' => 'Další nastavení',
'other type of payment' => 'Jiný typ platby',
'other users' => 'Další uživatelé',
'out of peak' => 'Mimo špičku',
'outbound' => 'Odchozí',
freenetis/branches/1.2/application/models/job_report.php
const PAYMENT_BY_CREDIT = 0;
/** Constant of cash payment for column payment_type */
const PAYMENT_BY_CASH = 1;
/** Constant of different payment for column payment_type */
const PAYMENT_OTHER = 2;
/**
* Payments types
......
protected static $PAYMENT_TYPES = array
(
self::PAYMENT_BY_CREDIT => 'Payment by FreenetIS credit',
self::PAYMENT_BY_CASH => 'Payment by cash'
self::PAYMENT_BY_CASH => 'Payment by cash',
self::PAYMENT_OTHER => 'Other type of payment'
);
/**
......
foreach (self::$PAYMENT_TYPES as $key => $value)
{
if ($key != self::PAYMENT_BY_CREDIT || Settings::get('finance_enabled'))
{
$types[$key] = __($value);
}
}
return $types;

Také k dispozici: Unified diff