From 10db962246a9d35befa07686b47ef355ac3a58ae Mon Sep 17 00:00:00 2001 From: mnmeyers Date: Mon, 23 Mar 2015 13:35:30 -0700 Subject: [PATCH] fixed #5052 --- db/migrate/000295_order_action.sql | 2 ++ include/library/Cockpit/Order.php | 13 +++++++------ .../cockpit2/frontend/drivers/drivers-order.phtml | 3 ++- 3 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 db/migrate/000295_order_action.sql diff --git a/db/migrate/000295_order_action.sql b/db/migrate/000295_order_action.sql new file mode 100644 index 000000000..95344125c --- /dev/null +++ b/db/migrate/000295_order_action.sql @@ -0,0 +1,2 @@ +ALTER TABLE `order_action` CHANGE `type` `type` +ENUM('delivery-pickedup','delivery-accepted','delivery-rejected','delivery-delivered','delivery-transfered','restaurant-accepted','restaurant-rejected','restaurant-ready', 'delivery-text-5min'); \ No newline at end of file diff --git a/include/library/Cockpit/Order.php b/include/library/Cockpit/Order.php index 5a43e40a7..8c7ba8123 100644 --- a/include/library/Cockpit/Order.php +++ b/include/library/Cockpit/Order.php @@ -215,6 +215,7 @@ class Cockpit_Order extends Crunchbutton_Order { if( $driver ){ $out['driver'] = $driver->exports(); } + $out['hasCustomerBeenTexted5Minutes'] = $this->hasCustomerBeenTexted5Minutes(); return $out; } @@ -242,12 +243,12 @@ class Cockpit_Order extends Crunchbutton_Order { } -// public function hasCustomerBeenTexted5Minutes(){ -// $texts = Order::q( 'SELECT * FROM order_action WHERE `type`="delivery-5-min-text" AND id_order=? limit 1'); -// if ($texts !== null) { -// //what goes inside here? -// } -// } + public function hasCustomerBeenTexted5Minutes(){ + $texts = Order::q( 'SELECT * FROM order_action WHERE `type`="delivery-text-5min" AND id_order=? limit 1',[$this->id_order])->get(0); + if ($texts->id_order) { + return true; + } else return false; + } } \ No newline at end of file diff --git a/include/views/default/cockpit2/frontend/drivers/drivers-order.phtml b/include/views/default/cockpit2/frontend/drivers/drivers-order.phtml index 1a6c7967c..d8bdabec5 100644 --- a/include/views/default/cockpit2/frontend/drivers/drivers-order.phtml +++ b/include/views/default/cockpit2/frontend/drivers/drivers-order.phtml @@ -7,9 +7,10 @@
-
+
+
You have already texted the customer you're 5 min away