281 Commits

Author SHA1 Message Date
Devin Smith
bd51fe2df0 fixes #5266 2015-04-02 11:41:09 -07:00
Devin Smith
700a6c6259 fixes #5245 2015-04-01 17:19:25 -07:00
Pererinha
389b08c572 Do not pay inactive drivers who shouldn't be paid anymore #5212 2015-04-01 17:48:28 -03:00
Pererinha
bcd95d1c56 fields don't save when onboarding driver #5173 2015-04-01 10:03:09 -03:00
Pererinha
355a1ea614 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton
Conflicts:
	include/library/Crunchbutton/Email/CSDigest.php
2015-03-30 23:28:05 -03:00
Pererinha
ba36cab9b3 partial #4742 2015-03-30 23:24:51 -03:00
Pererinha
04613462d0 "offload pex cards" still not working right #5144 2015-03-25 13:07:16 -03:00
mnmeyers
10db962246 fixed #5052 2015-03-23 13:35:35 -07:00
mnmeyers
6eb08df390 fixed #5006 2015-03-23 12:28:30 -07:00
Pererinha
3251d99fd4 Twitter Sharing From Order Confirmation Page #5026 2015-03-21 17:44:06 -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
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
Pererinha
9aa8412b32 Make query to calculate the amount of time communities are force closed during normal operating hours #4742
script to generate data
2015-03-04 11:58:24 -03:00
Pererinha
75dfeb3f7d Make query to calculate the amount of time communities are force closed during normal operating hours #4742 2015-03-03 01:25:06 -03:00
Jeff Tratner
6020c6c700 Expand user agent in analytics_event so we can compare 2015-02-27 11:41:29 -08:00
Pererinha
082befa946 When a Community is Auto Closed, change 3rd party Restaurant Hours #4866 2015-02-26 08:08:11 -03:00
Pererinha
05d4bc52c2 Merge branch 'master' into Points_redemption_system_4248 2015-02-19 17:43:38 -02:00
Jeff Tratner
8cfad58d47 Fix community orders by day stored procedure
For nick, fixes #4793.
2015-02-19 11:26:32 -08:00
Pererinha
e5550f7c62 Merge branch 'master' into Points_redemption_system_4248 2015-02-19 16:02:48 -02:00
Jeff Tratner
d86f64ca7d Add cron log migration for likely test orders 2015-02-18 17:40:21 -08:00
Jeff Tratner
6b16403ede Do not overwrite prior likely_test data in migration 2015-02-18 17:33:34 -08:00
Jeff Tratner
f16f34751c Reorder migrations for clarity 2015-02-18 17:28:00 -08:00
Jeff Tratner
87e883c715 Add index for test orders + remove extraneous query result fetch 2015-02-18 16:46:20 -08:00
Jeff Tratner
ff068a69dd MODIFY --> ADD 2015-02-18 15:02:02 -08:00
Jeff Tratner
64e429a132 Add cron class + update DB migration 2015-02-18 15:02:01 -08:00
Jeff Tratner
6b461fdd7c Add migration for likely test column 2015-02-18 15:02:01 -08: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
Devin Smith
baf656b70e fixes #4790 2015-02-17 14:18:04 -08: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
0bb82a3cbd create cron to check for closed communities #4613 2015-02-16 16:39:14 -02:00
Pererinha
566ce823a0 Merge branch 'master' into PexCardAPI_4270 2015-02-13 15:59:16 -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
096c16eb80 Add migration for driver group name 2015-02-11 16:33:37 -08:00
Jeff Tratner
029ac70cf9 Basic skeleton for dumping GA tracking events into external database 2015-02-09 18:59:39 -08: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
Jeff Tratner
14aeb94047 Add migrations to deal with 'lazy' MySQL data
Multiple changes to make database compatible with Postgres to enable us
to handle metrics effectively.

Fixes issues with enums that were stored as empty string in NOT NULL
columns to instead just always be null. (and alters schema to handle
that).

Also removes spurious support ticket.
2015-02-06 12:22:20 -08: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
5a5b52f92a partial #4248 2015-02-04 19:34:44 -02:00
Pererinha
9b407f70b4 Merge branch 'master' into PexCardAPI_4270
Conflicts:
	include/controllers/default/cockpit2/api/test/index.php
2015-02-04 14:00:09 -02:00
Pererinha
61069f2347 change driver restaurant name when auto shutting down community #4514 2015-02-03 19:42:30 -02:00
Pererinha
85bf3131e9 automatically shut down community when there is no driver on call at that time #4513 2015-02-03 15:44:23 -02:00
Pererinha
2ca67f17c7 change driver restaurant name when auto shutting down community #4514 2015-02-03 12:49:58 -02:00
Pererinha
61115321d5 Merge branch 'master' into PexCardAPI_4270 2015-02-02 16:35:11 -02:00
Pererinha
a16a546df8 Point redemption system improvements for customer-customer referrals #4248 2015-02-02 01:49:11 -02:00
Pererinha
02170e0d95 partial #4270 - tokens 2015-01-31 15:57:27 -02:00
Pererinha
ff36a3f623 PEX card report modifications #4270 2015-01-31 14:32:06 -02:00
Pererinha
732bc33402 Texts from Support not sending #4568 2015-01-27 20:00:36 -02:00
Pererinha
81c445c2c1 Menu Changes Won't Save #4566 2015-01-27 18:31:01 -02:00