714 Commits

Author SHA1 Message Date
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
40d9a5d437 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-01-24 18:26:45 -05: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
59344c71b7 Adding the functionality to add empty notifications in case we get out of inputs
Also it's now loading an empty field per type on load
2013-01-24 15:36:37 -05:00
Daniel Camargo
68613de5a9 Issue 635
Implemented the max length at the name of the suggested food.
2013-01-24 17:48:22 -02:00
Daniel Camargo
a32a3be935 Issue 635
Fixed the problem with the thanks's message,
2013-01-24 17:43:59 -02:00
Daniel Camargo
e318387b17 Changes according to the Judd's comment
https://github.com/crunchbutton/crunchbutton/issues/635
2013-01-24 17:06:20 -02: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
Daniel Camargo
acd27ae589 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-01-23 17:21:26 -02:00
Daniel Camargo
27b578839e Issue 635
Fixed the width of the 'Suggest other food' helper text box.
2013-01-23 17:21:05 -02:00
arzynik
2c2d6c710b added grubhub scraper test 2013-01-23 11:19:48 -08:00
arzynik
8d7d363345 added sample grubhub scraper 2013-01-23 11:19:31 -08:00
arzynik
826ccc14f5 added querypath library to bootstrap 2013-01-23 11:19:19 -08:00
arzynik
8041ffa0a5 added querypath library. modified it to use namespaces to it works with cana. 2013-01-23 11:19:07 -08:00
Daniel Camargo
aab471a244 Fixed the footer position at the restaurant's page.
The footer position was going up at the restaurant's page. It was happening because the div.restaurant-items has the position:absolute style's attribute and the footer was placed right after the div.body. Now the div.body will have at least the same height that the div.restaurant-items has. (app.js:343)
2013-01-23 17:17:06 -02:00
Daniel Camargo
1e29d0d9dd Issue 635 and Issue 520 - Food suggestion
Developed the suggestions Devin gave me in order to make the suggestion model more beautiful.
2013-01-23 16:55:47 -02:00
Daniel Camargo
548e7f902f Issue 635 and Issue 520 - Food suggestion
Added the functionality that shows the help little help message (Issue 520).

Added a black div (kind of a shield) that will comes up behind the modal form.

Fixes some bugs at the administration of suggestions.
2013-01-23 15:13:27 -02:00
Daniel Camargo
16db235439 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-01-22 19:47:27 -02:00
Stuardo Rodríguez
36eac38d0c * loading real file if exists
* adding documentation to the JS saveDishes() method
2013-01-22 16:38:13 -05:00
Stuardo Rodríguez
dbf70d2f8f Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-01-22 16:10:31 -05:00
Stuardo Rodríguez
feec195279 allowing a dish to be changed from category 2013-01-22 16:10:05 -05:00
arzynik
9d738ba338 fixes #667 2013-01-22 15:35:21 -05:00
Daniel Camargo
41cd230545 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-01-22 18:11:04 -02:00
Daniel Camargo
89d676f7d0 Issue #635
Added the suggestion's form at the order page.
Defined some CSS classes.
Developed the javascript functions that will control the suggestion's form.
2013-01-22 18:10:48 -02:00
Stuardo Rodríguez
f674b7eb2d group dishes per category 2013-01-22 14:18:28 -05:00
Daniel Camargo
5c7dd2824e Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-01-22 14:44:47 -02: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
Stuardo Rodríguez
40c619f458 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-01-21 16:55:24 -05:00
Stuardo Rodríguez
e83dbd88d8 partial for #22
* item descriptions are now being stored
* improved the CSS for the admin at 1024x768
* adding helper to identify Restaurant model in the controller
* fixed the JS that was wrongly displaying the stored description
2013-01-21 16:53:13 -05:00
Stuardo Rodríguez
c1d13747d6 removing config file, use demo for base
config file is different in each instalation
2013-01-21 13:11:59 -05:00
Stuardo Rodríguez
6fc51aac0f documentation in the ignore files 2013-01-21 13:10:32 -05:00
Daniel Camargo
c08cfeed8f fixed #662
I added new properties at the '.home-tagline h2' selector (style.css:220).

I also added a new selector '.home-tagline h2 strong' and removed the inline style of the javascript string (app.js:17).
2013-01-21 14:27:01 -02:00
arzynik
3961cdc60c added ordrin api and admin test page 2013-01-18 13:07:25 -08:00
arzynik
1dfd1f747f reapplied ac1f64db9faaf9ea23492696d3f6bc4ad3f0b484, changes where clobbered in 87ca08699a05289328c81ededd25086310ba1327 2013-01-18 11:04:09 -08: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
Daniel Camargo
c094408ac2 fixed #656
The problem was fixed. The tip value was being changed but it was not
recalculating the total with the new tip value.
2013-01-18 13:56:47 -02:00
Daniel Camargo
87ca08699a fixed #656 2013-01-18 13:21:08 -02:00
arzynik
ac1f64db9f fixes #652 2013-01-17 17:41:22 -08:00
Stuardo Rodríguez
b43999bf0e Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-01-17 15:15:47 -05:00
Stuardo Rodríguez
564ec839c0 fixed #647
There is a JS problem when doing float sums, solved multiplying the breakdown for 100 before the sum
2013-01-17 15:14:50 -05:00
Daniel Camargo
f08436318b fixed #651
If the user changed the delivery method to takeout and the payment is
card the default tip will be 0%. If the delivery method is delivery and
the payment is card the default tip will be 15% (variable
App.order.tip). If the user had changed the tip value the default value
will be chosed one.
2013-01-17 17:12:22 -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
arzynik
7afb57806b fixed #638 2013-01-15 13:24:52 -08:00
arzynik
0989a36583 updated spacing css to separate home and community page. added a TINY bit of space. 2013-01-15 12:51:11 -08:00
Stuardo Rodríguez
6c6cf56172 fixed issue #645 - Change "deliver to" to "address" 2013-01-14 12:58:46 -05:00
Stuardo Rodríguez
199bf4d380 adding documentation 2013-01-14 11:44:41 -05:00