290 Commits

Author SHA1 Message Date
Daniel Camargo
77a746e566 partial #678 2013-02-15 15:50:54 -02:00
Daniel Camargo
0611d09ebe partial #678 2013-02-14 15:29:14 -02:00
Stuardo Rodríguez
7387f1a7fc partial for Issue #374
* added a logger to store in the database what I thought would help to understand why the restaurant said it was closed
2013-02-13 13:53:56 -05:00
Stuardo Rodríguez
5825d28cf1 foreces to check if it's open even when the environment is not live 2013-02-13 13:07:50 -05:00
Stuardo Rodríguez
a0f3e5485c partial for #377
* adding TimeMachine to set time
2013-02-13 12:53:56 -05:00
Stuardo Rodríguez
655d01ba74 partial for Issue #22, 6)add notes to listorders
* added an icon to graphicaly show which orders had comments
* the mouseover the icon shows the comment
2013-02-12 14:47:29 -05:00
Stuardo Rodríguez
41ce854ab5 partial for issue #377, ability to rearrange order of items
* make the dish options to be returned using the return value
* made the SQL query to fetch the options readable
* added the sort value to be stored in the Restaurant model
* added style to the CSS to make it clear what the sort field was used for
* added the sort value to be sent when storing the options
* added the sort field to the option form
2013-02-12 11:03:21 -05:00
Stuardo Rodríguez
030c2307ff partial for issue #377, ability to rearrange order of items
* finished categories
* finished dishes
2013-02-11 23:50:27 -05:00
Stuardo Rodríguez
8fc6d789d7 partial for Issue #377, ability to rearrange order of items
* return the categories for a restaurant, order by the sort field
* improved the way the field forms are shown, using the new CSS class labeled-fields
* added the category input fields to be able to rename and resort the category
* changed the JS to add the new fields to the API call to store the category changes
2013-02-11 22:59:18 -05:00
Stuardo Rodríguez
d0be81dbb1 fixed #711
* refactorize the save restaurant controller, to have the save block in it's own private method
* created a flashMessage static method in the Crunchbutton_Session class to handle the "saved" messages as flash messages.
* creating a flashWidget that returns a JQuery UI widget with the message in the session
* added the flashWidget to the restaurant view
2013-02-11 12:24:13 -05:00
Stuardo Rodríguez
53d670567b partial for issue #22
* moved the protected _jsonBoolean() method to the Cana_Table as it's something to be used in different models
* moved the protected _mergeWhere() method to the Cana_Table as it's something to be used in different models
* use the _mergeWhere() to show the inactive dishes in the admin
* use the _mergeWhere() to show the inactive notifications in the admin
2013-02-11 09:15:44 -05:00
Stuardo Rodríguez
79181812bb Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-02-08 10:34:16 -05:00
Stuardo Rodríguez
e5560670b3 partial for issue #377, rearrange dishesh
* added protected _jsonBoolean() metod to turn json boolean values to something Cana_Table understood to disable the items
* added the sort field to the array of data to be send
* improved the way the dish form looks like because of the different fields
* added the sort form field to the admin.js and the sort value to the saveDishes() js action
2013-02-08 10:33:08 -05:00
pererinha
cd0a3eb09b partial #13 2013-02-08 12:30:09 -02:00
Stuardo Rodríguez
36d0990059 fixed #620, new confirmation text
* changed "Contact Crunchbutton.com: 800-242-1444." to "To contact Crunchbutton, text us back."
* left the way to fetch the phone number for future references
2013-02-08 07:11:22 -05:00
Daniel Camargo
7bce4d3a13 partial #13
Changing the email subject
2013-02-07 16:43:04 -02:00
Daniel Camargo
0d40b04e76 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-02-07 16:06:00 -02:00
Stuardo Rodríguez
bfde33c91c fixes #688, new notification methods do not save
* validates the empty arrays for hours and dishes before trying to save them
* refactorize the Restaurant model to make it more readable
* addign documentation to the save*() methods
2013-02-07 12:48:44 -05:00
Daniel Camargo
e16eea29a0 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton
Conflicts:
	www/assets/js/app.js
2013-02-07 14:47:16 -02:00
Daniel Camargo
c3afebad20 partial #13 send email and sms 2013-02-07 10:37:45 -02:00
Stuardo Rodríguez
61b06a1b03 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-02-06 15:22:10 -05:00
Stuardo Rodríguez
1ae2a98788 fixed #681, ability to deactivate a menu item 2013-02-06 15:21:41 -05:00
Daniel Camargo
5a0179e8a1 partial #13
Fixed the Auth model.
2013-02-06 17:21:23 -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
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
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