mnmeyers
6eb08df390
fixed #5006
2015-03-23 12:28:30 -07:00
Pererinha
65f73b2dd3
Merge branch 'master' of https://github.com/crunchbutton/crunchbutton
2015-03-23 15:56:42 -03:00
Pererinha
a525667eef
retroactive points fixer and script #4849
2015-03-23 15:56:36 -03:00
mnmeyers
4c84a47b0a
fixed #5071
2015-03-23 11:11:42 -07:00
mnmeyers
4b5121e6e8
Revert "partial #5006 fixed #5071 "
...
This reverts commit 11e0b346461e61ece03b3e4c3b14ae92d37c9b1e.
2015-03-23 11:10:04 -07:00
mnmeyers
11e0b34646
partial #5006 fixed #5071
2015-03-23 11:02:49 -07:00
mnmeyers
6ba988ff6e
fixed #5112
2015-03-23 10:36:09 -07:00
Pererinha
a38fcf1e91
Edit New issue "Create a new gift code" won't work/load #5103
2015-03-23 13:16:27 -03:00
Pererinha
e457e59f79
Twitter Sharing From Order Confirmation Page #5026
2015-03-21 17:45:19 -03:00
Pererinha
61e0fa880d
Merge branch 'partial_5026_sharing'
2015-03-21 17:44:30 -03:00
Pererinha
3251d99fd4
Twitter Sharing From Order Confirmation Page #5026
2015-03-21 17:44:06 -03:00
Pererinha
60194396e3
Drivers can't see past orders in their cockpit.la accounts #5098
2015-03-21 00:45:59 -03:00
Pererinha
4a7a45687d
partial
2015-03-21 00:45:39 -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
5b0b3eb582
Merge branch 'master' into partial_5026_sharing
2015-03-20 15:52:13 -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
88abb17238
partial
...
- frontend/order added two new buttons (twitter and facebook)
- layout/html added the twttr js api
- controllers.js added a test to call the twttr button share
2015-03-19 14:09:58 -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
9927ae028e
"Orders" tab in cockpit.la keeps pulling up "Shifts" #5099
2015-03-18 16:10:03 -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
c91d7ec7f6
Plot last 100 orders on a map at each community so marketing reps know where to do more marketing #3763
2015-03-17 18:46:41 -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
8ae2d919d0
Merge branch 'master' of https://github.com/crunchbutton/crunchbutton
2015-03-17 16:52: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
Devin Smith
e4b369cb85
changed nav tab style
2015-03-17 11:38:55 -07:00
Pererinha
62e5eac095
back api/test/index
2015-03-17 15:32:57 -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
18114b1d06
Merge branch 'master' of https://github.com/crunchbutton/crunchbutton
2015-03-17 14:59:27 -03:00
Pererinha
76a523f606
Transfer Latest PEX drivers to DB #4282
2015-03-17 14:59:21 -03:00
Devin Smith
a11256bfcd
fixed ssl issue
2015-03-17 10:58:36 -07:00
Devin Smith
d09f3688ba
fixed bar issue
2015-03-17 10:51:37 -07:00
Devin Smith
8752d679a0
fixed undefined var issue
2015-03-17 10:44:05 -07: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
Devin Smith
de0414d944
fixes #5070
2015-03-12 08:50:48 -07:00
Devin Smith
762b912b3e
dont redirect if global
2015-03-12 08:48:59 -07:00
mnmeyers
d06e3d44d9
fixed #5068 fixed #4993
2015-03-11 16:41:40 -07:00
Devin Smith
67b13260d4
Merge branch 'master' of github.com:crunchbutton/crunchbutton
2015-03-11 15:50:15 -07:00
