4825 Commits

Author SHA1 Message Date
Daniel Camargo
d51eb8fc68 Automate Pay Summaries for Drivers in cbtn.io #3234 2014-07-11 14:24:02 -03:00
Daniel Camargo
df9ef918bc Automate Pay Summaries for Drivers in cbtn.io #3234 2014-07-11 11:02:14 -03:00
Daniel Camargo
b613f92653 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton
Conflicts:
	include/views/default/cockpit2/frontend/drivers/drivers-summary.phtml
2014-07-11 11:00:57 -03:00
Daniel Camargo
d9e28388ca Automate Pay Summaries for Drivers in cbtn.io #3234 2014-07-11 10:59:48 -03:00
Daniel Camargo
00477e822f Automate Pay Summaries for Drivers in cbtn.io #3234 2014-07-11 10:51:12 -03:00
Daniel Camargo
b24724541c Automate Pay Summaries for Drivers in cbtn.io #3234 2014-07-10 16:51:39 -03:00
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
Daniel Camargo
85b5bed1d7 Automate Pay Summaries for Drivers in cbtn.io #3234 2014-07-10 15:08:00 -03:00
Daniel Camargo
e3aa4384d3 on payment page, show error if it is set to debit, and there is no account info #2081 2014-07-09 16:02:51 -03:00
Daniel Camargo
440ef8ce89 Driver's settlement bug #3234 2014-07-09 13:42:59 -03:00
Daniel Camargo
898350137e partial #3234 - shifts 2014-07-09 09:06:35 -03:00
Daniel Camargo
40dd41bca0 partial #3234 2014-07-08 16:54:54 -03:00
Daniel Camargo
36cf02b08e removed min length - #3350 2014-07-08 16:16:36 -03:00
Daniel Camargo
616f8e9546 Automate Pay Summaries for Drivers in cbtn.io #3234 2014-07-08 16:03:44 -03:00
Daniel Camargo
5a8d6c32cc avg minutes to delivery orders per shift / orders delivered per shift 2014-07-08 15:26:35 -03:00
Daniel Camargo
c942a5f691 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2014-07-08 15:19:07 -03:00
Daniel Camargo
7f9af4ea71 avg minutes to delivery orders per shift / orders delivered per shift 2014-07-08 15:18:54 -03:00
arzynik
434fe3c726 fixed scroll issue 2014-07-08 10:32:05 -07:00
Daniel Camargo
dd91ad61dc Automate Pay Summaries for Drivers in cbtn.io #3234 2014-07-08 13:47:27 -03:00
Daniel Camargo
330e14bc3b Merge branch 'refs/heads/master' into ISSUE_2310 2014-07-08 11:04:29 -03:00
Daniel Camargo
44f4960a97 restaurant order placement: new order #3350 2014-07-08 10:37:44 -03:00
Daniel Camargo
e84d3a48ca partial #2310 2014-07-08 10:19:02 -03:00
Daniel Camargo
73e44902ab partial #3389 2014-07-08 09:50:11 -03:00
Daniel Camargo
d6a8accf40 partial #3232
If they owe us money overall, for now just do a payment of $0
2014-07-07 10:30:42 -03:00
Daniel Camargo
f5fff17215 Set Payment Defaults #2310 2014-07-07 09:13:22 -03:00
Daniel Camargo
9b0db558ca Set Payment Defaults #2310 2014-07-07 09:07:12 -03:00
Daniel Camargo
ef908f7fed travis fixed 2014-07-04 17:41:05 -03:00
Daniel Camargo
1a2317e993 Auto-Settlement: Driver Pay #3232 - hourly payment 2014-07-04 17:06:45 -03:00
Daniel Camargo
dc340dc4ec Auto-Settlement: Driver Pay #3232 - hourly payment 2014-07-04 16:59:09 -03:00
Daniel Camargo
561fd3e0a4 added the phone number at staff page 2014-07-03 17:43:06 -03:00
Daniel Camargo
6946e0d4ea added the phone number at staff page 2014-07-03 17:40:33 -03:00
Daniel Camargo
76c25fc966 Driver Settlement - #3232
- added staff link
- added option to create bank account for drivers
2014-07-03 17:06:32 -03:00
Daniel Camargo
1617f9c561 added option to organize views in subfolders 2014-07-03 09:02:44 -03:00
Daniel Camargo
361ba4a516 added option to organize views in subfolders
it was became messy
2014-07-03 08:50:41 -03:00
Daniel Camargo
3a80a96571 Driver Settlement - #3232 - fixed travis test 2014-07-02 18:21:12 -03:00
Daniel Camargo
abb904ce2e Driver Settlement - #3232 2014-07-02 18:05:02 -03:00
Daniel Camargo
8851487cb3 Driver Settlement - #3232
fixed the adjustment
2014-07-02 17:49:29 -03:00
Daniel Camargo
95e6b6169f Driver Settlement - #3232
fixed the adjustment
2014-07-02 17:45:30 -03:00
Daniel Camargo
170f318daf Driver Settlement - #3232 2014-07-02 17:07:18 -03:00
Daniel Camargo
90f49a44b9 Driver Settlement - #3232 2014-07-02 14:56:33 -03:00
Daniel Camargo
4a72fa7521 Driver Settlement - #3232 2014-07-01 18:47:04 -03:00
Daniel Camargo
842b8c0b21 Driver Settlement - #3232 - math 2014-07-01 10:51:21 -03:00
Daniel Camargo
29c0a6ff33 Merge branch 'refs/heads/master' into Settlement 2014-06-30 20:42:03 -03:00
Daniel Camargo
14124e0f2c restaurant order placement: new order #3350 2014-06-30 20:41:43 -03:00
Daniel Camargo
149709875c Driver Settlement - #3232
test driver's calcs
2014-06-30 20:19:01 -03:00
Daniel Camargo
6b9bfafc43 restaurant order placement: new order #3350 - removed tests 2014-06-30 19:29:32 -03:00
Daniel Camargo
f3bf3698de restaurant order placement: new order #3350 - removed tests 2014-06-30 19:24:29 -03:00
Daniel Camargo
433c1a3b90 Settlement travis test - fixed to match the round number #2250 2014-06-30 16:42:57 -03:00
Daniel Camargo
ca495e7e76 implement additional payment math in Settlement.php #2250 2014-06-30 16:29:12 -03:00
Daniel Camargo
40c08bc6e3 implement additional payment math in Settlement.php #2250 2014-06-30 15:58:09 -03:00