Revize 1697
Přidáno uživatelem Ondřej Fibich před asi 12 roky(ů)
| freenetis/trunk/kohana/application/models/town.php | ||
|---|---|---|
|
}
|
||
|
else if (empty($zip_code))
|
||
|
{
|
||
|
$zip_code_where = ' AND zip_code IS NULL';
|
||
|
$zip_code_where = ' AND (zip_code IS NULL OR LENGTH(zip_code) = 0)';
|
||
|
}
|
||
|
else
|
||
|
{
|
||
| ... | ... | |
|
|
||
|
if (empty($quarter))
|
||
|
{
|
||
|
$quarter_where = ' AND quarter IS NULL';
|
||
|
$quarter_where = ' AND (quarter IS NULL OR LENGTH(quarter) = 0)';
|
||
|
}
|
||
|
else
|
||
|
{
|
||
|
$quarter_where = ' AND LOWER(quarter) = ' . $this->db->escape(strtolower($quarter));
|
||
|
$quarter_where = ' AND LOWER(quarter) = ' . $this->db->escape(strtolower($quarter));
|
||
|
}
|
||
|
|
||
|
$towns = $this->db->query("
|
||
| freenetis/trunk/kohana/application/controllers/transfers.php | ||
|---|---|---|
|
$db->transaction_start();
|
||
|
foreach ($credit_accounts as $ca)
|
||
|
{
|
||
|
// if member is not member yet, then no deduct is made (fixes #324)
|
||
|
if (empty($ca->entrance_date) || ($ca->entrance_date == '0000-00-00'))
|
||
|
continue;
|
||
|
// if member's entrance fee is 0, then no transfer is generated
|
||
|
if ($ca->entrance_fee == 0)
|
||
|
continue;
|
||
Také k dispozici: Unified diff
MERGE do trunku
Opravy:
- uprava vyhledavani mest v Town_Model#get_town
- #324: pokud nema clen nastaven entrance_date, neni mu vstupni prizpevek strhnut