Daniel Camargo
|
e9aa7b41b9
|
implement additional payment math in Settlement.php #2250
- payment summary page
|
2014-06-16 17:47:08 -03:00 |
|
Daniel Camargo
|
1a544d2cb3
|
removed non active drivers from the shifts/schedules/summary
|
2014-06-16 15:00:00 -03:00 |
|
Daniel Camargo
|
6d55f856f9
|
partial settlement #2250
- removed debug
|
2014-06-16 14:37:50 -03:00 |
|
Daniel Camargo
|
b5b083180d
|
partial settlement #2250
- added option to input notes (message that will be included at summary)
|
2014-06-16 14:32:18 -03:00 |
|
Daniel Camargo
|
d1c4780c90
|
partial settlement #2250
- payment schedule
- payment status
- payment status:error
- payment order_transaction stuff
|
2014-06-16 13:00:49 -03:00 |
|
Daniel Camargo
|
028db60b2d
|
partial settlement #2250
- payment schedule
- option to reimburse cash orders
|
2014-06-16 10:25:20 -03:00 |
|
Daniel Camargo
|
8f198b57e4
|
Merge branch 'refs/heads/master' into Settlement
|
2014-06-16 08:14:58 -03:00 |
|
Daniel Camargo
|
9ee4c78909
|
implement additional payment math in Settlement.php #2250
|
2014-06-13 18:46:39 -03:00 |
|
Daniel Camargo
|
9ac277156d
|
settlement - removed debug stuff
|
2014-06-13 15:01:12 -03:00 |
|
Daniel Camargo
|
7e14838aa3
|
settlement - removed debug stuff
|
2014-06-13 15:00:05 -03:00 |
|
Daniel Camargo
|
05a7fdc006
|
Merge branch 'refs/heads/Settlement'
|
2014-06-13 14:58:29 -03:00 |
|
Daniel Camargo
|
94c28adddf
|
implement additional payment math in Settlement.php #2250
- added option to include refunded orders at the payment
- added pay type filter
|
2014-06-13 14:54:49 -03:00 |
|
arzynik
|
2a34d44057
|
added dev cockpits
|
2014-06-13 08:57:34 -07:00 |
|
Daniel Camargo
|
66a487ca3a
|
urgent problems with saving on cockpit #3362
|
2014-06-12 18:12:14 -03:00 |
|
Daniel Camargo
|
d2789964aa
|
updated settlement phpunit test #2250
|
2014-06-12 18:01:49 -03:00 |
|
Daniel Camargo
|
78192c751d
|
partial Settlement - drivers stuff - cockpit 3
|
2014-06-12 17:45:28 -03:00 |
|
Daniel Camargo
|
1fbc2e6706
|
Merge branch 'refs/heads/Settlement'
|
2014-06-12 14:22:04 -03:00 |
|
Daniel Camargo
|
7c0f4059e6
|
phpunit for drivers math: Settlement #2250
|
2014-06-12 14:21:33 -03:00 |
|
Daniel Camargo
|
a35a617a3a
|
partial settlement test
|
2014-06-12 13:09:58 -03:00 |
|
Daniel Camargo
|
dc80edb439
|
partial settlement test
|
2014-06-12 13:09:08 -03:00 |
|
Daniel Camargo
|
797b0b7800
|
Merge branch 'master' of https://github.com/crunchbutton/crunchbutton
|
2014-06-12 13:04:18 -03:00 |
|
Daniel Camargo
|
0845ae9d16
|
Merge branch 'Settlement' of https://github.com/crunchbutton/crunchbutton into Settlement
Conflicts:
include/views/default/cockpit2/frontend/settlement.phtml
www/assets/cockpit/scss/cockpit.scss
www/assets/js/directives.js
|
2014-06-12 13:03:49 -03:00 |
|
Daniel Camargo
|
a9e0ca5ed0
|
implement additional payment math in Settlement.php #2250
|
2014-06-12 13:01:04 -03:00 |
|
Daniel Camargo
|
527ae4496b
|
implement additional payment math in Settlement.php #2250
|
2014-06-12 10:37:48 -03:00 |
|
Daniel Camargo
|
cf7db67496
|
test removed
|
2014-06-11 18:21:15 -03:00 |
|
Daniel Camargo
|
f95f05d0fe
|
Settlement: implement additional payment math in Settlement.php #2250 - cockpit 3
|
2014-06-11 18:19:48 -03:00 |
|
Daniel Camargo
|
b90ef3c9d1
|
Merge branch 'refs/heads/master' into Settlement
|
2014-06-11 16:59:53 -03:00 |
|
Daniel Camargo
|
a212c85f5b
|
Merge branch 'master' of https://github.com/crunchbutton/crunchbutton
|
2014-06-11 16:56:10 -03:00 |
|
Daniel Camargo
|
55fb52df21
|
added the lastStatus date at the order's action api
|
2014-06-11 16:55:57 -03:00 |
|
Daniel Camargo
|
a23f3dc8d5
|
partial settlement #2250 - cockpit 3
|
2014-06-11 16:55:23 -03:00 |
|
Manish Patil
|
cf172b9312
|
Merge branch 'master' of github.com:crunchbutton/crunchbutton
|
2014-06-11 11:10:11 -07:00 |
|
Manish
|
94feb2c548
|
testing permission
|
2014-06-11 11:07:04 -07:00 |
|
manish
|
df85be7c57
|
fix nav not going all the way down #3203
|
2014-06-11 10:58:25 -07:00 |
|
Daniel Camargo
|
6f892e8e87
|
Formal Relationship Defaulting to = 0 - Payment Havoc! #3321
|
2014-06-11 08:44:30 -03:00 |
|
arzynik
|
e9c4826cbe
|
fixes #3359
|
2014-06-10 15:50:10 -07:00 |
|
arzynik
|
57e1c37ef0
|
added manish
|
2014-06-10 15:02:30 -07:00 |
|
Daniel Camargo
|
38edb24ec2
|
partial #2250 - settlement - calcs and tests
|
2014-06-10 17:46:23 -03:00 |
|
Daniel Camargo
|
84da4e5cda
|
partial #2250 - settlement - calcs and tests
|
2014-06-10 17:45:04 -03:00 |
|
Daniel Camargo
|
71bb429057
|
partial #2250 - settlement - calcs
|
2014-06-10 11:57:17 -03:00 |
|
Daniel Camargo
|
4ec0f73157
|
partial #2250 - settlement
|
2014-06-09 18:07:27 -03:00 |
|
Daniel Camargo
|
6aba4bbfd0
|
partial
|
2014-06-06 15:09:55 -03:00 |
|
Daniel Camargo
|
e36c773bd1
|
partial
|
2014-06-06 11:06:42 -03:00 |
|
Daniel Camargo
|
c83ee4e379
|
UNC Chipotle and Hamilton Whole Foods notifications deleted from database #3109
|
2014-06-05 10:15:41 -03:00 |
|
Daniel Camargo
|
1fda55f67c
|
get started stuff isnt smart enough to work on all browsers #3308
|
2014-06-04 20:19:34 -03:00 |
|
Daniel Camargo
|
89a4092651
|
partial #3241: Delete every CB person except Devin's Crunchbutton credit
|
2014-06-03 20:18:24 -03:00 |
|
Daniel Camargo
|
d6a5cf7add
|
partial #3241: Delete every CB person except Devin's Crunchbutton credit
|
2014-06-03 20:16:12 -03:00 |
|
Daniel Camargo
|
8e2de6c292
|
Delete every CB person except Devin's Crunchbutton credit #3241
|
2014-06-03 17:58:10 -03:00 |
|
Daniel Camargo
|
91d01115d5
|
Delete every CB person except Devin's Crunchbutton credit #3241
|
2014-06-03 16:38:41 -03:00 |
|
Daniel Camargo
|
2435c5ad51
|
partial #3307
- select boxes should be like a white bg, not grey.
- skinnier bars
|
2014-06-03 14:40:19 -03:00 |
|
Daniel Camargo
|
1836888e20
|
add ability to set max promotion paying for restaurant admin #2083
|
2014-06-03 10:50:25 -03:00 |
|