sharpetronics/crunchbutton
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:crunchbutton/crunchbutton

Browse Source
This commit is contained in:
arzynik 2014-03-07 12:02:57 -08:00
commit 3e62c945bc
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/controllers/default/quick/home/index.php
View File

@ -25,7 +25,7 @@ class Controller_home extends Crunchbutton_Controller_Account {
$justMineOrders = ( c::db()->escape( c::getPagePiece( 0 ) ) == 'mine' );
$hours = c::getPagePiece( 1 ) ? c::getPagePiece( 1 ) : 24;
$hours = c::getPagePiece( 1 ) ? c::getPagePiece( 1 ) : 12;
$orders = Order::deliveryOrders( $hours, ( c::db()->escape( c::getPagePiece( 0 ) ) == 'all' ) );

2
include/library/Crunchbutton/Order.php
View File

@ -717,7 +717,7 @@ class Crunchbutton_Order extends Cana_Table {
$where .= ' AND o.delivery_service = 1 ';
$where .= ' AND date > DATE_SUB( NOW(), INTERVAL ' . $interval . ' )';
$query = 'SELECT DISTINCT( o.id_order ) id, o.* FROM `order` o ' . $where . ' ORDER BY o.id_order DESC LIMIT 30';
$query = 'SELECT DISTINCT( o.id_order ) id, o.* FROM `order` o ' . $where . ' ORDER BY o.id_order';
return Order::q( $query );
}

7
include/views/default/quick/layout/html.phtml
View File

@ -45,6 +45,13 @@ input[type="submit"]::-moz-focus-inner, input[type="button"]::-moz-focus-inner,
font-size: 10px;
}
}
.show-more{
font-size: 1.5em;
background: #F5F5F5;
}
.show-more a{
text-decoration: none;
}
.control {
background-image: -moz-linear-gradient( 90deg, rgb(203,203,203) 0%, rgb(232,232,232) 100%);

11
include/views/default/quick/order/index.phtml
View File

@ -1,4 +1,4 @@
<div class="control top-bar">
<div class="wrap order-status-init">
<div class="status-control control-accept-reject">
@ -500,4 +500,11 @@
} );
</script>
</script>
<br/>
<br/>
<div>
<div class="wrap show-more">
<b><a href="/">Show more orders</a></b>
</div>
</div>