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

67 Commits

Author SHA1 Message Date
Daniel Camargo
6dfbc93df2 partial #3930 2014-10-29 19:20:14 -02:00
Daniel Camargo
9abee1ee2b partial #3879 2014-10-27 14:39:03 -02:00
Daniel Camargo
e8bf066660 partial #3886 2014-10-21 18:55:54 -02:00
Daniel Camargo
ff34c7288d partial ##3714 2014-10-07 23:14:57 -03:00
Daniel Camargo
425bd3b2ea partial #3545 2014-10-06 11:16:56 -03:00
Daniel Camargo
5e2c93cd5d partial 2014-10-06 10:33:58 -03:00
arzynik
d90825e405 Updated code for new twilio library 2014-09-25 15:59:44 -07:00
Daniel Camargo
2590bb92df partial #3727 
Driver Settlement: Critical Formatting Changes #3727
 2014-09-24 14:59:57 -03:00
Daniel Camargo
a8a778a6d7 partial #3727 
Driver Settlement: Critical Formatting Changes #3727
 2014-09-24 13:56:37 -03:00
Daniel Camargo
e3392ae120 partial #3726 2014-09-19 15:01:28 -03:00
Daniel Camargo
d266d715e9 partial #3562 
See Restaurants With No Payment Method
 2014-09-11 16:07:26 -03:00
Daniel Camargo
b672f9bfa5 partial #3562 
See Restaurants With No Payment Method #3562
 2014-09-11 14:20:13 -03:00
Daniel Camargo
2ddd9ea1fc Checklist for AFTER new settlement is deployed #3603 
script to send email and sms
 2014-09-03 00:25:04 -03:00
Daniel Camargo
f629148e75 Merge branch 'master' into reward_points 
Conflicts:
	include/views/default/cockpit2/frontend/drivers/drivers-order.phtml
	www/assets/cockpit/scss/cockpit.scss
 2014-07-30 15:59:43 -03:00
kenneth0123
9fc380bb39 merge Kenneth branch to Master 2014-07-28 15:22:44 -07:00
kenneth
0e6fda0403 for orders list 2014-07-28 11:32:10 -07:00
Daniel Camargo
d09b4a79c2 rewards: two way gift cards #2561 
driver's payment done
 2014-07-24 11:52:14 -03:00
Daniel Camargo
ae461634f9 partial: rewards: two way gift cards #2561 
admin referred payment working at settlement
 2014-07-23 18:43:15 -03:00
kenneth
c6dab30acd latest changes 7/23 2014-07-23 14:17:12 -07:00
Daniel Camargo
5d8097fefd driver documents on cockpit.la should be downloadable and should include the driver's full name #3462 2014-07-17 10:46:07 -03:00
Daniel Camargo
8fe812b813 add uploaded documents directly to cockpit la onboarding page, instead of having to click on a driver to see them #3314 2014-07-16 11:52:33 -03:00
Daniel Camargo
8760ee4705 add uploaded documents directly to cockpit la onboarding page, instead of having to click on a driver to see them #3314 2014-07-16 11:46:29 -03:00
Daniel Camargo
4f268a91cd partial: add uploaded documents directly to cockpit la onboarding page, instead of having to click on a driver to see them #3314 2014-07-15 17:11:47 -03:00
Daniel Camargo
d52782139a add an option for bike or car #3393 2014-07-15 13:39:25 -03:00
Daniel Camargo
c2369b738b restaurant order placement: success #3349 2014-07-15 10:33:05 -03:00
Daniel Camargo
ef18d23155 restaurant order placement: dashboard #3353 2014-07-14 18:26:55 -03:00
Daniel Camargo
ff234d1813 Automate Pay Summaries for Drivers in cbtn.io #3234 
Shift payment
 2014-07-14 12:20:53 -03:00
Daniel Camargo
4afdb5d7dd Automate Pay Summaries for Drivers in cbtn.io #3234 2014-07-14 10:27:54 -03:00
Daniel Camargo
85b5bed1d7 Automate Pay Summaries for Drivers in cbtn.io #3234 2014-07-10 15:08:00 -03:00
Daniel Camargo
440ef8ce89 Driver's settlement bug #3234 2014-07-09 13:42:59 -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
ef908f7fed travis fixed 2014-07-04 17:41:05 -03:00
Daniel Camargo
dc340dc4ec Auto-Settlement: Driver Pay #3232 - hourly payment 2014-07-04 16:59:09 -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
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
b9ae498b07 bugs when making an account on cockpit.la using http://cockpit.la/onboarding/ on phone #3358 2014-06-24 12:45:01 -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
826c201a14 implement additional payment math in Settlement.php #2250 
- balanced payment working
- storing balanced log errors
 2014-06-19 10:04:23 -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
75b5ecb9b5 implement additional payment math in Settlement.php #2250 
- summary email/fax
- summary view page
 2014-06-17 15:37:19 -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
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
9ee4c78909 implement additional payment math in Settlement.php #2250 2014-06-13 18:46:39 -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
e9c4826cbe fixes #3359 2014-06-10 15:50:10 -07: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