Merge branch 'hotfix' of github.com:NETivism/netiCRM into hotfix

NETivism · Sep 16, 2018 · 4bc49aa · 4bc49aa
2 parents 8f4036a + db6f849
commit 4bc49aa
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 37 deletions.
diff --git a/bin/cron/run_participant_processor.inc b/bin/cron/run_participant_processor.inc
@@ -44,9 +44,12 @@ class CRM_ParticipantProcessor
            event.requires_approval
      FROM  civicrm_participant participant
 LEFT JOIN  civicrm_event event ON ( event.id = participant.event_id )
+INNER JOIN civicrm_contact contact ON ( contact.id = participant.contact_id )
     WHERE  participant.status_id IN {$statusIds}
      AND   (event.end_date > now() OR event.end_date IS NULL)
+     AND   (event.start_date > now() OR event.start_date IS NULL)
      AND   event.is_active = 1 
+     AND   contact.is_deleted != 1
  ORDER BY  participant.register_date, participant.id 
 ";
         $dao = CRM_Core_DAO::executeQuery( $query );
@@ -65,7 +68,6 @@ LEFT JOIN  civicrm_event event ON ( event.id = participant.event_id )
         }
 
         if ( !empty( $participantDetails ) ) {
-            /*
             //cron 1. move participant from pending to expire if needed
             foreach ( $participantDetails as $participantId => $values ) {
                 //process the additional participant at the time of
@@ -86,6 +88,9 @@ LEFT JOIN  civicrm_event event ON ( event.id = participant.event_id )
                         $expirationSeconds = CRM_Core_Payment::calcExpirationDate($baseTime, $plusDay);
                         $expirationDay = date('Y-m-d', $expirationSeconds + $paymentOffsetSeconds).' 23:59:59';
                     }
+                    if( strtotime($expirationDay) < strtotime('-3 days')) {
+                        continue;
+                    }
 
                     // expired registration since registration cross allow confirmation time.
                     if ( strtotime($expirationDay) < time()) {
@@ -118,7 +123,6 @@ LEFT JOIN  civicrm_event event ON ( event.id = participant.event_id )
                     }
                 }
             }//cron 1 end. 
-            */
 
             //cron 2. lets move participants from waiting list to pending status
             foreach ( $participantDetails as $participantId => $values ) {

diff --git a/l10n/zh_TW/LC_MESSAGES/civicrm.mo b/l10n/zh_TW/LC_MESSAGES/civicrm.mo
diff --git a/l10n/zh_TW/civicrm.po b/l10n/zh_TW/civicrm.po
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: netiCRM\n"
-"PO-Revision-Date: 2018-09-07 08:10+0000\n"
-"Last-Translator: jimyhuang <jimmy@netivism.com.tw>\n"
+"PO-Revision-Date: 2018-09-15 05:10+0000\n"
+"Last-Translator: Chang Shu-huai <junsuwhy@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/netivism-tw/neticrm/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -46492,7 +46492,7 @@ msgid "Coloane"
 msgstr "路環"
 
 msgid "New Non-Recurring Contribution"
-msgstr "新進定期定額捐款"
+msgstr "新進單筆捐款"
 
 msgid "Draggable"
 msgstr "拖曳"
diff --git a/templates/CRM/Contribute/Page/DashBoard.tpl b/templates/CRM/Contribute/Page/DashBoard.tpl
@@ -51,7 +51,7 @@
           </div>
         </div>
         <div class="chartist">
-        {include file="CRM/common/chartist.tpl" chartist=$chart_this_year}
+          {include file="CRM/common/chartist.tpl" chartist=$chart_this_year}
         </div>
       </div>
     </div>
@@ -247,21 +247,21 @@
         <i class="zmdi zmdi-hc-5x zmdi-money"></i>
         <div> 
           <h5 class="kpi-box-title">{ts}Total Amount{/ts}</h5>
-            <div class="box-detail">
-              <span class="bigger">
-                {$duration_sum|crmMoney}
-              </span>
-              {if $duration_sum_growth}
-                <div>{include file="CRM/common/growth_sentence.tpl" growth=$duration_sum_growth}</div>
-              {/if}
-              {if $debug}
-              <div class="more">
-                <a class="more" href="{crmURL p='civicrm/contribute/search' q="reset=1&force=1&start=`$start_date`&end=`$end_date`&status=1"}">
-                  {ts}more{/ts}
-                </a>
-              </div>
-              {/if}
+          <div class="box-detail">
+            <span class="bigger">
+              {$duration_sum|crmMoney}
+            </span>
+            {if $duration_sum_growth}
+              <div>{include file="CRM/common/growth_sentence.tpl" growth=$duration_sum_growth}</div>
+            {/if}
+            {if $debug}
+            <div class="more">
+              <a class="more" href="{crmURL p='civicrm/contribute/search' q="reset=1&force=1&start=`$start_date`&end=`$end_date`&status=1"}">
+                {ts}more{/ts}
+              </a>
             </div>
+            {/if}
+          </div>
         </div>
       </div>
     </div>
@@ -328,7 +328,6 @@
     </div>
   </div>
 
-
   <div class="col-xs-12 col-md-4">
     <div class="box mdl-shadow--2dp">
       <div class="box-content">
@@ -354,14 +353,15 @@
   <div class="col-xs-12">
     <div class="box mdl-shadow--2dp">
       <div class="box-content">
-      <h3>{ts 1=$days}In %1 days{/ts} {ts}Contribution Amount{/ts}</h3>
-      <div>
-        <div class="chartist">
-        {include file="CRM/common/chartist.tpl" chartist=$chart_duration_sum}
+        <h3>{ts 1=$days}In %1 days{/ts} {ts}Contribution Amount{/ts}</h3>
+        <div>
+          <div class="chartist">
+          {include file="CRM/common/chartist.tpl" chartist=$chart_duration_sum}
+          </div>
+        </div>
+        <div class="more">
+          <a href="{crmURL p='civicrm/contribute/search' q="reset=1&force=1&start=`$start_date`&end=`$end_date`&status=1"}">{ts}more{/ts}</a>
         </div>
-      </div>
-      <div class="more">
-        <a href="{crmURL p='civicrm/contribute/search' q="reset=1&force=1&start=`$start_date`&end=`$end_date`&status=1"}">{ts}more{/ts}</a>
       </div>
     </div>
   </div>
@@ -371,24 +371,26 @@
   <div class="col-xs-12">
     <div class="box mdl-shadow--2dp">
       <div class="box-content">
-      <h3>{ts 1=$days}In %1 days{/ts} {ts}Contribution Page Visits by Traffic Source{/ts}</h3>
-      <div>
-        <div class="chartist">
-        {include file="CRM/common/chartist.tpl" chartist=$chart_duration_track}
+        <h3>{ts 1=$days}In %1 days{/ts} {ts}Contribution Page Visits by Traffic Source{/ts}</h3>
+        <div>
+          <div class="chartist">
+          {include file="CRM/common/chartist.tpl" chartist=$chart_duration_track}
+          </div>
         </div>
       </div>
     </div>
   </div>
 </div>
 
-
+<div class="row">
   <div class="col-xs-12">
     <div class="box mdl-shadow--2dp">
       <div class="box-content">
-      <h3>{ts 1=$days}In %1 days{/ts} {ts}Contribution Amount by Province{/ts}</h3>
-      <div>
-        <div class="chartist">
-        {include file="CRM/common/chartist.tpl" chartist=$chart_duration_province_sum}
+        <h3>{ts 1=$days}In %1 days{/ts} {ts}Contribution Amount by Province{/ts}</h3>
+        <div>
+          <div class="chartist">
+          {include file="CRM/common/chartist.tpl" chartist=$chart_duration_province_sum}
+          </div>
         </div>
       </div>
     </div>