Merge branch 'master' of https://github.com/maxious/ACTBus-ui
Conflicts:
include/common-template.inc.php
--- a/include/common-template.inc.php
+++ b/include/common-template.inc.php
@@ -188,9 +188,8 @@
</div><!-- /header -->
<a name="maincontent" id="maincontent"></a>
<div data-role="content"> ';
- if (!$_SESSION['service_id']) {
- $overrides = getServiceOverride();
- if ($overrides['service_id']) {
+ $overrides = getServiceOverride();
+ if ($overrides['service_id']) {
if ($overrides['service_id'] == "noservice") {
echo '<div id="servicewarning">Buses are <strong>not running today</strong> due to industrial action/public holiday. See <a
href="http://www.action.act.gov.au">http://www.action.act.gov.au</a> for details.</div>';
--- a/labs/mywaybalance.php
+++ b/labs/mywaybalance.php
@@ -27,11 +27,14 @@
else {
echo "<h2>Balance: " . $return['myway_carddetails']['Card Balance'] . "</h2>";
echo '<ul data-role="listview" data-inset="true"><li data-role="list-divider"> Recent Transactions </li>';
+ $txCount=0;
foreach ($return['myway_transactions'] as $transaction) {
echo "<li><b>" . $transaction["Date / Time"] . "</b>";
echo "<br><small>" . $transaction["TX Reference No / Type"] . "</small>";
echo '<p class="ui-li-aside">' . $transaction["TX Amount"] . '</p>';
echo "</li>";
+ $txCount++;
+ if ($txCount > 10) break;
}
echo "</ul>";
}