7 Commits

Author SHA1 Message Date
Daniel Camargo
de323d8621 partial #4285 2014-12-29 19:43:57 -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
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