763 Commits

Author SHA1 Message Date
Daniel Camargo
677f6ed2f7 partial #13 2013-02-06 16:58:15 -02:00
Daniel Camargo
15521c0071 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton
Conflicts:
	www/assets/js/app.js
2013-02-06 16:55:33 -02:00
Daniel Camargo
0704be0911 partial #13 2013-02-06 16:29:40 -02:00
Stuardo Rodríguez
5e0197bbaa fixed #25, closed restaurant countdown
* added new CSS rule for the about-to-close tag
* fixed wrong regex for restaurant pages with the '$comunity/' URL (notice the slash at the end)
* added the restaurant tag in the App.page.community() JS form
* moved the admin.js loadRestaurant() method to a named function
* added the restaurant.js isAboutToClose() method
2013-02-06 10:13:34 -05:00
Stuardo Rodríguez
d69814a4e7 fixed #544
- when menu items are deleted, sometimes this breaks a users,
+ the problem was with options not with the dishes, added the continue code to load the cart
2013-02-05 16:42:36 -05:00
Daniel Camargo
b93759a4e0 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-02-05 17:02:48 -02:00
Daniel Camargo
1e4adcb494 partial #13 2013-02-05 17:02:36 -02:00
Stuardo Rodríguez
a9eb641b60 fixed issue #666
* porting the open/close validation for a restaurant for the 12:00/00:00 format for the next day
* grouping the open/close restaurants to sort them together
2013-02-05 11:52:14 -05:00
Daniel Camargo
0218f5bc80 partial #13 2013-02-04 18:04:55 -02:00
Daniel Camargo
80c720fe38 partial #13 2013-02-04 18:04:01 -02:00
Daniel Camargo
fe18dc7aef partial #13 2013-02-02 19:18:25 -02:00
Stuardo Rodríguez
455a559179 fixed #669
The orders were set as delivery only if the word "delivery" was used. I changed the logic to be delivery as default and only as takeout if the word "takeout" was used. If neither of them was used, the order will be flagged as for delivery, but also logged in the system, in the Log table to debug further what is wrong with it.
2013-01-31 13:20:12 -05:00
arzynik
b74f0e149e added cache handlers 2013-01-30 11:48:04 -08:00
arzynik
0c142dda14 added env specific github config 2013-01-30 11:45:46 -08:00
arzynik
9ff78d76f0 added github issues 2013-01-30 11:38:30 -08:00
Stuardo Rodríguez
795cc5f1cb Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-01-30 14:14:28 -05:00
Stuardo Rodríguez
97018268ee fixed #685
* the admin controller loads the testing community as the default for new restaurants
* the Community model encapsulates the testing community fetching
* the view accepts not setting a default community
2013-01-30 14:12:37 -05:00
Daniel Camargo
c6b84aaeeb Removed the auto show sign in's form. 2013-01-30 16:42:47 -02:00
Daniel Camargo
3ad383052f Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-01-30 16:38:12 -02:00
Daniel Camargo
f5517bcb36 partial #13
This commit has:
- Sign in button (just for desktop)
- Sign in modal working
- Prototype of the sign in feature.
- Prototype of the 'password help; feature.
2013-01-30 16:38:01 -02:00
Stuardo Rodríguez
9932add0a3 partial for issue #492
* centralize the way the restaurant's fax is fetched
* adding Notification types as class constants to reduce possible bugs
* centralize the way to get the restanurant's email address
* improve code readability in the CSV exporter
* adding restaurant fax and email to the CSV
2013-01-30 12:39:25 -05:00
Stuardo Rodríguez
31cabd8608 fixed #326
* removed HTML5 input[type="number"] as the values change if you accidentaly mose-scroll over them
2013-01-30 11:02:50 -05:00
Stuardo Rodríguez
0a9cae8b69 fixed #327
* replace minites by minutes
* improved the CSS/look in the admin/restaurant form
2013-01-30 10:41:01 -05:00
Daniel Camargo
272b1a6ab4 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-01-30 12:46:39 -02:00
Stuardo Rodríguez
9dd6c4e8df fixed #673
Add items to top of cart instead of bottom of cart
2013-01-30 07:26:47 -05:00
arzynik
87ae4de71e added revenue and ideity tracking to mixpanel 2013-01-29 17:37:20 -05:00
arzynik
75d3b19450 added revenue and ideity tracking to mixpanel 2013-01-29 14:27:19 -08:00
Stuardo Rodríguez
f4f0864cfa partial for #22 add notes to excel exporter
* improved the readability for the CSV view
* added the notes as a new column
2013-01-29 16:50:33 -05:00
Stuardo Rodríguez
a8f884005a partial for issue #22 save "delivery" field
* adding the delivery flag to be stored for the restaurant
* adding documentation to fix the bug in the checkbox, for later
2013-01-29 16:06:36 -05:00
Stuardo Rodríguez
ae8e716309 partial for #22, set communities
* preselect current community for the restaurant
2013-01-29 15:09:52 -05:00
Daniel Camargo
e8a5a9b7c1 Issue #13
New change location button. Sign in button.
2013-01-29 17:15:53 -02:00
arzynik
40d6a58bb7 removed select height. fixes #658. might effect #459. 2013-01-29 12:37:49 -05:00
Daniel Camargo
3ea836c150 Issue #677
(Order.php:726)
Added a function that returns the last tip the user gave.

