Pererinha
04613462d0
"offload pex cards" still not working right #5144
2015-03-25 13:07:16 -03:00
mnmeyers
8538e83b92
fixed #5016
2015-03-23 17:55:52 -07:00
mnmeyers
6819d3e536
fixed #5016
2015-03-23 15:14:03 -07: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
acb6cb9d04
Remove the pex card test conditional #4786
2015-03-17 10:29:07 -03:00
mnmeyers
d06e3d44d9
fixed #5068 fixed #4993
2015-03-11 16:41:40 -07:00
Pererinha
b63e669ddd
Merge branch 'master' of https://github.com/crunchbutton/crunchbutton
2015-03-05 11:40:29 -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
Devin Smith
01a980612b
query fixes
2015-03-04 11:18:04 -08: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
4c8b28d8b6
Merge branch 'Issue_4742'
...
Conflicts:
include/controllers/default/cockpit2/api/test/index.php
2015-03-04 09:30:12 -03:00
Devin Smith
ee12d61c74
query fixes
2015-03-03 16:41:15 -08:00
Devin Smith
aa909bebf4
more query fixes
2015-03-03 14:32:16 -08:00
Devin Smith
a4fa1b40ce
more query fixes
2015-03-03 14:17:57 -08:00
Devin Smith
d4eebde917
some data formatting changes
2015-03-03 11:57:56 -08:00
Devin Smith
ec63ff60cd
Merge branch 'master' of github.com:crunchbutton/crunchbutton
2015-03-03 09:09:49 -08:00
Devin Smith
cb61489d4f
pdo cleanup
2015-03-03 09:09:42 -08:00
Pererinha
2df5a0fc10
Reconcile Prices on PEX #3993
2015-03-03 13:08:17 -03:00
Pererinha
8d0c718ce8
partial #4742
2015-03-03 09:50:15 -03:00
Pererinha
03ac62cfc7
partial #4742
2015-03-03 01:35:23 -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
Pererinha
a9b6c0c3bc
partial: driver suggestion: quantity column to make ordering easier #4779
2015-02-23 14:44:25 -03:00
Pererinha
954508a929
New driver information won't process in cockpit.la #4804
2015-02-18 19:27:01 -02:00
Pererinha
566ce823a0
Merge branch 'master' into PexCardAPI_4270
2015-02-13 15:59:16 -02: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
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
Devin Smith
6c2dce5011
deploy changes for branches
2015-02-06 09:22:45 -08: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
Devin Smith
3ad9962691
partial #4612
2015-02-03 12:37:01 -08:00
Pererinha
61115321d5
Merge branch 'master' into PexCardAPI_4270
2015-02-02 16:35:11 -02:00
Pererinha
ef9414ed20
ability to create marketing rep accounts in cockpit.la #4462
2015-02-02 14:57:11 -02:00
Pererinha
ff36a3f623
PEX card report modifications #4270
2015-01-31 14:32:06 -02:00
Pererinha
022572ec5a
partial #4270
2015-01-30 20:06:13 -02:00
Pererinha
639f219e26
partial #4585
2015-01-29 19:38:28 -02:00
Pererinha
39d0d7b59b
ability to create marketing rep accounts in cockpit.la #4462
...
partial
2015-01-26 18:23:17 -02:00
Pererinha
d2fb0f603c
let driver ping customer when 5 min away #4292
2015-01-22 16:38:36 -02:00
Pererinha
e60d212e23
track which admin created new driver accounts, so we know who hired each driver #4092
2015-01-22 13:58:33 -02:00
Pererinha
fc0cba1e0b
set earnings + referrals in rep onboarding #4464
2015-01-21 16:14:02 -02:00
Pererinha
e3010ab650
Test PEX Cards with a few drivers #4278
2015-01-19 18:02:40 -02:00
mnmeyers
5ea9974dae
added tv stuff
2015-01-14 12:15:47 -08:00
Pererinha
31d7f63e3e
partial #2775
2015-01-14 17:49:32 -02:00
Pererinha
2df75c8533
partial #4359
2015-01-14 13:08:41 -02:00
Daniel Camargo
df3a986538
partial #4322
2015-01-12 16:36:10 -02:00
Daniel Camargo
9321dd2944
partial #4278
2015-01-10 14:59:57 -02:00
Daniel Camargo
07f6c84909
closed #4281
2015-01-09 21:24:54 -02:00
Devin Smith
c23e2a5f4a
fixes #4425
2015-01-09 12:00:19 -08:00
Daniel Camargo
84319350db
partial #4279
2015-01-08 00:49:40 -02:00
Daniel Camargo
a46dfb46a8
partial #4276
2015-01-07 13:14:26 -02:00
