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

81 Commits

Author SHA1 Message Date
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
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
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
bbf2fc48de partial #2969 - some options were missing at the driver schedule page 2014-05-30 19:13:10 -03:00
Daniel Camargo
7f314ece22 Change Driver Week #3084 2014-05-29 11:05:10 -03:00
Daniel Camargo
2fe5af01e5 Merge branch 'refs/heads/master' into Change_Driver_Week_3084 2014-05-28 20:06:23 -03:00
arzynik
d62651f7e5 partial #2341 2014-05-28 14:43:42 -07:00
Daniel Camargo
6353ca4649 Merge branch 'refs/heads/master' into Change_Driver_Week_3084 2014-05-28 11:46:16 -03:00
Daniel Camargo
cc51f9a40f partial #2969 - email testing 2014-05-27 19:45:13 -03:00
Daniel Camargo
1f5b36ee15 Driver onboarding #2969 
1) When creating an account as a driver, it should automatically add notifications using their phone number (assume they have a smart phone) and email
2) It should text them their username
3) I never received an email to nickhunter1991@gmail.com
4) When I accessed order 16844, I couldn't see the customer price total or subtotal
 2014-05-27 18:59:11 -03:00
Daniel Camargo
a9dc7427db Change Driver Week #3084 
changed the cockpit.la api
 2014-05-27 14:10:18 -03:00
Daniel Camargo
436d5cbcba partial #2969 - schedules 2014-05-23 10:51:45 -03:00
Daniel Camargo
fbe0916ecd partial #2969 - schedules 2014-05-23 10:45:25 -03:00
Daniel Camargo
7796bad45c partial #2969 - driver schedule 2014-05-22 17:22:20 -03:00
Daniel Camargo
e3c095ad08 partial #2969 2014-05-21 18:53:34 -03:00
Daniel Camargo
f36b4f7116 partial #2969 - fixed shift list bug 2014-05-21 16:34:08 -03:00
Daniel Camargo
24ed9b6f02 #partial #2969 - forms / list styles 2014-05-21 13:07:40 -03:00
Daniel Camargo
bd24b33d59 partial #2969 - page list 2014-05-20 21:20:55 -03:00
Daniel Camargo
daa730aecd Driver onboarding #2969 
- changed driver's docs form
- created the api to check if the driver need to send docs or not
 2014-05-20 14:43:56 -03:00
Daniel Camargo
206fb04882 partial #2969 - added the permission verification at api 2014-05-20 11:53:50 -03:00
Daniel Camargo
3587009ff9 Driver onboarding #2969: 
- Added email notification
- Added Logs
- Fixed the library path (place them at cockipt)
 2014-05-20 10:22:09 -03:00
Daniel Camargo
6a7d174f69 partial #2969 - option to play with the order 16844 2014-05-19 11:54:33 -03:00
Daniel Camargo
f8be07b762 partial #2969 - make the url /1234 redirect to /order/1234 2014-05-19 11:17:40 -03:00
Daniel Camargo
bbf7bc7046 partial #2969 - setup and notifications 2014-05-19 11:01:58 -03:00
Daniel Camargo
1324571bd8 partial #2969 - actions stuff 2014-05-19 10:32:20 -03:00
Daniel Camargo
3cfea1b793 partial #2969 2014-05-19 08:20:08 -03:00
Daniel Camargo
82ce1741ce partial #2969 - onboarding public form - for drivers 2014-05-16 11:59:59 -03:00
Daniel Camargo
c9fcf9a569 Merge branch 'refs/heads/master' into Driver_Onboarding_2969 
Conflicts:
	include/controllers/default/cockpit2/api/driver/orders/index.php
 2014-05-15 17:50:22 -03:00