320 Commits

Author SHA1 Message Date
Daniel Camargo
5eaa9fbf37 partial #536 2013-02-27 14:50:07 -03:00
Daniel Camargo
14184be6c6 partial #536 2013-02-27 14:14:49 -03:00
Daniel Camargo
e6d0f0b69d partial #784 2013-02-27 10:03:30 -03:00
Daniel Camargo
b31b280730 partial #784
testing at beta server
2013-02-27 09:51:34 -03:00
Daniel Camargo
367388c7d1 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-02-26 16:34:33 -03:00
Daniel Camargo
b5c1848622 partial #536
Facebook class and facebook api.
2013-02-26 16:34:23 -03:00
Stuardo Rodríguez
5772f0f9e1 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-02-26 11:59:10 -05:00
Stuardo Rodríguez
6c7b8bb5d2 partial #377, ability to rearrange order of items
fixed:
 - remove a category
 - move the elements to another category before deleting the category

* add the delete logic for the categories not sent by the JS to the Restaurant->saveCategories() model
* added a simple UI functionality to trigger the jquery ui buttons hover effects,
* added the delete category button and set a style for it
* added a dialog when the delete category button is clicked, it shows the form for the category that will handle the existing dishes
* created the deleteCategory method that moves the dishes from one category to another and that removes the existing category from the DOM
* fixed a problem with the dish category dialog
2013-02-26 11:56:36 -05:00
Daniel Camargo
546a872472 fixed #747 2013-02-26 12:52:59 -03:00
Daniel Camargo
265063e301 testing issue #8 2013-02-26 09:50:32 -03:00
Stuardo Rodríguez
bb852de0c4 fixed #736, "inactive" items are randomly activated, at least when logged into admin
* fixing the problem of the admin loading the community and all it's dependencies twice because a naming collition
* replacing $this->community for $this->restaurantCommunity in the admin/restaurant form because of the naming collition
* detecting if the call has been from the admin or from the front end because API calls do not send params
* unifying the return exit in the API _returnRestaurant() action
* sending the $where filters from the API controller instead of detecint it in the models
* sending the $where param in cascade from the API  to the Restaurant model to the Category model for the Category->dishes($where) filter
* improving the readability in the bundle where the community is sent, adding documentation about the $view->category variable in the view file
2013-02-25 12:27:45 -05:00
Stuardo Rodríguez
231ae8d4b0 Merge branch 'master' into issue_736 2013-02-25 09:03:28 -05:00
Stuardo Rodríguez
11d0fc2fd0 detecting problem 2013-02-25 09:01:56 -05:00
arzynik
4533d77476 removed some unnesscary timeouts. removed shield. fixed soms suggestion stuff i broke. 2013-02-22 22:56:22 -05:00
arzynik
9e98fc8e97 updated suggestion methods 2013-02-22 18:04:59 -08:00
arzynik
0b0fbe110b added adjusted weight 2013-02-22 17:05:51 -08:00
arzynik
e894d5f40d updated orders page for tempalte use 2013-02-22 13:34:58 -08:00
arzynik
0e7244df54 updated query to include weight. added weight functions. added sorting by weight and open time to the frontend. 2013-02-22 15:17:58 -05:00
Daniel Camargo
bd4149984d fixed #746 2013-02-22 16:46:12 -03:00
Daniel Camargo
c2ff5e5169 Issue #697 2013-02-22 15:35:03 -03:00
arzynik
48eaefba62 fixed order of returned users for texthacker api. 2013-02-20 09:45:06 -08:00
arzynik
09f300f7ea added method to get details based on phone 2013-02-20 09:40:11 -08:00
Stuardo Rodríguez
6d13f8e29a fixed #732
* restored code removed in 49ac22c7d9ac9ccb2845f25fa7963b7225e270cb
* removed the session validation in the model
* saw that the filter could be fetched in the Restaurant->saveDishes(), renamed
a couple of variables to make it more understandable why the filter was removed.
2013-02-20 10:48:19 -05:00
Daniel Camargo
00a3a50157 partial #697 2013-02-20 09:07:23 -03:00
Daniel Camargo
49ac22c7d9 fixed #697 2013-02-19 22:21:12 -03:00
arzynik
707cf52cfa reverted to beta for staging facebook config. 2013-02-19 10:49:44 -08:00
arzynik
660624f6c8 added staging facebook config 2013-02-19 10:30:26 -08:00
Stuardo Rodríguez
173c097e76 issue #732, deleting items doesn't work in admin
* added the documentation to the code why the dishes aren't deleted
* added the filter for the admin to return inactive dishes
2013-02-19 10:22:27 -05:00
Stuardo Rodríguez
8ff6f4c84a fixed #724, categories in different order
Chrome browsers sort the properties, but Firefox leaves them as defined.
Changed the code to put the elements in an simple array (json array) instead of
associative arrays (json objects) so that the elments are not reordered.

* forces the export for the categories, dishes and options, to be added as a
  regular array of items, not as an associative array with the id as key
* added dockblock to help the IDE with the return elements for the exports
2013-02-18 17:08:38 -05:00
Daniel Camargo
c8f7406226 partial #678 2013-02-15 17:24:52 -02:00
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