sharpetronics/crunchbutton
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes stuff

Browse Source
This commit is contained in:
arzynik 2013-04-24 18:19:17 -07:00
parent 08304ab063
commit f3b1d73296
5 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/controllers/cockpit/cockpit/home/index.php Normal file
View File

@ -0,0 +1,3 @@
<?php
die('default/cockpit');

3
include/controllers/cockpit/default/error/index.php Normal file
View File

@ -0,0 +1,3 @@
<?php
die('sss');

3
include/controllers/cockpit/default/home/index.php Normal file
View File

@ -0,0 +1,3 @@
<?php
die('cockput/dewhatevfault');

12
include/library/Crunchbutton/App.php
View File

@ -27,6 +27,8 @@ class Crunchbutton_App extends Cana_App {
break; break;
case 'crunchr.co': case 'crunchr.co':
case '_DOMAIN_': case '_DOMAIN_':
case 'cockpit.crunchr.co':
case 'cockpit._DOMAIN_':
$env = 'live'; $env = 'live';
break; break;
case 'beta.crunchr.co': case 'beta.crunchr.co':
@ -35,6 +37,7 @@ class Crunchbutton_App extends Cana_App {
case 'dev.crunchr.co': case 'dev.crunchr.co':
$env = 'dev'; $env = 'dev';
break; break;
case 'cockpit.localhost':
case 'crunchbutton.localhost': case 'crunchbutton.localhost':
$env = 'local'; $env = 'local';
break; break;
@ -131,10 +134,17 @@ class Crunchbutton_App extends Cana_App {
case 'wenzel.localhost': case 'wenzel.localhost':
$domain->theme = 'onebuttonwenzel'; $domain->theme = 'onebuttonwenzel';
break; break;
case 'cockpit.localhost':
case 'cockpit.crunchr.co':
case 'cockpit._DOMAIN_':
$domain->version = 'cockpit';
$domain->theme = 'default';
break;
default: default:
$domain->theme = 'crunchbutton'; $domain->theme = 'crunchbutton';
break; break;
} }
$config = $this->config(); $config = $this->config();
@ -288,6 +298,8 @@ class Crunchbutton_App extends Cana_App {
} else { } else {
$params['layout'] = $this->config()->defaults->layout; $params['layout'] = $this->config()->defaults->layout;
} }
print_r($params);
parent::buildView($params); parent::buildView($params);

2
include/library/Crunchbutton/Order.php
View File

@ -964,6 +964,8 @@ class Crunchbutton_Order extends Cana_Table {
unset($out['id_user']); unset($out['id_user']);
unset($out['id']); unset($out['id']);
unset($out['id_order']); unset($out['id_order']);
$out['id'] = $this->uuid;
$out['_restaurant_name'] = $this->restaurant()->name; $out['_restaurant_name'] = $this->restaurant()->name;
$out['user'] = $this->user()->uuid; $out['user'] = $this->user()->uuid;