@@ -69,7 +69,7 @@ |
||
| 69 | 69 | $this->resetItemCache(); |
| 70 | 70 | |
| 71 | 71 | $this->conditions = array( |
| 72 | - 'session_id = ' . $this->db->quote($this->session_id, 'text'), |
|
| 72 | + 'session_id = ' . $this->db->quote($this->session_id, 'text'), |
|
| 73 | 73 | 'shop_id = ' . $this->db->quote($this->webshop->getId(), 'integer'), |
| 74 | 74 | 'intranet_id = ' . $this->db->quote($this->intranet->getId(), 'integer')); |
| 75 | 75 | |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | if (is_object($this->basketevaluation)) { |
| 18 | 18 | return $this->basketevaluation; |
| 19 | 19 | } |
| 20 | - if (is_numeric($this->context->name())) { |
|
| 20 | + if (is_numeric($this->context->name())) { |
|
| 21 | 21 | $this->basketevaluation = new Intraface_modules_shop_BasketEvaluation($this->mdb2, $this->getKernel()->intranet, $this->getShop(), (int)$this->context->name()); |
| 22 | 22 | } else { |
| 23 | 23 | $this->basketevaluation = new Intraface_modules_shop_BasketEvaluation($this->mdb2, $this->getKernel()->intranet, $this->getShop()); |
@@ -50,9 +50,9 @@ discard block |
||
| 50 | 50 | $settings = $this->getBasketEvaluation()->get('settings'); |
| 51 | 51 | |
| 52 | 52 | $data = array('basketevaluation' => $this->getBasketEvaluation(), |
| 53 | - 'value' => $this->value, |
|
| 54 | - 'settings' => $settings, |
|
| 55 | - 'translation' => $this->getKernel()->getTranslation('shop') |
|
| 53 | + 'value' => $this->value, |
|
| 54 | + 'settings' => $settings, |
|
| 55 | + 'translation' => $this->getKernel()->getTranslation('shop') |
|
| 56 | 56 | ); |
| 57 | 57 | $tpl = $this->template->create('Intraface/modules/shop/Controller/tpl/evaluation'); |
| 58 | 58 | return $tpl->render($this, $data); |
@@ -33,11 +33,11 @@ |
||
| 33 | 33 | $this->document->setTitle($shop->name); |
| 34 | 34 | |
| 35 | 35 | $this->document->options = array($this->url('../') => 'Close', |
| 36 | - $this->url(null, array('edit')) => 'Edit', |
|
| 37 | - $this->url('featuredproducts') => 'Choose featured products', |
|
| 38 | - $this->url('categories') => 'Product categories', |
|
| 39 | - $this->url('basketevaluation') => 'Basket evaluation', |
|
| 40 | - $this->url('paymentmethods') => 'Payment methods'); |
|
| 36 | + $this->url(null, array('edit')) => 'Edit', |
|
| 37 | + $this->url('featuredproducts') => 'Choose featured products', |
|
| 38 | + $this->url('categories') => 'Product categories', |
|
| 39 | + $this->url('basketevaluation') => 'Basket evaluation', |
|
| 40 | + $this->url('paymentmethods') => 'Payment methods'); |
|
| 41 | 41 | |
| 42 | 42 | $basketevaluation = new Intraface_modules_shop_BasketEvaluation($this->mdb2, $this->getKernel()->intranet, $shop); |
| 43 | 43 | $evaluations = $basketevaluation->getList(); |
@@ -77,8 +77,8 @@ |
||
| 77 | 77 | |
| 78 | 78 | function __construct(k_TemplateFactory $template, Doctrine_Connection_Common $doctrine) |
| 79 | 79 | { |
| 80 | - $this->template = $template; |
|
| 81 | - $this->doctrine = $doctrine; |
|
| 80 | + $this->template = $template; |
|
| 81 | + $this->doctrine = $doctrine; |
|
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | function map($name) |
@@ -115,7 +115,6 @@ discard block |
||
| 115 | 115 | |
| 116 | 116 | /** |
| 117 | 117 | * Creates the dbquery object |
| 118 | - |
|
| 119 | 118 | * @return void |
| 120 | 119 | */ |
| 121 | 120 | public function getDBQuery() |
@@ -223,7 +222,7 @@ discard block |
||
| 223 | 222 | |
| 224 | 223 | function getKernel() |
| 225 | 224 | { |
| 226 | - return $this->kernel; |
|
| 225 | + return $this->kernel; |
|
| 227 | 226 | } |
| 228 | 227 | |
| 229 | 228 | /** |
@@ -572,7 +571,7 @@ discard block |
||
| 572 | 571 | $product_number = (int)$product_number; |
| 573 | 572 | |
| 574 | 573 | $db = new DB_Sql; |
| 575 | - $sql = "SELECT product.id FROM product |
|
| 574 | + $sql = "SELECT product.id FROM product |
|
| 576 | 575 | INNER JOIN product_detail detail |
| 577 | 576 | ON product.id = detail.product_id |
| 578 | 577 | WHERE detail.number = '" . $product_number . "' |
@@ -814,7 +813,7 @@ discard block |
||
| 814 | 813 | "AND product_attribute_group.intranet_id = ".$db->quote($this->intranet->getId())." " . |
| 815 | 814 | "WHERE product_x_attribute_group.intranet_id = ".$db->quote($this->intranet->getId())." " . |
| 816 | 815 | "AND product_x_attribute_group.product_id=" . $this->getId() . " " . |
| 817 | - "ORDER BY product_attribute_group.id"); |
|
| 816 | + "ORDER BY product_attribute_group.id"); |
|
| 818 | 817 | |
| 819 | 818 | if (PEAR::isError($result)) { |
| 820 | 819 | throw new Exception('Error in query :'.$result->getUserInfo()); |
@@ -332,24 +332,24 @@ |
||
| 332 | 332 | public static function getUnits($key = null) |
| 333 | 333 | { |
| 334 | 334 | $units = array(1 => array('singular' => '', |
| 335 | - 'plural' => '', |
|
| 336 | - 'combined' => ''), |
|
| 337 | - 2 => array('singular' => 'unit', |
|
| 338 | - 'plural' => 'units', |
|
| 339 | - 'combined' => 'unit(s)'), |
|
| 340 | - 3 => array('singular' => 'day', |
|
| 341 | - 'plural' => 'days', |
|
| 342 | - 'combined' => 'day(s)'), |
|
| 343 | - 4 => array('singular' => 'month (singular)', |
|
| 344 | - 'plural' => 'month (plural)', |
|
| 345 | - 'combined' => 'month (combined)'), |
|
| 346 | - 5 => array('singular' => 'year', |
|
| 347 | - 'plural' => 'years', |
|
| 348 | - 'combined' => 'year(s)'), |
|
| 349 | - 6 => array('singular' => 'hour', |
|
| 350 | - 'plural' => 'hours', |
|
| 351 | - 'combined' => 'hour(s)') |
|
| 352 | - ); |
|
| 335 | + 'plural' => '', |
|
| 336 | + 'combined' => ''), |
|
| 337 | + 2 => array('singular' => 'unit', |
|
| 338 | + 'plural' => 'units', |
|
| 339 | + 'combined' => 'unit(s)'), |
|
| 340 | + 3 => array('singular' => 'day', |
|
| 341 | + 'plural' => 'days', |
|
| 342 | + 'combined' => 'day(s)'), |
|
| 343 | + 4 => array('singular' => 'month (singular)', |
|
| 344 | + 'plural' => 'month (plural)', |
|
| 345 | + 'combined' => 'month (combined)'), |
|
| 346 | + 5 => array('singular' => 'year', |
|
| 347 | + 'plural' => 'years', |
|
| 348 | + 'combined' => 'year(s)'), |
|
| 349 | + 6 => array('singular' => 'hour', |
|
| 350 | + 'plural' => 'hours', |
|
| 351 | + 'combined' => 'hour(s)') |
|
| 352 | + ); |
|
| 353 | 353 | |
| 354 | 354 | if ($key === null) { |
| 355 | 355 | return $units; |
@@ -51,7 +51,6 @@ discard block |
||
| 51 | 51 | |
| 52 | 52 | /** |
| 53 | 53 | * Creates the dbquery object |
| 54 | - |
|
| 55 | 54 | * @return void |
| 56 | 55 | */ |
| 57 | 56 | public function getDBQuery() |
@@ -168,7 +167,7 @@ discard block |
||
| 168 | 167 | case 'all': // fall through |
| 169 | 168 | default: |
| 170 | 169 | $sql = ''; |
| 171 | - break; |
|
| 170 | + break; |
|
| 172 | 171 | } |
| 173 | 172 | |
| 174 | 173 | $i = 0; // til at give arrayet en key |
@@ -65,7 +65,7 @@ |
||
| 65 | 65 | |
| 66 | 66 | function getIntranetId() |
| 67 | 67 | { |
| 68 | - return $this->intranet_id; |
|
| 68 | + return $this->intranet_id; |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | /** |
@@ -319,23 +319,23 @@ |
||
| 319 | 319 | { |
| 320 | 320 | $units = array( |
| 321 | 321 | 1 => array('singular' => '', |
| 322 | - 'plural' => '', |
|
| 323 | - 'combined' => ''), |
|
| 322 | + 'plural' => '', |
|
| 323 | + 'combined' => ''), |
|
| 324 | 324 | 2 => array('singular' => 'unit', |
| 325 | - 'plural' => 'units', |
|
| 326 | - 'combined' => 'unit(s)'), |
|
| 325 | + 'plural' => 'units', |
|
| 326 | + 'combined' => 'unit(s)'), |
|
| 327 | 327 | 3 => array('singular' => 'day', |
| 328 | - 'plural' => 'days', |
|
| 329 | - 'combined' => 'day(s)'), |
|
| 328 | + 'plural' => 'days', |
|
| 329 | + 'combined' => 'day(s)'), |
|
| 330 | 330 | 4 => array('singular' => 'month (singular)', |
| 331 | - 'plural' => 'month (plural)', |
|
| 332 | - 'combined' => 'month (combined)'), |
|
| 331 | + 'plural' => 'month (plural)', |
|
| 332 | + 'combined' => 'month (combined)'), |
|
| 333 | 333 | 5 => array('singular' => 'year', |
| 334 | - 'plural' => 'years', |
|
| 335 | - 'combined' => 'year(s)'), |
|
| 334 | + 'plural' => 'years', |
|
| 335 | + 'combined' => 'year(s)'), |
|
| 336 | 336 | 6 => array('singular' => 'hour', |
| 337 | - 'plural' => 'hours', |
|
| 338 | - 'combined' => 'hour(s)') |
|
| 337 | + 'plural' => 'hours', |
|
| 338 | + 'combined' => 'hour(s)') |
|
| 339 | 339 | ); |
| 340 | 340 | |
| 341 | 341 | if ($key === null) { |