527 Commits

Author SHA1 Message Date
Daniel Camargo
2417736295 #1101 (gift card changes)
- Developed the track gift card feature.
2013-05-08 12:34:44 -03:00
Daniel Camargo
85b69ef394 #1101 (gift card changes)
- Fixed some bugs i've found when I was testing.
- Changed the restaurant's admin page to add the field to inform if the restaurant allows gift .
- Changed the front end to accept the gift card generic just if the restaurant allows it.
2013-05-07 11:49:04 -03:00
Daniel Camargo
061e453dec #1101 - Changed the feature that debits the user's credit. 2013-05-07 08:52:17 -03:00
Daniel Camargo
fd323570f0 partial #1101
Feature to create a gift card that could be used at any restaurant.
Feature to create a credit that could be used at any restaurant.
2013-05-06 17:43:29 -03:00
Daniel Camargo
4c5e841f88 partial #1196 2013-05-06 15:07:28 -03:00
Daniel Camargo
29a1dccae7 #1101 (gift card changes) - Feature to redeem the code at the notes field - testing at beta 2013-05-06 13:26:24 -03:00
Daniel Camargo
0a94f58e8c partial #1131 2013-05-02 14:47:15 -03:00
Daniel Camargo
b6dc06726f #1049 - removed the tests 2013-05-02 12:28:49 -03:00
Daniel Camargo
109a59012d testing #1049 2013-05-02 12:24:43 -03:00
BDC
d35c52d33b server_name 2013-05-01 12:24:14 -04:00
Daniel Camargo
23b175c9f8 partial #1100 - removed the tests 2013-04-30 13:55:17 -03:00
Daniel Camargo
deb63c0c41 partial #1100 2013-04-30 13:47:06 -03:00
Daniel Camargo
6b36e9ecaf Force the host_callback - sometimes it is empty 2013-04-30 13:38:31 -03:00
Daniel Camargo
39b1ad9b64 partial #1122 2013-04-30 10:58:24 -03:00
Daniel Camargo
7b04834a62 Issue #1111 - Developing the button resend notification. 2013-04-29 10:01:41 -03:00
arzynik
40f224f704 fixes #1024. fixes #1166 2013-04-26 18:55:38 -07:00
arzynik
e62ed85323 added additional beta config for cockpit 2013-04-26 18:10:01 -07:00
arzynik
5dcf687992 added additional beta config for cockpit 2013-04-26 18:03:44 -07:00
arzynik
64829ca470 added additional beta config for cockpit 2013-04-26 18:02:52 -07:00
arzynik
7c18404684 moved all the admin shit to a separate cockpit url 2013-04-26 18:00:06 -07:00
Daniel Camargo
c2fc0bd093 partial #1158 2013-04-26 10:10:57 -03:00
Daniel Camargo
05975ba286 partial #1142 2013-04-26 09:16:24 -03:00
Daniel Camargo
d9f81a3d3c #383 fixed a bug I've found here 2013-04-25 12:28:29 -03:00
Daniel Camargo
a8b4ff271a issue #1110 2013-04-25 12:02:38 -03:00
Daniel Camargo
618a1f041b issue #1110 - removed temporally this closed verification 2013-04-25 11:58:41 -03:00
arzynik
4a8f3f48d5 wtf merge fail 2013-04-24 18:32:13 -07:00
arzynik
77d56da2b1 woops 2013-04-24 18:29:28 -07:00
arzynik
39e91f0fc9 Merge branch 'master' of github.com:crunchbutton/crunchbutton
Conflicts:
	include/library/Crunchbutton/Order.php
2013-04-24 18:28:19 -07:00
arzynik
cd6e9b6332 fixes stuff 2013-04-24 21:20:14 -04:00
arzynik
f3b1d73296 fixes stuff 2013-04-24 18:19:17 -07:00
BDC
d13b77e232 restaurant open 2013-04-24 20:59:56 -04:00
Daniel Camargo
9b8c3ad598 partial #383 - removed the tests 2013-04-24 15:39:09 -03:00
Daniel Camargo
8226d02752 partial #383 - testing at beta (sms / email) 2013-04-24 15:11:23 -03:00
Daniel Camargo
dca0948785 partial #383 2013-04-24 14:44:23 -03:00
Daniel Camargo
644c09a83d issue #1080 2013-04-23 15:38:23 -03:00
BDC
8f3998ec5d merge admin 2013-04-21 13:03:50 -04:00
BDC
2ce7e0ce38 admin restaurant 2013-04-21 13:02:24 -04:00
Daniel Camargo
b053aceac2 issue #1018 - testing at beta 2013-04-19 12:42:54 -03:00
BDC
95d1ac0da4 restaurant with no hours is by default closed not open 2013-04-19 00:51:48 -04:00
BDC
ef2ceaa1c1 hc notification 2013-04-18 23:57:26 -04:00
BDC
b89fa8ecd0 more detailed notification 2013-04-18 23:55:04 -04:00
BDC
f53602294f support 2013-04-18 23:27:37 -04:00
BDC
e15f219501 admin and notify 2013-04-18 22:49:21 -04:00
Daniel Camargo
5bc525bfd7 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-04-18 11:39:10 -03:00
Daniel Camargo
eb63987658 partial #363 2013-04-18 11:31:30 -03:00
BDC
dec644c891 merge admin 2013-04-17 16:50:41 -04:00
BDC
c29c90b19e merge admin master 2013-04-17 16:49:52 -04:00
BDC
f798a69ac4 admin restaurant 2013-04-17 16:47:40 -04:00
Daniel Camargo
f438557e7c partial #1055 - let users who registered with email or facebook also log in with their phone number and be able to reset password with their phone number 2013-04-17 14:14:34 -03:00
BDC
a50987de63 empty categories 2013-04-16 18:37:34 -04:00