1763 Commits

Author SHA1 Message Date
Devin Smith
6204686213 #4160 2014-11-22 11:44:25 -08: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
2f78360bb3 added customers and customer page 2014-11-20 15:47:17 -08:00
Devin Smith
721efdc95d added basic order and staff view 2014-11-20 10:25:52 -08:00
Daniel Camargo
cb9eea4608 closed #4004 2014-11-20 11:01:18 -02:00
Daniel Camargo
9bd4a4f771 closed #3901 2014-11-19 20:11:42 -02:00
Daniel Camargo
b76a8a47bc partial #3905 2014-11-19 19:42:59 -02:00
Devin Smith
6dda2e3de4 lots of staff page changes
partial #4116
2014-11-19 12:16:55 -08:00
Daniel Camargo
1cdb089011 closed #4121 2014-11-19 15:50:44 -02:00
Daniel Camargo
ccf1d647a7 closed #3714 2014-11-19 13:35:24 -02:00
Devin Smith
3e5a776106 fixed host callback issue 2014-11-18 20:19:50 -08:00
Devin Smith
fb2e002126 fixes #4129 2014-11-18 20:05:10 -08: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
52ababd2dc added phaxio test notification 2014-11-18 14:37:39 -05:00
arzynik
1f7501417b test 2014-11-17 20:28:49 -08:00
Daniel Camargo
cb99d893e9 partial #4017 2014-11-17 19:32:38 -02:00
arzynik
d1a5f17eb0 Merge branch 'master' of github.com:crunchbutton/crunchbutton 2014-11-17 12:56:15 -08:00
arzynik
2b06022279 fixed debug email 2014-11-17 12:56:07 -08:00
Daniel Camargo
7e7fbc1171 partial #4055 2014-11-17 18:53:26 -02:00
Daniel Camargo
4a84a4b1f5 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2014-11-17 18:38:07 -02:00
Daniel Camargo
2a27ebaf23 Big Payment Mess #4055 2014-11-17 18:38:01 -02:00
arzynik
03ea588bca converted to mailgun
fixes #2065
2014-11-17 11:46:53 -08: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
10447e9ade fixed path issue 2014-11-16 20:44:12 -08:00
arzynik
bb66ec9173 log phaxio error data 2014-11-16 20:36:09 -08:00
arzynik
396bc64908 orders fix 2014-11-16 14:11:23 -08:00
arzynik
45ccffbe07 fixes #4123 2014-11-16 13:19:52 -08:00
arzynik
e13ad9b8d2 allow live deploy 2014-11-16 11:09:07 -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
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
1103bbdaad changed the way delivery status works 2014-11-14 16:39:46 -08:00
arzynik
60c551fd2f updated twilio test 2014-11-14 14:23:41 -08:00
arzynik
a5f9cfa537 updated twilio library 2014-11-14 14:23:30 -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
arzynik
b08daa9da0 realtime preference sync 2014-11-13 10:36:34 -08:00
arzynik
4d61724f99 fixed demo order issue 2014-11-12 11:28:27 -08:00