495 Commits

Author SHA1 Message Date
Pererinha
6aed676e07 Finish up rewards system #4881 2015-03-24 01:18:58 -03:00
Pererinha
3251d99fd4 Twitter Sharing From Order Confirmation Page #5026 2015-03-21 17:44:06 -03:00
Pererinha
aae919bece only use redeemed points if the user knows about them #4851 2015-03-19 17:35:43 -03:00
Pererinha
34c8581ddc don't say "You have 1000000 points! This delivery fee is on us." on non-third-party-delivery restaurants #4940 2015-03-18 18:20:13 -03:00
Pererinha
d4901a02ba Edit New issue customer referral changes - mvp #4859 2015-03-18 14:45:30 -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
adf064e138 Don't Send Driver "Canceled-Order" Text After Order is Delivered #5043 2015-03-17 16:51:54 -03:00
Pererinha
72e4ee5cb7 CS Team Request: Rejected Order Notification #4877 2015-03-05 17:28:41 -03:00
Devin Smith
e76835ae15 query fixes 2015-03-04 12:50:11 -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
1612dbda81 query fix 2015-03-03 14:20:01 -08:00
Devin Smith
a4fa1b40ce more query fixes 2015-03-03 14:17:57 -08:00
Devin Smith
d4eebde917 some data formatting changes 2015-03-03 11:57:56 -08:00
Devin Smith
14ed703534 lots of pdo updates 2015-03-02 10:01:52 -08:00
Pererinha
ab27ec859c Msg: Do Not Call Chipotle #3925 2015-02-27 10:32:42 -03:00
Pererinha
81e4daadf2 orders page text changes #2810 2015-02-20 16:52:06 -02:00
Pererinha
f21e36e4be orders page text changes #2810 2015-02-20 16:47:50 -02:00
Pererinha
9be5789f54 Real-Time PEX Transfer #3992 2015-02-20 16:15:12 -02:00
Pererinha
d50c7a95ce Merge branch 'master' into Points_redemption_system_4248
Conflicts:
	include/controllers/default/cockpit2/api/test/index.php
	include/views/default/crunchbutton/frontend/order.phtml
	include/views/default/seven/frontend/orders.phtml
	www/assets/scss/seven.scss
2015-02-17 19:29:50 -02:00
Pererinha
952fb9b650 can't enter a gift card and actual notes at same time #4589 2015-02-16 13:26:51 -02:00
Jeff Tratner
a36757bab1 Force driver group creation after community is created 2015-02-11 16:33:37 -08:00
Pererinha
a84a678879 can't enter a gift card and actual notes at same time #4589 2015-02-06 15:13:07 -02:00
Pererinha
a10f0a733a Cash order telling driver to pay with pex card - other issues with instructing drivers to pay? #4661 2015-02-05 23:56:36 -02:00
Pererinha
b0b1dba4ac Edit Cash order telling driver to pay with pex card - other issues with instructing drivers to pay? #4661 2015-02-05 23:55:19 -02:00
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
fbe10d2726 Point redemption system improvements for customer-customer referrals #4248 2015-02-04 21:03:26 -02:00
Pererinha
5a5b52f92a partial #4248 2015-02-04 19:34:44 -02:00
Pererinha
d3297a3180 Clarify Cash/Credit Orders #4481 2015-02-04 12:07:45 -02:00
Pererinha
da629ca7f3 Clarify Cash/Credit Orders #4481 2015-02-03 23:18:19 -02:00
Pererinha
0cad2f6e9b telling customers food will arrive in 30 minutes #4623 2015-02-03 20:39:20 -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
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
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
fc0cba1e0b set earnings + referrals in rep onboarding #4464 2015-01-21 16:14:02 -02:00
Pererinha
7970290645 Restaurants not getting orders from Crunchbutton #4500 2015-01-20 12:40:51 -02:00
Pererinha
2e2f1e6770 Restaurants not getting orders from Crunchbutton #4500 2015-01-20 12:17:43 -02:00
Pererinha
e3010ab650 Test PEX Cards with a few drivers #4278 2015-01-19 18:02:40 -02:00
Pererinha
8b613127ce partial #4372 2015-01-16 16:19:19 -02:00
Pererinha
c78f912ca4 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2015-01-14 13:08:51 -02:00
Pererinha
2df75c8533 partial #4359 2015-01-14 13:08:41 -02:00
Devin Smith
7393130c4c fixes #4444 2015-01-13 08:44:10 -08:00
Daniel Camargo
cbb4ad2f7b partial #4344 2015-01-11 02:11:49 -02:00
Daniel Camargo
f0e11d3c45 partial #4318 2015-01-09 18:43:17 -02:00
Daniel Camargo
ee981c9188 partial #2810 2015-01-04 16:58:29 -02:00