2312 Commits

Author SHA1 Message Date
Pererinha
62069e5554 Point redemption system improvements for customer-customer referrals #4248 2015-02-05 21:20:53 -02:00
Pererinha
40f31a2884 Merge branch 'Points_redemption_system_4248' of https://github.com/crunchbutton/crunchbutton into Points_redemption_system_4248
Conflicts:
	include/views/default/crunchbutton/frontend/restaurant.phtml
	include/views/default/seven/frontend/restaurant.phtml
2015-02-05 21:19:48 -02:00
Pererinha
37c47786a0 Point redemption system improvements for customer-customer referrals #4248 2015-02-05 21:17:23 -02:00
Pererinha
9689d90acb Point redemption system improvements for customer-customer referrals #4248 2015-02-05 20:32:24 -02:00
Pererinha
17c0a15611 Point redemption system improvements for customer-customer referrals #4248 2015-02-05 19:33:55 -02:00
Pererinha
9a9b408fce Merge branch 'master' into Points_redemption_system_4248 2015-02-04 21:03:56 -02:00
Pererinha
fbe10d2726 Point redemption system improvements for customer-customer referrals #4248 2015-02-04 21:03:26 -02:00
Devin Smith
f27fb00fe2 even more fb tests 2015-02-04 14:18:28 -08:00
Devin Smith
e686a64e31 more fb tests 2015-02-04 14:16:17 -08:00
Pererinha
5a5b52f92a partial #4248 2015-02-04 19:34:44 -02:00
Pererinha
6ca53d6d8e Merge branch 'PexCardAPI_4270' into Points_redemption_system_4248 2015-02-04 15:45:22 -02:00
Pererinha
b969334081 Merge branch 'master' into Points_redemption_system_4248 2015-02-04 15:32:49 -02:00
Pererinha
9b407f70b4 Merge branch 'master' into PexCardAPI_4270
Conflicts:
	include/controllers/default/cockpit2/api/test/index.php
2015-02-04 14:00:09 -02:00
Pererinha
d3297a3180 Clarify Cash/Credit Orders #4481 2015-02-04 12:07:45 -02:00
Devin Smith
7c071f57a7 removed session gc for now
fixes #4633
2015-02-04 01:09:49 -08:00
Pererinha
da629ca7f3 Clarify Cash/Credit Orders #4481 2015-02-03 23:18:19 -02:00
Pererinha
dca2ac91b5 when a community doesn't have a driver scheduled for the next shift, change the driver restaurant hours #4515 2015-02-03 21:08:19 -02:00
Pererinha
fda10970de when a community doesn't have a driver scheduled for the next shift, change the driver restaurant hours #4515 2015-02-03 20:53:42 -02:00
Pererinha
0cad2f6e9b telling customers food will arrive in 30 minutes #4623 2015-02-03 20:39:20 -02:00
Pererinha
eaf8f288d9 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2015-02-03 19:42:58 -02:00
Pererinha
61069f2347 change driver restaurant name when auto shutting down community #4514 2015-02-03 19:42:30 -02:00
Devin Smith
3ad9962691 partial #4612 2015-02-03 12:37:01 -08:00
Pererinha
85bf3131e9 automatically shut down community when there is no driver on call at that time #4513 2015-02-03 15:44:23 -02:00
Pererinha
63a8bec395 Clarify Cash/Credit Orders #4481 2015-02-03 10:33:13 -02:00
Pererinha
70ddaec548 Clarify Cash/Credit Orders #4481 2015-02-03 10:22:12 -02:00
Pererinha
488e587ef5 PEX card report modifications #4270 2015-02-02 18:17:52 -02:00
Pererinha
61115321d5 Merge branch 'master' into PexCardAPI_4270 2015-02-02 16:35:11 -02:00
Pererinha
ef9414ed20 ability to create marketing rep accounts in cockpit.la #4462 2015-02-02 14:57:11 -02:00
Pererinha
e3c0ac4ac8 partial #4248 2015-02-02 14:31:14 -02:00
Pererinha
a16a546df8 Point redemption system improvements for customer-customer referrals #4248 2015-02-02 01:49:11 -02:00
Pererinha
02170e0d95 partial #4270 - tokens 2015-01-31 15:57:27 -02:00
Pererinha
ff36a3f623 PEX card report modifications #4270 2015-01-31 14:32:06 -02:00
Pererinha
022572ec5a partial #4270 2015-01-30 20:06:13 -02:00
Pererinha
de6c1b7b51 partial #4270 2015-01-30 11:56:24 -02:00
Pererinha
4e185337ed Merge branch 'master' into PexCardAPI_4270 2015-01-30 10:00:11 -02:00
Pererinha
fe9279c55c partial #4270 2015-01-30 09:59:49 -02:00
Devin Smith
875d7a9c21 partial #4588 2015-01-29 18:02:23 -08:00
Devin Smith
6112452a2e partial #4588 2015-01-29 17:43:11 -08:00
Pererinha
639f219e26 partial #4585 2015-01-29 19:38:28 -02:00
Pererinha
8119cafca7 lifecycle marketing: text customers links to download the app (iphone/android) when they place an order not through the app if they have never used the app before #4262 2015-01-28 10:47:20 -02:00
Pererinha
f84b044b2a community closed fixed 2015-01-27 20:53:03 -02:00
Pererinha
d22d8bf2ee lifecycle marketing: text customers links to download the app (iphone/android) when they place an order not through the app if they have never used the app before #4262 2015-01-27 16:39:07 -02:00
Pererinha
9b209581d6 we're not sending driver shift reminder notifications 15 min before shifts #4555 2015-01-27 14:15:17 -02:00
Pererinha
cdd8c562e0 Settlement Not Including Orders After Midnight #4414 2015-01-27 13:47:06 -02:00
Pererinha
be0d4976a3 ability to create marketing rep accounts in cockpit.la #4462 2015-01-27 11:37:07 -02:00
Pererinha
75ad0ce5d9 ability to create marketing rep accounts in cockpit.la #4462 2015-01-27 11:23:45 -02:00
Pererinha
8d7d3465b8 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2015-01-27 09:15:50 -02:00
mnmeyers
a6f083db03 Fixed #4563 2015-01-26 17:04:43 -08:00
Devin Smith
6e7c52ed4a shift preference notification text change 2015-01-26 17:02:05 -08:00
mnmeyers
bb70d0a170 Partial #4562 2015-01-26 16:40:08 -08:00