Daniel Camargo
|
cb9eea4608
|
closed #4004
|
2014-11-20 11:01:18 -02:00 |
|
arzynik
|
1f7501417b
|
test
|
2014-11-17 20:28:49 -08:00 |
|
Daniel Camargo
|
2a27ebaf23
|
Big Payment Mess #4055
|
2014-11-17 18:38:01 -02:00 |
|
Daniel Camargo
|
ea6733c3fe
|
Merge branch 'master' of https://github.com/crunchbutton/crunchbutton
Conflicts:
include/library/Crunchbutton/Order/Status.php
|
2014-11-17 15:22:16 -02:00 |
|
Daniel Camargo
|
deea4e8d17
|
fixed delivery status issue
|
2014-11-17 15:19:13 -02:00 |
|
arzynik
|
59287de2fe
|
fixed additional status things
|
2014-11-15 16:06:42 -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
|
1103bbdaad
|
changed the way delivery status works
|
2014-11-14 16:39:46 -08:00 |
|
arzynik
|
4d61724f99
|
fixed demo order issue
|
2014-11-12 11:28:27 -08:00 |
|
arzynik
|
0ec6aad369
|
fixed price issue
|
2014-11-10 20:43:51 -08:00 |
|
arzynik
|
82f782ca77
|
attempt to fix
|
2014-11-10 20:34:08 -08:00 |
|
arzynik
|
9f8bf41250
|
refund tweaks. fixes #4016
|
2014-11-10 20:25:10 -08:00 |
|
arzynik
|
d45490dc07
|
partial #4016
|
2014-11-10 19:58:25 -08:00 |
|
arzynik
|
98b3ced397
|
added partial refund detection
|
2014-11-10 19:45:31 -08:00 |
|
arzynik
|
16c38e5da3
|
debugning amount issues
|
2014-11-10 17:52:29 -08:00 |
|
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 |
|