1557 Commits

Author SHA1 Message Date
Pererinha
b9d389b6f8 partial #4838 2015-02-21 13:01:00 -02:00
Pererinha
2212219d53 partial #4838 2015-02-21 12:47:13 -02:00
Pererinha
daa184c6a3 partial #4838 2015-02-21 07:36:42 -02:00
Pererinha
060e515da9 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2015-02-20 10:49:11 -02:00
Pererinha
9c024d6e2a Transfer Latest PEX drivers to DB #4282
partially done
2015-02-20 10:49:04 -02:00
Jeff Tratner
5d4b066667 Fix not setting community 2015-02-19 16:58:42 -08:00
Jeff Tratner
0d5d874b5b Make getting the event and all that jazz actually work 2015-02-19 15:54:37 -08:00
Jeff Tratner
445dc18ff7 Add in sequence number for sessions
(makes it easier to disambiguate sessions)
2015-02-19 15:05:53 -08:00
Pererinha
4814cceef4 fixed hours bug 2015-02-19 16:52:06 -02:00
Pererinha
14a84268b0 pex card issues #4706 2015-02-19 11:30:31 -02:00
Pererinha
f1bf5a5882 pex card issues #4706 2015-02-19 11:10:13 -02:00
Pererinha
6fb86b4640 Blasts No Longer Send #4708 2015-02-18 18:17:10 -02:00
Pererinha
806a6f4051 Reimbursements Fail #4789 2015-02-18 18:03:33 -02:00
Pererinha
02bb458ced Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2015-02-18 17:47:49 -02:00
Pererinha
fcfc776788 Reimbursements Fail #4789 2015-02-18 17:47:43 -02:00
Devin Smith
a2ba0cf928 partial #4507 2015-02-18 11:28:22 -08:00
mnmeyers
de5322600b fixed #4507 2015-02-18 11:19:05 -08:00
Pererinha
1caf92d982 Reimbursements Fail #4789 2015-02-18 17:15:09 -02:00
Pererinha
c01741b636 Reimbursements Fail #4789 2015-02-18 16:57:48 -02:00
Pererinha
f511ebf223 payment paying drivers for all shifts ever worked? #4799 2015-02-18 16:13:10 -02:00
Pererinha
16e06507fd payment paying drivers for all shifts ever worked? #4799 2015-02-18 16:08:44 -02:00
Pererinha
1ca4c594d2 auto-close solution 2: new variable #4781 2015-02-18 15:50:31 -02:00
Pererinha
76119386d8 payment paying drivers for all shifts ever worked? #4799 2015-02-18 12:44:08 -02:00
Pererinha
7696157b6e settlement fix 2015-02-18 02:16:41 -02:00
Pererinha
f9b60e290a Reimbursements Fail #4789 2015-02-18 01:03:28 -02:00
Pererinha
71cb8d43d0 community warn 2015-02-17 11:50:35 -02:00
Pererinha
6231161f88 Checklist for AFTER new settlement is deployed #3603 2015-02-16 19:26:04 -02:00
Pererinha
3bfb5e3619 create cron to check for closed communities #4613 2015-02-16 16:47:47 -02:00
Pererinha
0bb82a3cbd create cron to check for closed communities #4613 2015-02-16 16:39:14 -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
Pererinha
566ce823a0 Merge branch 'master' into PexCardAPI_4270 2015-02-13 15:59:16 -02:00
Pererinha
8ab0fdedbf display closed restaurants instead of hiding them #4617 2015-02-12 19:08:26 -02:00
Pererinha
b96c5609de removing a permanently scheduled driver from a single shift removes them from all future shifts #4549 2015-02-12 16:36:10 -02:00
Pererinha
0c311db453 Add this option to cockpit.crunchbutton.com restaurant page #4718 2015-02-12 12:12:19 -02:00
Jeff Tratner
b4a1421419 Merge pull request #4744 from crunchbutton/4596-use-longer-driver-names
Allow driver and marketing group names to be longer to allow for disambiguation
2015-02-11 16:48:43 -08:00
Jeff Tratner
a36757bab1 Force driver group creation after community is created 2015-02-11 16:33:37 -08:00
Jeff Tratner
d626cce757 Actually exit when we have invalid data 2015-02-11 07:46:40 -08:00
Jeff Tratner
5f5c24c960 Additional tweaks to get everything working correctly 2015-02-09 18:59:39 -08:00
Jeff Tratner
f97233df21 Fix request code to use jquery rather than angular functions (since defined outside of angular-level code) 2015-02-09 18:59:39 -08:00
Jeff Tratner
029ac70cf9 Basic skeleton for dumping GA tracking events into external database 2015-02-09 18:59:39 -08:00
mnmeyers
1b82447c62 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton
* 'master' of https://github.com/crunchbutton/crunchbutton: (70 commits)
  angular upgrade
  get community auto shut down working #4703
  get community auto shut down working #4703
  mobile tweaks
  Check all the places where we send text message to CS #4475
  posible fix for #4679
  fixes #4684
  fixes #4683
  fixed some order stuff
  fixes #4704
  upgraded anguar
  convert to email field
  Check all the places where we send text message to CS #4475
  Smart ETA MVP #4600
  fixed map link
  order rules cron
  changed more food button again
  fixed support sending message
  open link in new window
  open link in new window
  ...

Conflicts:
	include/views/default/cockpit2/bundle/js.phtml
2015-02-09 15:54:59 -08:00
mnmeyers
a6a3dc8c8e Fixed #4532, #4632, #4611 2015-02-09 15:53:50 -08:00
Pererinha
4b3e8c8207 get community auto shut down working #4703 2015-02-09 19:53:55 -02:00
Pererinha
dfeed011a0 Merge branch 'master' into PexCardAPI_4270
Conflicts:
	include/controllers/default/cockpit2/api/test/index.php
	include/views/default/crunchbutton/frontend/order.phtml
2015-02-09 12:12:26 -02:00
Pererinha
9d3ddf02bc Check all the places where we send text message to CS #4475 2015-02-08 13:01:57 -02:00
Pererinha
d776e3437f Merge branch 'master' of https://github.com/crunchbutton/crunchbutton
Conflicts:
	www/assets/scss/seven.scss
2015-02-07 18:21:43 -02:00
Devin Smith
5597bb4ddb fixed postgre crap 2015-02-06 12:19:35 -08:00
Devin Smith
b522ee9bcc added metrics sample 2015-02-06 12:00:34 -08:00
Devin Smith
788b008a9b postre support tests 2015-02-06 10:53:22 -08:00
Pererinha
2ec082031e Indiana University Metrics Not Work #4096 2015-02-06 15:52:00 -02:00