103 Commits

Author SHA1 Message Date
Daniel Camargo
6bd12d7a42 partial #3992 2014-12-01 21:01:02 -02:00
Daniel Camargo
e1c03e5706 partial #3991 2014-12-01 19:26:41 -02:00
Daniel Camargo
6b791c14b4 partial #4158 2014-12-01 15:51:16 -02:00
Devin Smith
f6c673bee6 added mapview and order lat lon tracking 2014-11-30 14:13:48 -08:00
Devin Smith
762010862c changed around event system to work better 2014-11-29 22:35:22 -08:00
Devin Smith
5686989187 fixed some event stuff 2014-11-29 20:11:33 -08:00
Devin Smith
d763fa2251 added real time updates for deploy version ctrl 2014-11-29 19:06:35 -08:00
Daniel Camargo
098b880fc5 partial #3991 2014-11-27 03:58:45 -02:00
Daniel Camargo
da75316b90 partial #3991 2014-11-27 02:30:01 -02:00
Devin Smith
525e9976e0 fixed bundle issues 2014-11-25 10:50:09 -08:00
Devin Smith
73bfdd4d30 updated docs page to be a little prettier 2014-11-24 19:15:59 -08:00
Devin Smith
883ccd8754 fixed shifts timezone issue 2014-11-24 16:50:27 -08:00
Devin Smith
6e3e36279d order eta stuff 2014-11-24 13:47:04 -08:00
Daniel Camargo
c6443fa01e Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2014-11-24 17:53:14 -02:00
Devin Smith
ddcba3780d added functions and endpoints to calculate an eta based on google maps 2014-11-24 11:23:58 -08:00
Daniel Camargo
2109468ca0 partial #3849 2014-11-24 16:51:18 -02:00
Devin Smith
68c841b2c3 added buggy driver maps 2014-11-21 19:12:17 -08:00
Devin Smith
321adcf290 fixes #4077 2014-11-21 15:48:56 -08:00
Daniel Camargo
26b5f0d96e partial #3909 2014-11-21 18:08:37 -02:00
Daniel Camargo
83ea0e0241 partial #3909 2014-11-21 17:55:28 -02:00
Daniel Camargo
bbeb544783 partial #3975 2014-11-21 14:33:15 -02:00
Daniel Camargo
df4f3a719f partial #3975 2014-11-21 13:56:59 -02:00
Devin Smith
721efdc95d added basic order and staff view 2014-11-20 10:25:52 -08:00
Daniel Camargo
b76a8a47bc partial #3905 2014-11-19 19:42:59 -02:00
Devin Smith
cdbcce9d3e added travis deploy support
partial #3787
2014-11-18 18:00:30 -08:00
Devin Smith
ad84f673f7 changed deploy links to permalinks 2014-11-18 16:33:20 -08:00
Devin Smith
41e8600690 more deployment changes
partial #3787
added support for deployment to any repo path.
added tagging system
2014-11-18 16:08:23 -08:00
arzynik
e13ad9b8d2 allow live deploy 2014-11-16 11:09:07 -08:00
arzynik
e5717ef9e9 EXPERIMENTAL order status changes
changed how we get and manage the status of orders and order actions. please be careful as this might break both cockpit.la, cbtn.io, and settlement
2014-11-15 15:14:09 -08:00
arzynik
1c83cd5f76 minor support changes 2014-11-15 12:28:47 -08:00
arzynik
d327eb331f added driver phone 2014-11-14 18:45:43 -08:00
arzynik
8ba7d748b8 added driver deliveries function 2014-11-14 18:10:47 -08:00
arzynik
05c5cb9dbc partial #3787 2014-11-13 14:15:25 -08:00
arzynik
b5e42b18ad partial #3787 2014-11-13 13:52:35 -08:00
arzynik
6f41b7cb0f partial #3787 2014-11-13 13:02:04 -08:00
Daniel Camargo
464ca2789b partial #4055 2014-11-11 20:00:49 -02:00
Daniel Camargo
6dfbc93df2 partial #3930 2014-10-29 19:20:14 -02:00
Daniel Camargo
9abee1ee2b partial #3879 2014-10-27 14:39:03 -02:00
Daniel Camargo
e8bf066660 partial #3886 2014-10-21 18:55:54 -02:00
Daniel Camargo
ff34c7288d partial ##3714 2014-10-07 23:14:57 -03:00
Daniel Camargo
425bd3b2ea partial #3545 2014-10-06 11:16:56 -03:00
Daniel Camargo
5e2c93cd5d partial 2014-10-06 10:33:58 -03:00
arzynik
d90825e405 Updated code for new twilio library 2014-09-25 15:59:44 -07:00
Daniel Camargo
2590bb92df partial #3727
Driver Settlement: Critical Formatting Changes #3727
2014-09-24 14:59:57 -03:00
Daniel Camargo
a8a778a6d7 partial #3727
Driver Settlement: Critical Formatting Changes #3727
2014-09-24 13:56:37 -03:00
Daniel Camargo
e3392ae120 partial #3726 2014-09-19 15:01:28 -03:00
Daniel Camargo
d266d715e9 partial #3562
See Restaurants With No Payment Method
2014-09-11 16:07:26 -03:00
Daniel Camargo
b672f9bfa5 partial #3562
See Restaurants With No Payment Method #3562
2014-09-11 14:20:13 -03:00
Daniel Camargo
2ddd9ea1fc Checklist for AFTER new settlement is deployed #3603
script to send email and sms
2014-09-03 00:25:04 -03:00
Daniel Camargo
f629148e75 Merge branch 'master' into reward_points
Conflicts:
	include/views/default/cockpit2/frontend/drivers/drivers-order.phtml
	www/assets/cockpit/scss/cockpit.scss
2014-07-30 15:59:43 -03:00