184 Commits

Author SHA1 Message Date
Daniel Camargo
b5ae265f1e Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-02-25 14:46:43 -03:00
Daniel Camargo
9a85cfeda8 debug - issue 8 2013-02-25 14:45:29 -03:00
Stuardo Rodríguez
1a67f4ed51 Merge branch 'issue_736' 2013-02-25 12:30:43 -05: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
Daniel Camargo
e3daaac8d6 testing issue 8 2013-02-25 14:24:29 -03:00
Daniel Camargo
571f548b5a issue 8
testing
2013-02-25 14:11:42 -03:00
Daniel Camargo
c6968aa241 testing #8 2013-02-25 12:54:15 -03: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
95bcb05a27 fxed sign out issue 2013-02-22 16:44:29 -08:00
arzynik
e894d5f40d updated orders page for tempalte use 2013-02-22 13:34:58 -08:00
Daniel Camargo
bd4149984d fixed #746 2013-02-22 16:46:12 -03:00
Daniel Camargo
1bf87c413d The env variable was fixed as 'live'. 2013-02-22 12:21:57 -03: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
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
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
Daniel Camargo
a4d49b6517 partial #678
Merged
2013-02-13 16:20:39 -02:00
Stuardo Rodríguez
a0f3e5485c partial for #377
* adding TimeMachine to set time
2013-02-13 12:53:56 -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
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
bbc52a160c partial #13
Fixed the problem with sms message.
2013-02-08 13:56:36 -02: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
Stuardo Rodríguez
9e7c75d0d7 partial for issue #22
* refactorizing the action to list the restaurants, adding the communities to the action
* add the modal dialog to create a new restaurant
* the dialog shows a form and sends those values to the saveRestaurant existing method
* always load the restaurant page after saving the new data, this is because the same method is used both in the restaurant form as in the new restaurant call
2013-02-07 10:35:25 -05:00
Daniel Camargo
c3afebad20 partial #13 send email and sms 2013-02-07 10:37:45 -02:00
Daniel Camargo
677f6ed2f7 partial #13 2013-02-06 16:58:15 -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
1e4adcb494 partial #13 2013-02-05 17:02:36 -02: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
arzynik
0c142dda14 added env specific github config 2013-01-30 11:45:46 -08:00
arzynik
9ff78d76f0 added github issues 2013-01-30 11:38:30 -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
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
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