521 Commits

Author SHA1 Message Date
Stuardo Rodríguez
11d0fc2fd0 detecting problem 2013-02-25 09:01:56 -05:00
Daniel Camargo
cf532cfbe5 fixed #225 (Order history should use restaurants time zone and mention restaurants time zone (e.g. PST, EST)) 2013-02-21 11:26:49 -03:00
Daniel Camargo
d3a723fdbd issue #8
Changed the final text to "If you have any questions, please press 0 or call us at 2. 1. 3. 2. 9. 3. 6. 9. 3. 5."
2013-02-21 09:07:11 -03:00
arzynik
9f5248fee8 auto remove 1 if prefixed 2013-02-20 12:13:31 -08:00
Daniel Camargo
fe9be6f3ee Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-02-20 15:56:18 -03:00
Daniel Camargo
f5bda4debc partial #8 2013-02-20 15:55:59 -03:00
arzynik
48eaefba62 fixed order of returned users for texthacker api. 2013-02-20 09:45:06 -08:00
arzynik
de61172748 fixed null issue on texthacker api 2013-02-20 09:42:56 -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
552131cfe7 fixed the file name 2013-02-18 11:41:37 -03:00
Daniel Camargo
915de15abe Changed the jquery.mobile.js's place. 2013-02-18 11:32:36 -03:00
Daniel Camargo
a83c891f46 Fixed #704 2013-02-18 10:47:15 -03: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
arzynik
49fea2825d put config back? seems that it needs it. otherwise it keeps clobbering t every time i update. 2013-02-14 15:15:38 -05:00
Daniel Camargo
2fb6cb1a7e fixed #718 2013-02-14 16:10:13 -02:00
Daniel Camargo
0611d09ebe partial #678 2013-02-14 15:29:14 -02:00
Daniel Camargo
fdc40b60cc Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-02-14 12:50:52 -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
Daniel Camargo
a4d49b6517 partial #678
Merged
2013-02-13 16:20:39 -02: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
530973952b improve how the form fits in 1024 2013-02-11 15:08:08 -05:00
Stuardo Rodríguez
69419fbf99 partial for issue #22, change sort order of restaurants
4) no way to change sort order of restaurants, use quick solution with input field
* added the sort value to the restaurant/community table in the _saveRestaurant() action
* added the sort field to the restaurant form
* improved the CSS to align numbers to the right
2013-02-11 14:55:29 -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
edae74c959 partial #711
* reorder the restaurant form page to make it look more like a standard page
* save button now stores all the restaurant information
* on save-button click, a dialog is shown to lock the page
* the save button will always reload the page with the stored information
2013-02-11 11:42:26 -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
pererinha
166982371f fixed #708 2013-02-08 15:14:43 -02:00
pererinha
e9f3f99c26 fixed #708 2013-02-08 14:39:36 -02:00
pererinha
3b62168a60 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton
# By Stuardo Rodríguez
# Via Stuardo Rodríguez
* 'master' of https://github.com/crunchbutton/crunchbutton:
  partial for issue #377, rearrange dishesh
2013-02-08 13:57:33 -02:00
pererinha
bbc52a160c partial #13
Fixed the problem with sms message.
2013-02-08 13:56:36 -02: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
85a0a346b2 do not use // comment til EOL 2013-02-08 07:24:25 -05: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