From 142adaae4dc9af2e2725330e40c0cb6d20aa1020 Mon Sep 17 00:00:00 2001 From: Daniel Camargo Date: Fri, 7 Mar 2014 16:37:15 -0300 Subject: [PATCH 1/3] delivery driver order list #2431 - added a link at the order page --- include/views/default/quick/layout/html.phtml | 7 +++++++ include/views/default/quick/order/index.phtml | 11 +++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/include/views/default/quick/layout/html.phtml b/include/views/default/quick/layout/html.phtml index 1adc6eafc..e2b21d339 100644 --- a/include/views/default/quick/layout/html.phtml +++ b/include/views/default/quick/layout/html.phtml @@ -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%); diff --git a/include/views/default/quick/order/index.phtml b/include/views/default/quick/order/index.phtml index cb4fe1907..ef2eec652 100644 --- a/include/views/default/quick/order/index.phtml +++ b/include/views/default/quick/order/index.phtml @@ -1,4 +1,4 @@ - +
@@ -500,4 +500,11 @@ } ); - \ No newline at end of file + +
+
+
+ +
\ No newline at end of file From 18cfdbe01463545f5e0ebf21e61429d7014736dc Mon Sep 17 00:00:00 2001 From: Daniel Camargo Date: Fri, 7 Mar 2014 16:43:18 -0300 Subject: [PATCH 2/3] delivery driver order list #2431 - removed the limit --- include/library/Crunchbutton/Order.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/library/Crunchbutton/Order.php b/include/library/Crunchbutton/Order.php index 4f46cd878..2db2d636f 100644 --- a/include/library/Crunchbutton/Order.php +++ b/include/library/Crunchbutton/Order.php @@ -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 ); } From c25b0090af0d5b8f6842d77d12f439096bc85c2c Mon Sep 17 00:00:00 2001 From: Daniel Camargo Date: Fri, 7 Mar 2014 16:43:18 -0300 Subject: [PATCH 3/3] delivery driver order list #2431 - changed the default to 12 hours --- include/controllers/default/quick/home/index.php | 2 +- include/library/Crunchbutton/Order.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/controllers/default/quick/home/index.php b/include/controllers/default/quick/home/index.php index 281484966..9ed44ef4b 100644 --- a/include/controllers/default/quick/home/index.php +++ b/include/controllers/default/quick/home/index.php @@ -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' ) ); diff --git a/include/library/Crunchbutton/Order.php b/include/library/Crunchbutton/Order.php index 4f46cd878..2db2d636f 100644 --- a/include/library/Crunchbutton/Order.php +++ b/include/library/Crunchbutton/Order.php @@ -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 ); }