sharpetronics/crunchbutton
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,787 Commits 5 Branches 1 Tag
Commit Graph

995 Commits

Author SHA1 Message Date
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
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
2c8ae1c2fa restaurant order placement: new order #3350 2014-06-30 11:23:50 -03:00
Daniel Camargo
848ce6dbaf restaurant order placement: new order #3350 2014-06-29 20:00:36 -03:00
Daniel Camargo
67073aeb75 partial: restaurant order placement: new order #3350 2014-06-27 17:53:59 -03:00
Daniel Camargo
14f02a2c4e Auto-Settlement: Driver Pay #3232 
- Added option to transfer an order from one driver to another
 2014-06-26 17:03:39 -03:00
Daniel Camargo
d6507e0ee8 Auto-Settlement: Driver Pay #3232 2014-06-26 12:33:07 -03:00
Daniel Camargo
581941f658 drivers are filling out their schedule preferences, but it's not registering in our system as it being filled out #3398 2014-06-24 14:49:44 -03:00
Daniel Camargo
1830834692 partial #2250 
- Where can I add an arbitrary adjustment (either plus or minus) to the pay a restaurant receives? This is needed, and should appear in the summary)
 2014-06-24 11:17:51 -03:00
Daniel Camargo
f23cdf8578 partial #2250 
- Where can I add an arbitrary adjustment (either plus or minus) to the pay a restaurant receives? This is needed, and should appear in the summary)
 2014-06-24 11:15:42 -03:00
Daniel Camargo
63a44c10f2 partial #2250 
- I need an option to "Do Not Include Order" (even if it's not refunded) in case test orders or other random things show up.
- DK Payment Test should not appear in the payment list, and neither should any test restaurants.
 2014-06-23 17:38:23 -03:00
Daniel Camargo
8dbc0c7491 Changed the Support to send just the first name of cs 2014-06-22 16:51:32 -03:00
Daniel Camargo
0e495f966e settlement fixes 2014-06-19 16:04:21 -03:00
Daniel Camargo
b72e278bf7 settlement 2014-06-19 15:58:54 -03:00
Daniel Camargo
a8e7583029 implement additional payment math in Settlement.php #2250 
- added payment by check
 2014-06-19 15:29:58 -03:00
Daniel Camargo
9fb16683cd Merge branch 'Settlement' of https://github.com/crunchbutton/crunchbutton into Settlement 2014-06-19 10:06:25 -03:00
Daniel Camargo
826c201a14 implement additional payment math in Settlement.php #2250 
- balanced payment working
- storing balanced log errors
 2014-06-19 10:04:23 -03:00
arzynik
c1de3d6867 Merge branch 'master' of github.com:crunchbutton/crunchbutton 2014-06-18 16:17:24 -07:00
arzynik
41875b7bf1 partial #3350 2014-06-18 16:17:17 -07:00
Daniel Camargo
e31a78c476 partial #3361 2014-06-18 16:40:52 -03:00
Daniel Camargo
3e5df6f865 implement additional payment math in Settlement.php #2250 
- page to list the scheduled payments that didn't went thought
- option to resend unfinished payments
 2014-06-18 15:47:53 -03:00
Daniel Camargo
8c849626de partial #2250 
removed the hard coded id_payment from summary
 2014-06-17 16:46:31 -03:00
Daniel Camargo
70625aef68 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2014-06-17 16:02:13 -03:00
arzynik
3b680f15b1 partial #3350 2014-06-17 11:55:38 -07:00
Daniel Camargo
6df58f1d75 Merge branch 'refs/heads/master' into Settlement 2014-06-17 15:38:51 -03:00
Daniel Camargo
75b5ecb9b5 implement additional payment math in Settlement.php #2250 
- summary email/fax
- summary view page
 2014-06-17 15:37:19 -03:00
arzynik
abd549dc3c partial #3350 
partial #3365
 2014-06-17 11:14:34 -07:00
Daniel Camargo
60e58bfff8 implement additional payment math in Settlement.php #2250 
- summary email/fax - partial
 2014-06-17 13:00:43 -03:00
Daniel Camargo
b4e193b0bb implement additional payment math in Settlement.php #2250 
- restaurants payment list
 2014-06-17 11:30:53 -03:00
Daniel Camargo
e9aa7b41b9 implement additional payment math in Settlement.php #2250 
- payment summary page
 2014-06-16 17:47:08 -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
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
Daniel Camargo
78192c751d partial Settlement - drivers stuff - cockpit 3 2014-06-12 17:45:28 -03:00
Daniel Camargo
a9e0ca5ed0 implement additional payment math in Settlement.php #2250 2014-06-12 13:01:04 -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
a23f3dc8d5 partial settlement #2250 - cockpit 3 2014-06-11 16:55:23 -03:00
Daniel Camargo
6f892e8e87 Formal Relationship Defaulting to = 0 - Payment Havoc! #3321 2014-06-11 08:44:30 -03:00
Daniel Camargo
84da4e5cda partial #2250 - settlement - calcs and tests 2014-06-10 17:45:04 -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