Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 553f6c7c

Přidáno uživatelem Ondřej Fibich před asi 9 roky(ů)

Merge TB chages to Bank_Statement_File_Import.

Zobrazit rozdíly:

application/libraries/Bank_Statement_File_Importer.php
}
// obtain driver
$driver = self::factory($bank_account, $type);
$driver = self::factory($bank_account, $type, $user_id);
$acc = $bank_account->account_nr . '/' . $bank_account->bank_nr;
if (!$driver)
......
// import
return self::import_loaded($bank_account, $file_data, $url, $type,
$send_emails, $send_sms);
$user_id, $send_emails, $send_sms);
}
/**
......
}
return self::import_loaded($bank_account, $fd, $filename, $ext,
$send_emails, $send_sms);
$user_id, $send_emails, $send_sms);
}
/**
......
* @param string $file_data Content to import
* @param string $filename Full path to imported file (for error messages)
* @param string $ext File extension
* @param integer $user_id ID of calle user
* @param boolean $send_emails Send notification of affected members by e-mail
* @param boolean $send_sms Send notification of affected members by sms
* @return Bank_statement_Model Stored statement
......
* @throws Exception On any error during parsing or storing of statement
*/
private static function import_loaded(Bank_account_Model $bank_account,
$file_data, $filename, $ext, $send_emails = TRUE, $send_sms = FALSE)
$file_data, $filename, $ext, $user_id, $send_emails = TRUE,
$send_sms = FALSE)
{
/* obtain driver */
$driver = self::factory($bank_account, $ext);
$driver = self::factory($bank_account, $ext, $user_id);
$acc = $bank_account->account_nr . '/' . $bank_account->bank_nr;

Také k dispozici: Unified diff