sharpetronics/crunchbutton
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
crunchbutton/include/library/Crunchbutton
History
Daniel Camargo e995fbaee6 Merge branch 'refs/heads/master' into Issue_3234 
Conflicts:
	include/controllers/default/cockpit2/api/driver/summary/index.php
2014-07-10 16:27:22 -03:00
..
Acl
…
Admin
Auto-Settlement: Driver Pay #3232 - hourly payment
2014-07-04 16:59:09 -03:00
Auth
partial #2648
2014-04-24 16:03:13 -07:00
Balanced
implement additional payment math in Settlement.php #2250
2014-06-19 10:04:23 -03:00
Charge
implement additional payment math in Settlement.php #2250
2014-06-19 10:04:23 -03:00
Chart
orders at pasta roma (non-3rd party restaurant) are being sent to delivery drivers #3139
2014-05-07 16:41:08 -03:00
Community
avg minutes to delivery orders per shift / orders delivered per shift
2014-07-08 15:18:54 -03:00
Controller
partial #2341
2014-05-28 14:43:42 -07:00
Cron
partial #1452 new users cron tab
2014-05-28 18:12:27 -03:00
Dish
…
Email
Driver Settlement - #3232
2014-07-02 17:07:18 -03:00
Geo
…
Grubhub
…
Hipchat
…
Loc
…
Notification
Make these notifications pop up on support on cockpit #3008
2014-04-23 16:45:47 -03:00
Option
…
Order
avg minutes to delivery orders per shift / orders delivered per shift
2014-07-08 15:26:35 -03:00
Promo
…
Restaurant
Driver Settlement - #3232
2014-07-02 14:56:33 -03:00
Session
partial #2648
2014-04-24 16:03:13 -07:00
Support
Changed the Support to send just the first name of cs
2014-06-22 16:51:32 -03:00
User
partial #3125
2014-05-13 11:10:20 -07:00
Admin.php
avg minutes to delivery orders per shift / orders delivered per shift
2014-07-08 15:18:54 -03:00
Agent.php
partial #1857 - track platform per order for stats
2013-11-14 15:06:59 -02:00
App.php
added dev cockpits
2014-06-13 08:57:34 -07:00
Auth.php
partial #2648
2014-04-24 16:03:13 -07:00
Category.php
…
Charge.php
…
Chart.php
restoring restaurant_community table (drivers stuff)
2014-03-14 13:52:35 -03:00
Community.php
removed non active drivers from the shifts/schedules/summary
2014-06-16 15:00:00 -03:00
Company.php
…
Config.php
partial #2143 - cron to renotivy reps if no one accepts
2013-11-22 14:27:42 -02:00
Controller.php
…
Credit.php
partial #3241: Delete every CB person except Devin's Crunchbutton credit
2014-06-03 20:16:12 -03:00
Detect.php
…
Dish.php
partial #2405 - have dropdown options appear above checkbox options on the order page
2014-02-17 20:47:21 -03:00
Download.php
…
Email.php
…
Facebook.php
…
File.php
…
Geo.php
…
GoogleVoice.php
…
Group.php
restoring restaurant_community table (drivers stuff)
2014-03-14 13:52:35 -03:00
Grubhub.php
…
Hour.php
opens in hours sometimes doesnt work #2566 and change how Opens In is displayed #2662
2014-03-26 10:57:44 -03:00
Log.php
Make these notifications pop up on support on cockpit #3008
2014-04-23 16:45:47 -03:00
Newusers.php
…
Notification.php
Make these notifications pop up on support on cockpit #3008 - added to fax errors
2014-04-23 16:56:50 -03:00
Option.php
…
Order.php
Merge branch 'refs/heads/master' into ISSUE_2310
2014-07-08 11:04:29 -03:00
Payment.php
partial #3232
2014-07-07 10:30:42 -03:00
Phaxio.php
…
Preset.php
…
Promo.php
partial #2006 - alert Nick and David if a user places 2 or more orders in a row
2013-11-07 13:30:19 -02:00
Referral.php
…
Restaurant.php
implement additional payment math in Settlement.php #2250
2014-06-17 11:30:53 -03:00
Scss.php
added serve and removed cache for non bundle requests
2014-04-16 13:22:38 -07:00
Session.php
…
Settlement.php
Merge branch 'refs/heads/master' into Issue_3234
2014-07-10 16:27:22 -03:00
Sheriff.php
partial #2749
2014-03-26 22:30:02 -07:00
Site.php
added ability to expose dynamic config to js
2013-11-11 16:15:52 -08:00
Suggestion.php
…
Support.php
Changed the Support to send just the first name of cs
2014-06-22 16:51:32 -03:00
User.php
if is a new user, dont show change info button #2867
2014-04-07 11:45:32 -03:00
Util.php
added option to organize views in subfolders
2014-07-03 09:02:44 -03:00