413 Commits

Author SHA1 Message Date
arzynik
f4beee09b5 error handling changes 2014-11-10 17:45:04 -08:00
arzynik
2dbb92b781 changed debug stuff 2014-11-10 16:58:35 -08:00
Daniel Camargo
140a369a46 partial #4016 2014-11-10 16:25:01 -02:00
Daniel Camargo
114144ee9f closed #4016 2014-11-10 15:41:25 -02:00
Daniel Camargo
a60fc8347e partial #3925 2014-10-28 11:38:19 -02:00
Daniel Camargo
5270c6c636 partial #3925 2014-10-28 11:34:48 -02:00
arzynik
5ae1554a11 partial #3933 2014-10-27 12:55:25 -07:00
Daniel Camargo
f478fd1636 partial #3848 2014-10-08 16:26:51 -03:00
Daniel Camargo
2717146b21 partial #3552 2014-10-07 14:24:03 -03:00
Daniel Camargo
7e4b25453c partial #3687 2014-09-30 15:27:55 -03:00
arzynik
1e788aec7a fixes #3810 2014-09-30 11:02:31 -07:00
arzynik
d90825e405 Updated code for new twilio library 2014-09-25 15:59:44 -07:00
Daniel Camargo
6c7d106fc0 Issue #3659
Total $$ Texted to Drivers is Wrong!! #3659
2014-09-16 14:23:00 -03:00
kenneth0123
662d0725d2 revenueByAdminPeriod SQL fix 2014-08-14 13:52:37 -07: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
kenneth
c6dab30acd latest changes 7/23 2014-07-23 14:17:12 -07:00
Daniel Camargo
568056ff15 partial: rewards: two way gift cards #2561 2014-07-23 14:34:38 -03:00
Daniel Camargo
7de45d0a4e partial: rewards: two way gift cards #2561 2014-07-23 10:36:47 -03:00
Daniel Camargo
b463d26e76 partial: rewards: two way gift cards #2561 2014-07-22 20:29:07 -03:00
Daniel Camargo
ce7a1683c8 partial: rewards: two way gift cards #2561 2014-07-22 12:12:10 -03:00
Daniel Camargo
faffa21cef rewards: 4x points when ordering 2 days in a row #3434 2014-07-22 09:32:25 -03:00
Daniel Camargo
0f3f94760f rewards: earn points when an order has been placed #2458 2014-07-21 14:07:39 -03:00
Daniel Camargo
6dfe38e00e partial #3427 2014-07-18 17:42:48 -03:00
Daniel Camargo
e384b97b0e partial #3427 - need to review 2014-07-17 18:06:37 -03:00
kenneth
e9172e4218 update 710 2014-07-10 10:18:05 -07:00
kenneth
791df9deb3 commit 7/8 2014-07-08 12:51:58 -07:00
kenneth
eadd3d2997 latest changes as of 7/8 2014-07-08 11:07:21 -07:00
Daniel Camargo
330e14bc3b Merge branch 'refs/heads/master' into ISSUE_2310 2014-07-08 11:04:29 -03:00
Daniel Camargo
44f4960a97 restaurant order placement: new order #3350 2014-07-08 10:37:44 -03:00
Daniel Camargo
e84d3a48ca partial #2310 2014-07-08 10:19:02 -03:00
Daniel Camargo
acab93dca9 restaurant order placement: new order #3350 2014-06-30 12:30:04 -03:00
Daniel Camargo
e6a318d4eb restaurant order placement: new order #3350 2014-06-30 11:58:04 -03:00
Daniel Camargo
14f02a2c4e Auto-Settlement: Driver Pay #3232
- Added option to transfer an order from one driver to another
2014-06-26 17:03:39 -03:00
kenneth
965ade7da7 latest changes 2014-06-17 13:44:17 -07:00
arzynik
abd549dc3c partial #3350
partial #3365
2014-06-17 11:14:34 -07:00
Daniel Camargo
55fb52df21 added the lastStatus date at the order's action api 2014-06-11 16:55:57 -03:00
Daniel Camargo
4ec0f73157 partial #2250 - settlement 2014-06-09 18:07:27 -03:00
Daniel Camargo
6aba4bbfd0 partial 2014-06-06 15:09:55 -03:00
Daniel Camargo
a30a6cabe7 balanced payment changed to work with android plugin 2014-06-02 11:17:00 -03:00
arzynik
56ceef7a7b fixes #3183 fixes #3125 2014-05-13 11:18:00 -07:00
arzynik
802d4e42cb partial #3125 2014-05-13 11:10:20 -07:00
arzynik
abbd718b44 partial #3125 2014-05-09 13:14:10 -07:00
arzynik
5703cade18 partial #3125 2014-05-09 12:51:44 -07:00
arzynik
c819d6d46a partial #3125 2014-05-09 10:46:15 -07:00
arzynik
1792a83913 partial #3125 2014-05-09 08:56:25 -07:00
Daniel Camargo
d933656b40 orders I place paid fully by gift card are still charging my credit card a portion of the order #3140 2014-05-07 17:44:02 -03:00
Daniel Camargo
600513e309 orders at pasta roma (non-3rd party restaurant) are being sent to delivery drivers #3139 2014-05-06 22:02:49 -03:00
Daniel Camargo
0bfa318f36 placed an order, gave me the error saying the app timed out, wasn't sure if it went through #3086 2014-05-05 17:53:06 -03:00
Daniel Camargo
c997238c74 driver dumbphone tweaks #2673 2014-04-22 12:42:56 -03:00
Daniel Camargo
08243230ef the restaurant asked crunchbutton to call it, stop sending confirmations call - See #2848 2014-04-17 17:19:18 -03:00