(User.php:52)
Added a call to the function Order::lastTip(). So the last tip will be exported at the user's api.

(app.js:876)
Added the line to get the last tip the user gave.
2013-01-29 14:07:31 -02:00
Stuardo Rodríguez
ce6b9a0aa4 finish the "add new dish" for issue #22
- better CSS for the dish block form
- dialog to select the category for the new dish
2013-01-28 16:35:06 -05:00
Stuardo Rodríguez
8cb5d17cdb Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-01-28 14:22:10 -05:00
Stuardo Rodríguez
91b0a7bb82 partial for #22
- action in the api/restaurant controller to set the dishes categories
- method in the Restaurant model to store the categories associated to the restaurant
- improved the way the add category looks in the admin/restaurant view and CSS file
- refactorize the methods in the admin JS app, so the methods were outside every object to be able to use the IDE outliner to show the methods outside the onload function, helps sorting the work folding the methods
- added the _saveCategories() method in the JS admin app to send the categories to the api/restaurant controller
- added the _saveCategories() to the saveRestaurant method
- made the getValues() method a global function to reuse it
- added a App.createCategory() to add a new category in the DOM to be stored later
- the admin app, onLoad method does not define any functions inside it anymore
2013-01-28 14:21:26 -05:00
Daniel Camargo
82398032c5 Issue 675
I increased the line-height, increased the weight and made the font a little darker.
2013-01-28 16:55:22 -02:00
Daniel Camargo
5c437e9852 fixed #676
when you click on question mark and then click anywhere else on the page not in the explanation box, the box should disappear
2013-01-28 15:38:03 -02:00
Daniel Camargo
932462630b fixed #672
Fixing the issue 'question mark is missing from mobile web app'.
2013-01-28 14:58:25 -02:00
Daniel Camargo
2e9ded396a Issue 635
Issue 635: Resizing the modal of suggestion. This modal should have the same site as the mobile version.
2013-01-28 13:24:46 -02:00
Stuardo Rodríguez
94f53d3c0c Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-01-28 08:17:51 -05:00
arzynik
b51ad21dcc fixed #670. now checks to see if files exist befor sending them to minify 2013-01-25 15:57:06 -05:00
arzynik
cda7571e68 updated several facebook login thing #13 2013-01-25 15:49:06 -05:00
Stuardo Rodríguez
85872f5791 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-01-25 14:29:15 -05:00
Stuardo Rodríguez
5f6f004de7 adding pending notification model file 2013-01-25 14:28:54 -05:00
Daniel Camargo
4055c1d963 fixed #665
Issue 665: Delete Estimated Pickup Time from Confirmation Text for Takeout orders.
2013-01-25 14:56:06 -02:00
Daniel Camargo
3a64bade3e Issue 635 and 520
Fixed the alignment of the suggestion form.
2013-01-25 13:19:56 -02:00
arzynik
6682757519 added separate configs for facebook apps 2013-01-24 17:28:59 -08:00
arzynik
3a028c9674 some updates to the login shit. #16 2013-01-24 17:12:31 -08:00
arzynik
05d912f18d Merge branch 'master' of github.com:crunchbutton/crunchbutton 2013-01-24 15:59:56 -08:00