1572 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
c5c7f81dac #1101 (gift card changes)
Changed the gift card info position at the restaurant's page (mobile version).
2013-05-07 15:34:39 -03:00
Daniel Camargo
5a738fbd4c #1101 (gift card changes)
Changed the "Change location" icon.
2013-05-07 13:03:09 -03:00
Daniel Camargo
146e8a8aad #1101 (gift card changes)
Changed the place where the gift card is shown - desktop version.
2013-05-07 12:46:43 -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
cddca52cbf Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-05-07 08:52:27 -03:00
Daniel Camargo
061e453dec #1101 - Changed the feature that debits the user's credit. 2013-05-07 08:52:17 -03:00
BDC
7b284814fa resended->resent partial #1200 2013-05-06 19:04:36 -04: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
35b442638f Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-05-06 13:59:09 -03:00
Daniel Camargo
3be88e814e #1101 - removed the console.log 2013-05-06 13:58:58 -03:00
BDC
ca01fc50c5 fixed button broken by shift to cockpit 2013-05-06 12:44:07 -04:00
BDC
199c35720c weight adj restaurant admin 2013-05-06 12:39:24 -04:00
Daniel Camargo
c2cc0fe1a8 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-05-06 13:26:56 -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
BDC
2a5fe9bc3c js script uses gitversion 2013-05-03 15:54:28 -04:00
Daniel Camargo
21a437ea03 partial #1101 (gift card changes)
- No require to user create account to use the gift card and allow gift card to be redeemed at the Notes field - front end
2013-05-03 15:10:59 -03:00
Daniel Camargo
34f2f4b053 fixed the orders page 2013-05-03 09:21:59 -03:00
Daniel Camargo
c8e29cc2c9 changed the giftcard getPagePiece to work at cockpit. 2013-05-03 08:54:33 -03:00
Daniel Camargo
5132793e7e setting the bounding box area 2013-05-02 15:46:27 -03:00
Daniel Camargo
d96fa621a5 fixed a bug at location stuff 2013-05-02 14:50:21 -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
Daniel Camargo
9a9e1a05c7 Moved the location method to the loc.js file 2013-05-02 11:41:56 -03:00
Daniel Camargo
e058ecf423 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-05-02 10:44:05 -03:00
Daniel Camargo
d0a04547f5 removed the console debugs 2013-05-02 10:43:55 -03:00
Daniel Camargo
798d8d4bab partial #1049 2013-05-02 10:43:37 -03:00
BDC
47fa11f67e merge master 2013-05-01 18:31:31 -04:00
BDC
8472432748 restaurants permalinks visible 2013-05-01 18:30:55 -04:00
Daniel Camargo
f247517051 created the option to create a bounding box based at the restaurant's positions - for tests only 2013-05-01 18:31:09 -03:00
Daniel Camargo
b7938a44e7 #1153 - forcing the bounding box to be based at the ip location! 2013-05-01 17:55:45 -03:00
Daniel Camargo
c70b8d7d86 #1153 - removed the country name of the complete address 2013-05-01 17:49:44 -03:00
Daniel Camargo
f005bd2f79 #1153 - removed the debugs 2013-05-01 17:31:33 -03:00
Daniel Camargo
f2d8c57900 #1153 - forcing use the restaurant's positions for while. 2013-05-01 17:20:18 -03:00
Daniel Camargo
baae557570 #1153 added debugs - testing beta 2013-05-01 17:15:52 -03:00
Daniel Camargo
4d37f47697 partial #1153 - testing at beta 2013-05-01 17:10:29 -03:00
Daniel Camargo
2edcae3565 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-05-01 15:09:25 -03:00
Daniel Camargo
8daebe09d2 partial #1033 - testing at beta 2013-05-01 15:09:19 -03:00
BDC
cd2484de58 undo restaurant admin reversion 2013-05-01 12:30:58 -04:00
BDC
d35c52d33b server_name 2013-05-01 12:24:14 -04:00
Daniel Camargo
e071d04ea9 partial #1033 - fixed the bug with position 2013-05-01 12:27:18 -03:00
Daniel Camargo
455fcad278 partial #1033 - removed the debugs 2013-05-01 12:00:26 -03:00
Daniel Camargo
510bac6f4a partial #1033 2013-05-01 11:50:33 -03:00
Daniel Camargo
3ffa6b0f82 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-05-01 11:48:29 -03:00
Daniel Camargo
6a4b1ded67 partial #1033 - testing at beta 2013-05-01 11:48:13 -03:00
arzynik
b36c7299cb quick update for some stats 2013-04-30 18:22:32 -07:00
arzynik
927c8985a6 proof of concept highchart, reusable chart view 2013-04-30 18:14:40 -07:00
Daniel Camargo
23b175c9f8 partial #1100 - removed the tests 2013-04-30 13:55:17 -03:00