2312 Commits

Author SHA1 Message Date
Jeff Tratner
64e429a132 Add cron class + update DB migration 2015-02-18 15:02:01 -08:00
Pererinha
954508a929 New driver information won't process in cockpit.la #4804 2015-02-18 19:27:01 -02:00
Devin Smith
7637121b71 fixes #4561 2015-02-18 10:22:30 -08: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
106599b0ab Check all the places where we send text message to CS #4475 2015-02-17 20:42:14 -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
7588d769e2 hours bugs #4783 2015-02-17 16:54:02 -02:00
Pererinha
c1aec14a6c weird closed message at Alabama #4709 2015-02-17 16:19:39 -02:00
Pererinha
0067fc3267 Add driver contact phone number to Orders Page #4605 2015-02-17 14:16:19 -02:00
Pererinha
6231161f88 Checklist for AFTER new settlement is deployed #3603 2015-02-16 19:26:04 -02:00
Pererinha
bf5e309f03 create cron to check for closed communities #4613 2015-02-16 16:44:28 -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
e7e03ef539 Duplicating Restruants not working #4750 2015-02-13 16:43:33 -02:00
Pererinha
82fbf156c4 PEX card report modifications #4270 2015-02-13 16:26:50 -02:00
Pererinha
3c37648bc7 PEX card report modifications #4270 2015-02-13 16:10:04 -02:00
Pererinha
566ce823a0 Merge branch 'master' into PexCardAPI_4270 2015-02-13 15:59:16 -02:00
Pererinha
69ede42112 driver shift preference reminder texts should NOT create support tickets #4487 2015-02-13 15:54:46 -02:00
Pererinha
b877743bb5 Do not have driver payment errors or chron errors show up in customer support #4542 2015-02-13 15:46:21 -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
cbb9dbce9f arbitrary payments just stall #4636 2015-02-12 11:55:46 -02:00
Pererinha
3745915731 arbitrary payments just stall #4636 2015-02-12 11:48:24 -02:00
Pererinha
f52f402538 arbitrary payments just stall #4636 2015-02-12 11:47:01 -02:00
Jeff Tratner
00c35f6dca Allow driver and marketing group names to be longer to allow for disambiguation 2015-02-11 16:33:37 -08:00
Jeff Tratner
a36757bab1 Force driver group creation after community is created 2015-02-11 16:33:37 -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
ed7e20dc46 get community auto shut down working #4703 2015-02-09 19:50:02 -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
7805691065 Check all the places where we send text message to CS #4475 2015-02-09 12:05:58 -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
Pererinha
23a95d6c66 Smart ETA MVP #4600 2015-02-07 17:55:00 -02:00
Devin Smith
5dac06dd43 order rules cron 2015-02-06 19:57:57 -08:00
Pererinha
978d53a5ad more auto shutdown community stuff 2015-02-06 19:08:57 -02:00
Devin Smith
5597bb4ddb fixed postgre crap 2015-02-06 12:19:35 -08:00
Devin Smith
788b008a9b postre support tests 2015-02-06 10:53:22 -08:00
Pererinha
5a07f4df10 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2015-02-06 15:52:07 -02:00
Pererinha
2ec082031e Indiana University Metrics Not Work #4096 2015-02-06 15:52:00 -02:00
Devin Smith
e1601f5f7b Merge branch 'master' of github.com:crunchbutton/crunchbutton 2015-02-06 09:22:55 -08:00
Devin Smith
6c2dce5011 deploy changes for branches 2015-02-06 09:22:45 -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
28776c9c6d automatically shut down community when there is no driver on call at that time #4513 2015-02-06 14:18:54 -02:00
Pererinha
7f8c8ea333 automatically shut down community when there is no driver on call at that time #4513 2015-02-06 12:12:54 -02:00
Pererinha
08ee654f08 change driver restaurant name when auto shutting down community #4514 2015-02-06 11:21:49 -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