2312 Commits

Author SHA1 Message Date
Pererinha
98da7051f2 excessive notifications for orders after they are accepted #5139 2015-03-25 17:18:29 -03:00
Pererinha
4e977747c8 Reward Retroactive Points 2015-03-25 16:15:01 -03:00
Pererinha
04613462d0 "offload pex cards" still not working right #5144 2015-03-25 13:07:16 -03:00
Devin Smith
eba47fc262 more null division fixes 2015-03-24 10:18:20 -07:00
Pererinha
aec6e9fa83 yummy, fuckfinals codes not working #5125 2015-03-24 02:16:06 -03:00
Pererinha
6aed676e07 Finish up rewards system #4881 2015-03-24 01:18:58 -03:00
mnmeyers
8538e83b92 fixed #5016 2015-03-23 17:55:52 -07:00
mnmeyers
6819d3e536 fixed #5016 2015-03-23 15:14:03 -07:00
Devin Smith
e816243c65 push fixes 2015-03-23 15:03:22 -07:00
Devin Smith
e885b260b2 push fixes 2015-03-23 14:58:26 -07:00
Devin Smith
6644f4a06b config save things 2015-03-23 14:48:40 -07:00
mnmeyers
10db962246 fixed #5052 2015-03-23 13:35:35 -07:00
Devin Smith
59e0b5e115 fixed a 0 division issue 2015-03-23 12:55:01 -07:00
mnmeyers
6eb08df390 fixed #5006 2015-03-23 12:28:30 -07:00
Pererinha
a525667eef retroactive points fixer and script #4849 2015-03-23 15:56:36 -03:00
Pererinha
3251d99fd4 Twitter Sharing From Order Confirmation Page #5026 2015-03-21 17:44:06 -03:00
Pererinha
85dc074e1a Drivers can't see past orders in their cockpit.la accounts #5098 2015-03-21 00:45:11 -03:00
Pererinha
d2b2bc892b Auto-Close feature not working (screenshots) #5105 2015-03-20 14:04:54 -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
9615ec510c Reopening Hours displayed when community is auto-closed are incorrect #5108 2015-03-19 19:41:51 -03:00
Pererinha
aae919bece only use redeemed points if the user knows about them #4851 2015-03-19 17:35:43 -03:00
Pererinha
59016571e8 retroactive points fixer and script #4849 2015-03-19 17:16:40 -03:00
Pererinha
61b0061bc2 Twitter Sharing From Order Confirmation Page #5026 2015-03-19 16:43:14 -03:00
Pererinha
ed85c98111 retroactive points fixer and script #4849 2015-03-19 16:20:59 -03:00
Pererinha
cdb8d00022 detect if a user is eligible for a first time referal before telling them #4932 2015-03-19 11:08:23 -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
2d94d5fd9a Fixed a bug at Cana_Table
if the field was the enum type and one of its options have the 'int' on it it was assuming that the field was an int
2015-03-18 17:25:21 -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
1cc3808760 Driver Settlement: Failed Payments Marked As Succeeded! #3930 2015-03-17 15:28:12 -03:00
Pererinha
0209dea596 partial: Driver Settlement: Failed Payments Marked As Succeeded! #3930 2015-03-17 15:21:46 -03:00
Pererinha
acb6cb9d04 Remove the pex card test conditional #4786 2015-03-17 10:29:07 -03:00
Pererinha
ba8434771c Missing shifts on schedule that's texted to phone #5022 2015-03-17 10:13:21 -03:00
mnmeyers
eea5f8fc99 partial #5006 2015-03-16 17:05:17 -07:00
mnmeyers
d06e3d44d9 fixed #5068 fixed #4993 2015-03-11 16:41:40 -07:00
mnmeyers
146d710dcd fixed #5055 2015-03-11 11:01:15 -07:00
Devin Smith
5d0147a64a fixed db insert issue 2015-03-10 13:46:45 -07:00
Devin Smith
edf87cee8e time fixes 2015-03-10 13:04:38 -07:00
mnmeyers
457860b848 fixed #5025 partial #5006 2015-03-09 12:08:36 -07:00
mnmeyers
36758fdef8 fixed #5020 2015-03-09 10:45:32 -07:00
Pererinha
113b0db346 added option to skip the template compression at xml 2015-03-05 20:21:04 -03:00
Pererinha
72e4ee5cb7 CS Team Request: Rejected Order Notification #4877 2015-03-05 17:28:41 -03:00
Pererinha
6ed79c0a1b Make query to calculate the amount of time communities are force closed during normal operating hours #4742 2015-03-05 11:43:17 -03:00
Pererinha
b63e669ddd Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2015-03-05 11:40:29 -03:00
Pererinha
b9ab07025b Make query to calculate the amount of time communities are force closed during normal operating hours #4742 2015-03-05 11:40:06 -03:00
mnmeyers
41434bcf0a partial #5006 2015-03-04 18:04:21 -08:00
Devin Smith
b14bad3427 replace date_sub 2015-03-04 13:03:05 -08:00
Devin Smith
e76835ae15 query fixes 2015-03-04 12:50:11 -08:00
Devin Smith
0763b2e570 query fixes 2015-03-04 11:22:15 -08:00