Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 972

Přidáno uživatelem Michal Kliment před více než 13 roky(ů)

Pridani ikon pro rychlejsi pridavani komentaru k platbam a platby hotove primo z profilu clena.

Zobrazit rozdíly:

freenetis/trunk/kohana/application/helpers/callback.php
echo "<span". ((isset($color)) ? " style='color:$color'" : "") . ">$balance</span>";
if (isset($item->a_comment) && $item->a_comment != '')
echo "<span class='help' title='".$item->a_comment."'><img src='".url::base()."media/images/icons/comment.png'></span>";
if (isset($item->member_id) && $item->member_id != 1)
echo ' '.html::anchor (url_lang::base() . (($item->a_comments_thread_id) ? 'comments/add/'.$item->a_comments_thread_id : 'comments_threads/add/account/'.$item->aid), html::image(array('src' => url::base().'media/images/ico_add.gif')), array('title' => url_lang::lang('texts.Add comment')));
}
/**
freenetis/trunk/kohana/application/models/member.php
$where = ($where!='') ? 'WHERE '.$where : '';
return $this->db->query("
SELECT id, registration, name, street, street_number, town, quarter, variable_symbol, aid, balance, redirect, GROUP_CONCAT(a_comment SEPARATOR ', \n\n') AS a_comment FROM
SELECT id, id AS member_id, registration, name, street, street_number, town, quarter, variable_symbol, aid, balance, redirect, GROUP_CONCAT(a_comment SEPARATOR ', \n\n') AS a_comment, a_comments_thread_id FROM
(
SELECT
m.id, m.registration, m.name,
s.street, ap.street_number, t.town, t.quarter,
m.variable_symbol, a.id AS aid,
a.balance,
m.redirect, CONCAT(u.surname,' ',u.name,' (',SUBSTRING(c.datetime,1,10),'):\n',c.text) AS a_comment
m.redirect, CONCAT(u.surname,' ',u.name,' (',SUBSTRING(c.datetime,1,10),'):\n',c.text) AS a_comment,
a.comments_thread_id AS a_comments_thread_id
FROM members m
LEFT JOIN address_points ap ON m.address_point_id = ap.id
LEFT JOIN streets s ON ap.street_id = s.id
freenetis/trunk/kohana/application/models/account.php
SELECT q1.*, IFNULL(SUM(amount), 0) AS inbound
FROM
(
SELECT a.id, a.name, a.account_attribute_id,
SELECT a.id, a.id AS aid, a.name, a.account_attribute_id,
m.name AS member_name, m.id AS member_id,
IFNULL(SUM(amount), 0) AS outbound
IFNULL(SUM(amount), 0) AS outbound,
a.comments_thread_id AS a_comments_thread_id
FROM accounts a
LEFT JOIN members m ON m.id = a.member_id
LEFT JOIN transfers t1 ON a.id = t1.origin_id $datetime_from_t1 $datetime_to_t1
......
return $this->db->query("UPDATE accounts SET balance = '$balance' WHERE id = $account_id");
}
public function get_comments ()
{
$result = $this->db->query("
SELECT GROUP_CONCAT(comment SEPARATOR ', \n\n') AS comment FROM
(
SELECT a.id, CONCAT(u.surname,' ',u.name,' (',SUBSTRING(c.datetime,1,10),'):\n',c.text) AS comment
FROM accounts a
JOIN comments c ON a.comments_thread_id = c.comments_thread_id
JOIN users u ON c.user_id = u.id
WHERE a.member_id = ? AND a.account_attribute_id = ?
ORDER BY c.datetime DESC
) AS q
GROUP BY q.id
", array($this->member_id, $this->account_attribute_id))->current();
return ($result) ? $result->comment: '';
}
}
?>
freenetis/trunk/kohana/application/controllers/transfers.php
$db->transaction_rollback();
$this->session->set_flash('message', url_lang::lang('texts.Error - cant add new transfer.'));
}
url::redirect(url_lang::base().'transfers/show_by_account/'.$credit->id);
//url::redirect(url_lang::base().'transfers/show_by_account/'.$credit->id);
url::redirect(Path::instance()->previous()->current());
}
else
{
freenetis/trunk/kohana/application/controllers/comments.php
if (!$this->acl_check_view ('Members_Controller','comment',$parent->member_id))
Controller::error (ACCESS);
$link_back_url = url_lang::base().'transfers/show_by_account/'.$parent->id;
if (url::slice(url_lang::uri(Path::instance()->previous()->current()),0,1) == 'comments_threads')
Path::instance()->previous();
//$link_back_url = url_lang::base().'transfers/show_by_account/'.$parent->id;
$link_back_url = Path::instance()->current();
$breadcrumbs[] = html::anchor (url_lang::base().'members/show_all', url_lang::lang('texts.Members'));
$breadcrumbs[] = html::anchor(url_lang::base().'members/show/'.$parent->member_id,"ID ".$parent->member->id." - ".$parent->member->name);
$breadcrumbs[] = html::anchor ($link_back_url, url_lang::lang('texts.Transfers'));
freenetis/trunk/kohana/application/views/members_show.php
</tr>
<tr>
<th><?php echo url_lang::lang('texts.Current credit').'&nbsp;'.help::hint('current_credit') ?></th>
<td><?php echo number_format((float) $account->balance, 2, ',', ' ').' '.$this->settings->get('currency') ?></td>
<td>
<span title="<?php echo $account->get_comments() ?>"><?php echo number_format((float) $account->balance, 2, ',', ' ').' '.$this->settings->get('currency') ?></span>
<?php
if ($this->acl_check_new('Accounts_Controller', 'transfers'))
echo html::anchor(url_lang::base().'transfers/add_member_fee_payment_by_cash/'.$member->id, html::image(array('src' => url::base().'media/images/icons/purse.png')), array('title' => url_lang::lang('texts.Add member fee payment by cash')));
if ($this->acl_check_view ('Members_Controller','comment',$member->id))
echo html::anchor(($account->comments_thread_id ? (url_lang::base().'comments/add/'.$account->comments_thread_id) : (url_lang::base().'comments_threads/add/account/'.$account->id)), html::image(array('src' => url::base().'media/images/icons/comment_add.png')), array('title' => url_lang::lang('texts.Add comment'))) ?>
</td>
</tr>
<?php if (isset($expiration_date)) { ?>
<tr>

Také k dispozici: Unified diff