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

976 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
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
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
1836888e20 add ability to set max promotion paying for restaurant admin #2083 2014-06-03 10:50:25 -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
c1529d7086 Change Driver Week #3084 - page to send messages/calls 2014-05-29 13:03:15 -03:00
Daniel Camargo
7f314ece22 Change Driver Week #3084 2014-05-29 11:05:10 -03:00
Daniel Camargo
c83edda278 Change Driver Week #3084 - date bug fixed 2014-05-29 10:37:12 -03:00
Daniel Camargo
2fe5af01e5 Merge branch 'refs/heads/master' into Change_Driver_Week_3084 2014-05-28 20:06:23 -03:00
Daniel Camargo
aee9605dce Change Driver Week #3084 2014-05-28 20:05:59 -03:00
arzynik
d62651f7e5 partial #2341 2014-05-28 14:43:42 -07:00
Daniel Camargo
ce998a3248 Merge branch 'refs/heads/master' into Change_Driver_Week_3084 2014-05-28 17:26:31 -03:00
Daniel Camargo
29ed8cfeb8 changed cron to run async 2014-05-28 17:16:45 -03:00
Daniel Camargo
c152605197 testing timeout at cockpit.la 2014-05-28 16:27:55 -03:00
Daniel Camargo
8a35ff1406 remind drivers about their shift the day before their shift #2816 2014-05-28 14:32:57 -03:00
Daniel Camargo
27754e4525 partial #3084 2014-05-28 13:15:28 -03: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