sharpetronics/crunchbutton
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,128 Commits 5 Branches 1 Tag
Commit Graph

7128 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Devin Smith
6f1dcb6469 shouldnt be lower 2015-03-23 17:12:41 -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
Devin Smith
9c5a18d725 android push stuff 2015-03-23 14:19:38 -07:00
Devin Smith
9f9318ae01 fixed scope issue 2015-03-23 13:57:48 -07:00
Devin Smith
f225d3eac7 fixed some android push shit 2015-03-23 13:43:02 -07:00
mnmeyers
10db962246 fixed #5052 2015-03-23 13:35:35 -07:00
Devin Smith
d8a6453f4b fuxed another null division error 2015-03-23 12:59:27 -07:00
Devin Smith
59e0b5e115 fixed a 0 division issue 2015-03-23 12:55:01 -07:00
Devin Smith
0040abdc6e Merge branch 'master' of github.com:crunchbutton/crunchbutton 2015-03-23 12:40:12 -07:00
Devin Smith
62dbcbf0b8 minor styling 2015-03-23 12:40:04 -07:00
Pererinha
74d22af4a5 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2015-03-23 16:34:54 -03:00
Pererinha
fec27ffd28 retroactive points fixer and script #4849 2015-03-23 16:34:46 -03:00
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