fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 10:41:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Update procPaging() to distinguish mail count from SMS count

Browse source
This commit is contained in:
Kijin Sung 2016-12-14 00:41:51 +09:00
parent b44175aba2
commit 44b9c3d38f
3 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
modules/advanced_mailer/advanced_mailer.admin.view.php
View file

@ -138,7 +138,7 @@ class Advanced_MailerAdminView extends Advanced_Mailer
Context::set('advanced_mailer_log', $maillog); Context::set('advanced_mailer_log', $maillog);
Context::set('advanced_mailer_status', 'success'); Context::set('advanced_mailer_status', 'success');
$paging = $this->procPaging('success', $page); $paging = $this->procPaging('success', 'mail', $page);
Context::set('total_count', $paging->total_count); Context::set('total_count', $paging->total_count);
Context::set('total_page', $paging->total_page); Context::set('total_page', $paging->total_page);
Context::set('page', $paging->page); Context::set('page', $paging->page);
@ -164,7 +164,7 @@ class Advanced_MailerAdminView extends Advanced_Mailer
Context::set('advanced_mailer_log', $maillog); Context::set('advanced_mailer_log', $maillog);
Context::set('advanced_mailer_status', 'error'); Context::set('advanced_mailer_status', 'error');
$paging = $this->procPaging('error', $page); $paging = $this->procPaging('error', 'mail', $page);
Context::set('total_count', $paging->total_count); Context::set('total_count', $paging->total_count);
Context::set('total_page', $paging->total_page); Context::set('total_page', $paging->total_page);
Context::set('page', $paging->page); Context::set('page', $paging->page);
@ -206,7 +206,7 @@ class Advanced_MailerAdminView extends Advanced_Mailer
Context::set('advanced_mailer_log', $smslog); Context::set('advanced_mailer_log', $smslog);
Context::set('advanced_mailer_status', 'success'); Context::set('advanced_mailer_status', 'success');
$paging = $this->procPaging('success', $page); $paging = $this->procPaging('success', 'sms', $page);
Context::set('total_count', $paging->total_count); Context::set('total_count', $paging->total_count);
Context::set('total_page', $paging->total_page); Context::set('total_page', $paging->total_page);
Context::set('page', $paging->page); Context::set('page', $paging->page);
@ -232,7 +232,7 @@ class Advanced_MailerAdminView extends Advanced_Mailer
Context::set('advanced_mailer_log', $smslog); Context::set('advanced_mailer_log', $smslog);
Context::set('advanced_mailer_status', 'error'); Context::set('advanced_mailer_status', 'error');
$paging = $this->procPaging('error', $page); $paging = $this->procPaging('error', 'sms', $page);
Context::set('total_count', $paging->total_count); Context::set('total_count', $paging->total_count);
Context::set('total_page', $paging->total_page); Context::set('total_page', $paging->total_page);
Context::set('page', $paging->page); Context::set('page', $paging->page);
@ -287,11 +287,18 @@ class Advanced_MailerAdminView extends Advanced_Mailer
/** /**
* Process paging. * Process paging.
*/ */
public function procPaging($status, $page = 1) public function procPaging($status, $type, $page = 1)
{ {
$args = new stdClass; $args = new stdClass;
$args->status = $status; $args->status = $status;
$count = executeQuery('advanced_mailer.countLogByType', $args); if ($type === 'mail')
{
$count = executeQuery('advanced_mailer.countMailLogByType', $args);
}
else
{
$count = executeQuery('advanced_mailer.countSMSLogByType', $args);
}
$total_count = $count->data->count; $total_count = $count->data->count;
$total_page = max(1, ceil($total_count / 20)); $total_page = max(1, ceil($total_count / 20));

2
modules/advanced_mailer/queries/countLogByType.xml → modules/advanced_mailer/queries/countMailLogByType.xml
View file

@ -1,4 +1,4 @@
<query id="countLogByType" action="select"> <query id="countMailLogByType" action="select">
<tables> <tables>
<table name="advanced_mailer_log" /> <table name="advanced_mailer_log" />
</tables> </tables>

11
modules/advanced_mailer/queries/countSMSLogByType.xml Normal file
View file

@ -0,0 +1,11 @@
<query id="countSMSLogByType" action="select">
<tables>
<table name="advanced_mailer_sms_log" />
</tables>
<columns>
<column name="count(*)" alias="count" />
</columns>
<conditions>
<condition operation="equal" column="status" var="status" />
</conditions>
</query>