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
|
396bc64908
|
orders fix
|
2014-11-16 14:11:23 -08:00 |
|
arzynik
|
59287de2fe
|
fixed additional status things
|
2014-11-15 16:06:42 -08:00 |
|
arzynik
|
acf0a1d5fd
|
fixed rejected from showing
|
2014-11-15 15:53:22 -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
|
d90825e405
|
Updated code for new twilio library
|
2014-09-25 15:59:44 -07:00 |
|
Daniel Camargo
|
ff8831e5e3
|
partial ##3727
Driver Settlement: Critical Formatting Changes #3727
Items: 1, 2 and 3
|
2014-09-22 15:44:56 -03:00 |
|
kenneth
|
e9172e4218
|
update 710
|
2014-07-10 10:18:05 -07:00 |
|
Daniel Camargo
|
5a8d6c32cc
|
avg minutes to delivery orders per shift / orders delivered per shift
|
2014-07-08 15:26:35 -03:00 |
|
Daniel Camargo
|
7f9af4ea71
|
avg minutes to delivery orders per shift / orders delivered per shift
|
2014-07-08 15:18:54 -03:00 |
|
Daniel Camargo
|
e84d3a48ca
|
partial #2310
|
2014-07-08 10:19:02 -03:00 |
|
Daniel Camargo
|
4a72fa7521
|
Driver Settlement - #3232
|
2014-07-01 18:47: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 |
|
Daniel Camargo
|
d1c4780c90
|
partial settlement #2250
- payment schedule
- payment status
- payment status:error
- payment order_transaction stuff
|
2014-06-16 13:00:49 -03:00 |
|
Daniel Camargo
|
028db60b2d
|
partial settlement #2250
- payment schedule
- option to reimburse cash orders
|
2014-06-16 10:25:20 -03:00 |
|
Daniel Camargo
|
6a7d174f69
|
partial #2969 - option to play with the order 16844
|
2014-05-19 11:54:33 -03:00 |
|
arzynik
|
802d4e42cb
|
partial #3125
|
2014-05-13 11:10:20 -07:00 |
|
Daniel Camargo
|
97985a502b
|
problem on "deliveries" page of cockpit when driver confirms, then rejects an order #2993
|
2014-04-15 09:28:11 -03:00 |
|
arzynik
|
6c5ffd4ea6
|
partial #2749
|
2014-03-26 22:30:02 -07:00 |
|
Daniel Camargo
|
0cb6f34c21
|
allow PST times on /drivers/deliveries #2474
|
2014-03-11 13:50:25 -03:00 |
|
Daniel Camargo
|
f8a128686e
|
final adjustments - ready to test on beta
|
2014-02-26 17:35:19 -03:00 |
|
Daniel Camargo
|
9175d81a53
|
partial #2404 - delivery driver admin could not access cbtn.io orders
|
2014-02-17 09:43:30 -03:00 |
|
Daniel Camargo
|
7a99cd5e83
|
partial #2385
|
2014-02-14 16:47:21 -02:00 |
|
Daniel Camargo
|
c8e23f0cd9
|
partial #2387
|
2014-02-14 12:19:24 -02:00 |
|
Daniel Camargo
|
230a9d5292
|
partial #2218 - see which delivery driver "admin" accepts and completes which orders
|
2014-02-05 20:56:55 -02:00 |
|
Daniel Camargo
|
36151fbd5f
|
Added a verification at gift card rules to check if the user is a rep user
|
2014-01-22 00:47:41 -02:00 |
|
Daniel Camargo
|
b728c73e71
|
partial #2220 - Add Fields to Excel Exporter for Payment Overhaul
|
2013-12-10 09:11:30 -02:00 |
|
Daniel Camargo
|
619eb54687
|
partial #2212 - change gift card alerts to use new db group
|
2013-12-04 20:01:07 -02:00 |
|
Daniel Camargo
|
70f1197034
|
partial #2212 - change gift card alerts to use new db group
|
2013-12-04 19:55:30 -02:00 |
|
Daniel Camargo
|
2386805b18
|
partial #2143 - cron to renotivy reps if no one accepts
|
2013-11-22 14:27:42 -02:00 |
|
arzynik
|
6eea1934df
|
fixes crunchbutton/issues#3
|
2013-11-20 21:04:50 -08:00 |
|
pererinha
|
85ade692e7
|
remove the monitor notification (rules) to be sent from dev
|
2013-11-14 16:35:41 -02:00 |
|
Daniel Camargo
|
273e371974
|
partial #2023 - Notifiy an email and/or phone number by text when someone places an order with a particular name or phone number
|
2013-11-08 17:52:02 -02:00 |
|
Daniel Camargo
|
24bd23ac22
|
partial #2023 - Notifiy an email and/or phone number by text when someone places an order with a particular name or phone number
|
2013-11-08 17:40:49 -02:00 |
|
Daniel Camargo
|
f251968779
|
partial #2006 - fixed the support message
|
2013-11-07 15:32:39 -02:00 |
|
Daniel Camargo
|
b472cb0609
|
partial #2006 - changed the gift card message
|
2013-11-07 15:16:30 -02:00 |
|
Daniel Camargo
|
a9894c2eff
|
partial #2006 - alert Nick and David if a user places 2 or more orders in a row
|
2013-11-07 13:30:19 -02:00 |
|
Daniel Camargo
|
a748177e96
|
partial #2006 - alert Nick and David if a user places 2 or more orders in a row
|
2013-11-06 18:19:29 -02:00 |
|
Daniel Camargo
|
c659d555b7
|
partial #1494
|
2013-07-12 14:12:27 -03:00 |
|
Daniel Camargo
|
dca0948785
|
partial #383
|
2013-04-24 14:44:23 -03:00 |
|
arzynik
|
5c27f91adf
|
data structure refactor
|
2012-07-28 11:30:26 -07:00 |
|