572 Commits

Author SHA1 Message Date
Pererinha
43ab8a7fae Allow us to customize the Auto-Closed message at a community #5107 2015-03-27 14:27:42 -03:00
Pererinha
76554f140e add field to driver onboarding #4948 2015-03-27 12:19:03 -03:00
Pererinha
41a4d919d1 order export broken - can't process restaurant payment! #5140 2015-03-26 16:11:32 -03:00
Pererinha
96101e8917 cockpit.la pex-loading and pex-finding not working! #5153 2015-03-25 18:47:08 -03:00
Pererinha
56a46eba48 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton
Conflicts:
	include/library/Crunchbutton/Admin/Notification.php
2015-03-25 17:20:23 -03:00
Pererinha
898c79a98a retroactive points fixer and script #4849 2015-03-25 16:26:18 -03:00
Devin Smith
6c9d80eb35 partial #3973 2015-03-25 12:15:58 -07:00
Pererinha
4e977747c8 Reward Retroactive Points 2015-03-25 16:15:01 -03:00
Pererinha
014e7abcb8 100,000 $1 gift codes and 10,000 $3 gift codes in CSV #5100 2015-03-25 13:35:41 -03:00
Pererinha
a58553c31f remove tests 2015-03-25 13:13:38 -03:00
Pererinha
04613462d0 "offload pex cards" still not working right #5144 2015-03-25 13:07:16 -03:00
Pererinha
f305336eb6 100,000 $1 gift codes and 10,000 $3 gift codes in CSV #5100 2015-03-24 17:05:24 -03:00
Pererinha
7f48661f70 100,000 $1 gift codes and 10,000 $3 gift codes in CSV #5100 2015-03-24 17:02:26 -03:00
Pererinha
6fc3c3c19b 100,000 $1 gift codes and 10,000 $3 gift codes in CSV #5100 2015-03-24 16:59:37 -03:00
Pererinha
4637ffc7df 100,000 $1 gift codes and 10,000 $3 gift codes in CSV #5100 2015-03-24 16:57:55 -03:00
Pererinha
5aa8f49e86 100,000 $1 gift codes and 10,000 $3 gift codes in CSV #5100 2015-03-24 16:51:41 -03:00
Pererinha
ec06376be7 100,000 $1 gift codes and 10,000 $3 gift codes in CSV #5100 2015-03-24 16:49:04 -03:00
Pererinha
7b6de56ae2 fix config at pex card 2015-03-24 15:47:56 -03:00
Pererinha
1459509cba pex error: date and month switched in start date! #5145 2015-03-24 15:08:05 -03:00
Devin Smith
6f1dcb6469 shouldnt be lower 2015-03-23 17:12:41 -07:00
Devin Smith
6644f4a06b config save things 2015-03-23 14:48:40 -07:00
Pererinha
fec27ffd28 retroactive points fixer and script #4849 2015-03-23 16:34:46 -03:00
Pererinha
a525667eef retroactive points fixer and script #4849 2015-03-23 15:56:36 -03:00
Pererinha
4a7a45687d partial 2015-03-21 00:45:39 -03:00
Pererinha
fab9cf7148 Drivers can't see past orders in their cockpit.la accounts #5098 2015-03-20 12:35:50 -03:00
Pererinha
59016571e8 retroactive points fixer and script #4849 2015-03-19 17:16:40 -03:00
Pererinha
ed85c98111 retroactive points fixer and script #4849 2015-03-19 16:20:59 -03:00
Pererinha
9c72b8008f Merge branch 'Points_redemption_system_4248' into Reward_4881
Conflicts:
	include/controllers/default/cockpit2/api/test/index.php
	include/controllers/default/crunchbutton/api/test/index.php
	include/library/Crunchbutton/Order.php
	include/views/default/crunchbutton/frontend/order.phtml
	include/views/default/crunchbutton/frontend/orders.phtml
	include/views/default/crunchbutton/frontend/restaurant.phtml
	include/views/default/seven/frontend/order.phtml
	include/views/default/seven/frontend/restaurant.phtml
	www/assets/scss/seven.scss
2015-03-18 11:43:02 -03:00
Pererinha
78209d8bbf Plot last 100 orders on a map at each community so marketing reps know where to do more marketing #3763 2015-03-17 18:32:05 -03:00
Pererinha
dacb2bcee1 fixed typo 2015-03-17 17:32:51 -03:00
Pererinha
62e5eac095 back api/test/index 2015-03-17 15:32:57 -03:00
Pererinha
0209dea596 partial: Driver Settlement: Failed Payments Marked As Succeeded! #3930 2015-03-17 15:21:46 -03:00
Pererinha
76a523f606 Transfer Latest PEX drivers to DB #4282 2015-03-17 14:59:21 -03:00
Devin Smith
13b347ee64 updated timeout test 2015-03-10 12:13:45 -07:00
Devin Smith
f86531517a query fix 2015-03-04 13:07:21 -08:00
Devin Smith
b14bad3427 replace date_sub 2015-03-04 13:03:05 -08:00
Devin Smith
01a980612b query fixes 2015-03-04 11:18:04 -08:00
Devin Smith
40f6425e7c query fixes 2015-03-04 09:12:15 -08:00
Devin Smith
9d53728723 bool ossies 2015-03-03 17:38:28 -08:00
Devin Smith
40a6262da5 bool query fixes 2015-03-03 14:09:31 -08:00
Devin Smith
d4eebde917 some data formatting changes 2015-03-03 11:57:56 -08:00
Devin Smith
6dfa4b7134 lots of bool changes 2015-03-02 12:00:12 -08:00
Pererinha
2fe61a9289 Auto close - driver's timezone problem #4965 2015-03-02 15:40:25 -03:00
Devin Smith
4ffd94658b some postgres required changes 2015-02-28 00:42:18 -08:00
Devin Smith
35b0f32e83 WARNING: THIS MIGHT BREAK EVERYTHING
Upgraded all db stuff to PDO
fixes #2195
2015-02-27 17:46:24 -08:00
Devin Smith
537c515b5c add config test 2015-02-27 14:31:40 -08:00
Pererinha
b9d389b6f8 partial #4838 2015-02-21 13:01:00 -02:00
Pererinha
9c024d6e2a Transfer Latest PEX drivers to DB #4282
partially done
2015-02-20 10:49:04 -02:00
Pererinha
e5550f7c62 Merge branch 'master' into Points_redemption_system_4248 2015-02-19 16:02:48 -02:00
Pererinha
14a84268b0 pex card issues #4706 2015-02-19 11:30:31 -02:00