From f3b1d73296800f57b729e028e024b964a46968d6 Mon Sep 17 00:00:00 2001 From: arzynik Date: Wed, 24 Apr 2013 18:19:17 -0700 Subject: [PATCH] fixes stuff --- include/controllers/cockpit/cockpit/home/index.php | 3 +++ include/controllers/cockpit/default/error/index.php | 3 +++ include/controllers/cockpit/default/home/index.php | 3 +++ include/library/Crunchbutton/App.php | 12 ++++++++++++ include/library/Crunchbutton/Order.php | 2 ++ 5 files changed, 23 insertions(+) create mode 100644 include/controllers/cockpit/cockpit/home/index.php create mode 100644 include/controllers/cockpit/default/error/index.php create mode 100644 include/controllers/cockpit/default/home/index.php diff --git a/include/controllers/cockpit/cockpit/home/index.php b/include/controllers/cockpit/cockpit/home/index.php new file mode 100644 index 000000000..d0c9df39d --- /dev/null +++ b/include/controllers/cockpit/cockpit/home/index.php @@ -0,0 +1,3 @@ +theme = 'onebuttonwenzel'; break; + case 'cockpit.localhost': + case 'cockpit.crunchr.co': + case 'cockpit._DOMAIN_': + $domain->version = 'cockpit'; + $domain->theme = 'default'; + break; default: $domain->theme = 'crunchbutton'; break; } + $config = $this->config(); @@ -288,6 +298,8 @@ class Crunchbutton_App extends Cana_App { } else { $params['layout'] = $this->config()->defaults->layout; } + + print_r($params); parent::buildView($params); diff --git a/include/library/Crunchbutton/Order.php b/include/library/Crunchbutton/Order.php index 05b83bb72..16dc2ccb5 100644 --- a/include/library/Crunchbutton/Order.php +++ b/include/library/Crunchbutton/Order.php @@ -964,6 +964,8 @@ class Crunchbutton_Order extends Cana_Table { unset($out['id_user']); unset($out['id']); unset($out['id_order']); + + $out['id'] = $this->uuid; $out['_restaurant_name'] = $this->restaurant()->name; $out['user'] = $this->user()->uuid;