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

fixed #5052

Browse Source
This commit is contained in:
mnmeyers 2015-03-23 13:35:30 -07:00
parent d8a6453f4b
commit 10db962246
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/migrate/000295_order_action.sql Normal file
View File

@ -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');

13
include/library/Cockpit/Order.php
View File

@ -215,6 +215,7 @@ class Cockpit_Order extends Crunchbutton_Order {
if( $driver ){ if( $driver ){
$out['driver'] = $driver->exports(); $out['driver'] = $driver->exports();
} }
$out['hasCustomerBeenTexted5Minutes'] = $this->hasCustomerBeenTexted5Minutes();
return $out; return $out;
} }
@ -242,12 +243,12 @@ class Cockpit_Order extends Crunchbutton_Order {
} }
// public function hasCustomerBeenTexted5Minutes(){ public function hasCustomerBeenTexted5Minutes(){
// $texts = Order::q( 'SELECT * FROM order_action WHERE `type`="delivery-5-min-text" AND id_order=? limit 1'); $texts = Order::q( 'SELECT * FROM order_action WHERE `type`="delivery-text-5min" AND id_order=? limit 1',[$this->id_order])->get(0);
// if ($texts !== null) { if ($texts->id_order) {
// //what goes inside here? return true;
// } } else return false;
// } }
} }

3
include/views/default/cockpit2/frontend/drivers/drivers-order.phtml
View File

@ -7,9 +7,10 @@
<div ng-if="oc.order.status.status != 'accepted' && oc.order.status.status != 'delivered' && oc.order.status.status != 'rejected' && oc.order.status.driver.id_admin == account.user.id_admin"> <div ng-if="oc.order.status.status != 'accepted' && oc.order.status.status != 'delivered' && oc.order.status.status != 'rejected' && oc.order.status.driver.id_admin == account.user.id_admin">
<div ng-show="!text_customer_5_min_away_sending"> <div ng-show="!text_customer_5_min_away_sending" ng-if="!hasCustomerBeenTexted5Minutes">
<button ng-click="oc.text_customer_5_min_away()" class="button orange-on-orange">Text Customer I'm 5 Min Away</button> <button ng-click="oc.text_customer_5_min_away()" class="button orange-on-orange">Text Customer I'm 5 Min Away</button>
</div> </div>
<div ng-if="hasCustomerBeenTexted5Minutes">You have already texted the customer you're 5 min away</div>
<div ng-show="text_customer_5_min_away_sending"> <div ng-show="text_customer_5_min_away_sending">
<button class="button orange-on-orange"> <button class="button orange-on-orange">
<i class="fa fa-circle-o-notch fa-spin"></i> Sending <i class="fa fa-circle-o-notch fa-spin"></i> Sending