263 Commits

Author SHA1 Message Date
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
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
0c142dda14 added env specific github config 2013-01-30 11:45:46 -08: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
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
ae8e716309 partial for #22, set communities
* preselect current community for the restaurant
2013-01-29 15:09:52 -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
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
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
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
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
arzynik
e678dd22e3 #13 added some facebook tests and some of the user code in some places 2013-01-24 15:58:48 -08:00
Stuardo Rodríguez
63f0e4338a issue #22 | enable to add / edit notifications
* the API for restaurant stores now the notifications
* The restaurant model stores now the notifications
* detect the notification to know what type of notification it is  to store it in as the right type
2013-01-24 18:25:35 -05:00
Stuardo Rodríguez
569fa9eb45 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-01-24 12:25:54 -05:00
Stuardo Rodríguez
4d5ed7eace Working in the admmin issue #22
* restaurant model includes now the notification models assigned to it
* the notifications in the restaurant model are filtered by active only if the admin is not logged in
* the notifications in the restaurant model now accept a where filter
* prototype for the notifications form
* included the notifications.js model
* added the admin.js method to populate the notifications form
* loading the notifications in the restaurant.js model
2013-01-24 12:24:55 -05:00
arzynik
8d7d363345 added sample grubhub scraper 2013-01-23 11:19:31 -08:00
Daniel Camargo
16db235439 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-01-22 19:47:27 -02:00
Stuardo Rodríguez
feec195279 allowing a dish to be changed from category 2013-01-22 16:10:05 -05:00
Daniel Camargo
29fea3583a Suggestion - Admin - Issue 635
Issue 635: Suggestion.
Added the Suggestion's model.
Added the Suggestion's controller.
Added some Suggestion's viewers.
Added the Suggestion's options at the admin menu.
Added some CSS classes at the admin.css.
Added the object App.suggestions at the admin.js file.
2013-01-22 14:44:37 -02:00
Daniel Camargo
94724322cc fixed #663
I just commented the line where message string receives the total
price. (Option.php:622)
2013-01-18 16:11:57 -02:00
Daniel Camargo
6783f8e090 Applied the same fix that I've made at the issue #656 to the service's fee.
Applied the same fix that I've made at the issue #656 to the service's
fee. (Order.php:53,54,56)
2013-01-18 15:52:29 -02:00
Daniel Camargo
be0e56d425 fixed #661
At the javascript side is being used the App.ceil function at the
result of the sum of the products's price (app.js:1281). The same
function is being used to round the values of the tax (app.js:1315) and
tip (app.js:1324). But at the PHP side this function Util::ceil was
called just at the sum of all itens (products price + tax + tip). So I
put the Util::ceil after the sum of the products price (Order.php:45),
after the tax calculation (Order.php:63) and after the tip calculation
(Order.php:58).
2013-01-18 15:39:20 -02:00
Stuardo Rodríguez
438f4aef8c fixed #624
* session should not be deleted if token + id_user is found
2013-01-17 13:54:27 -05:00
Stuardo Rodríguez
6c6cf56172 fixed issue #645 - Change "deliver to" to "address" 2013-01-14 12:58:46 -05:00
Stuardo Rodríguez
0133d1da58 fixed #591
Problem only happened in Chrome/webkit browsers. The sort order was only using the open/close values, rewrote the sort function

* addded the sort order information to the restaurants export in the Community model to use that value in the JS/frontend to sort them
* rewrite the way the order/open information is used to sort the restaurants in the JS/frontend
2013-01-14 11:40:16 -05:00
arzynik
84518aaf4b fixed location query for restaurants 2012-12-20 18:55:42 -08:00
Stuardo -StR- Rodríguez
db94785eb8 changed the text in the sms notification 2012-12-20 15:03:13 -05:00
arzynik
f0be34c4c0 fixes #621 2012-12-15 18:56:53 -05:00
arzynik
6aa9304d4f added location based queries for restaurants 2012-12-15 18:49:49 -05:00
arzynik
4b21b8c9bd fixed redirs 2012-12-11 14:54:24 -05:00
arzynik
010d1ae1f9 aded spicywith to ssl force 2012-12-11 14:01:36 -05:00
arzynik
f78ccd23dd removed ssl for beta 2012-12-11 13:21:50 -05:00
arzynik
617b999fb0 added other hosts 2012-12-11 13:20:46 -05:00
arzynik
53b66d644c added other hosts 2012-12-11 13:19:02 -05:00
arzynik
c57c1d7548 added different redirects 2012-12-11 13:09:18 -05:00
arzynik
09325bc01b added special case for spicy with 2012-12-10 20:40:46 -05:00
arzynik
2e18464d0d added domain 2012-12-10 20:22:40 -05:00
arzynik
14e460646c Merge branch 'master' of github.com:crunchbutton/crunchbutton 2012-12-10 13:25:32 -05:00
arzynik
afc9ae3c02 added local paths for images 2012-12-05 11:31:46 -08:00
arzynik
76d53931a3 Merge branch 'master' of github.com:crunchbutton/crunchbutton 2012-12-04 14:25:04 -05:00
arzynik
a55f1f0d55 fixes #357 2012-12-04 14:12:01 -05:00
arzynik
507aab62b9 Merge branch 'master' of github.com:crunchbutton/crunchbutton 2012-12-04 14:00:06 -05:00
arzynik
f91fcddcd3 fixes #516 2012-12-04 13:59:53 -05:00
arzynik
d0d01a16d9 dont alert on live 2012-11-29 19:02:27 -05:00
arzynik
18b959be5c added force quit of confirm orders 2012-11-28 18:45:17 -05:00