intraface / intraface.dk

src/Intraface/modules/product/Product.php

Spacing +31 added lines, -31 removed lines

@@ -146,8 +146,8 @@ 
     public function load()
     {
         $this->db->query("SELECT id, active, locked, changed_date, ".implode(',', $this->fields)." FROM product
-                WHERE intranet_id = " . $this->kernel->intranet->getId() . "
-                    AND id = " . $this->id . " LIMIT 1");
+                WHERE intranet_id = " . $this->kernel->intranet->getId()."
+                    AND id = " . $this->id." LIMIT 1");
 
         if (!$this->db->nextRecord()) {
             $this->value['id'] = 0;
@@ -396,13 +396,13 @@ 
 
         if ($this->id > 0) {
             $sql_type = "UPDATE ";
-            $sql_end  = " WHERE id = " . $this->id . " AND intranet_id = " . $this->intranet->getId();
+            $sql_end  = " WHERE id = ".$this->id." AND intranet_id = ".$this->intranet->getId();
         } else {
             $sql_type = "INSERT INTO";
-            $sql_end  = ", intranet_id = " . $this->intranet->getId();
+            $sql_end  = ", intranet_id = ".$this->intranet->getId();
         }
 
-        $this->db->query($sql_type . " product SET ".$sql." changed_date = NOW()"    . $sql_end);
+        $this->db->query($sql_type." product SET ".$sql." changed_date = NOW()".$sql_end);
 
         if (empty($this->id)) {
             $this->id = $this->db->insertedId();
@@ -435,7 +435,7 @@ 
 
         $new_id = $product->save(
             array(
-                'name' => $this->get('name') . ' (kopi)',
+                'name' => $this->get('name').' (kopi)',
                 'description' => $this->get('description'),
                 'price' => amountToForm($this->get('price')), // make sure that this is formatted to local format
                 'weight' => (float)$this->get('weight'),
@@ -505,8 +505,8 @@ 
         $db = new Db_Sql;
         $sql = "UPDATE product
             SET active = 0
-            WHERE id = " . $this->id. "
-                AND intranet_id = " . $this->intranet->getId() . "
+            WHERE id = " . $this->id."
+                AND intranet_id = " . $this->intranet->getId()."
                 AND locked = 0";
         $db->query($sql);
 
@@ -529,7 +529,7 @@ 
         $db = new Db_Sql;
         $sql = "UPDATE product
             SET active = 1
-            WHERE id = " . $this->id. "
+            WHERE id = " . $this->id."
                 AND intranet_id = " . $this->intranet->getId();
         $db->query($sql);
         $this->value['active'] = 1;
@@ -548,7 +548,7 @@ 
             FROM product
             INNER JOIN product_detail
                 ON product_detail.product_id = product.id
-            WHERE product.intranet_id = " . $this->intranet->getId() . "
+            WHERE product.intranet_id = " . $this->intranet->getId()."
             ORDER BY product_detail.number DESC LIMIT 1";
         $db->query($sql);
         if (!$db->nextRecord()) {
@@ -572,8 +572,8 @@ 
          $sql = "SELECT product.id FROM product
           INNER JOIN product_detail detail
             ON product.id = detail.product_id
-            WHERE detail.number = '" . $product_number . "'
-                AND detail.product_id <> " . $this->id . "
+            WHERE detail.number = '" . $product_number."'
+                AND detail.product_id <> " . $this->id."
                 AND detail.active = 1
                 AND product.active=1
                 AND product.intranet_id = ".$this->intranet->getId()." LIMIT 1";
@@ -631,17 +631,17 @@ 
         $db = new DB_Sql;
 
         if ($status == 'relate') {
-            $db->query("SELECT * FROM product_related WHERE product_id=" . $this->id  . " AND related_product_id = " . (int)$id . " AND intranet_id =" .$this->intranet->getId());
+            $db->query("SELECT * FROM product_related WHERE product_id=".$this->id." AND related_product_id = ".(int)$id." AND intranet_id =".$this->intranet->getId());
             if ($db->nextRecord()) {
                 return true;
             }
             if ($id == $this->id) {
                 return false;
             }
-            $db->query("INSERT INTO product_related SET product_id = " . $this->id . ", related_product_id = " . (int)$id . ", intranet_id = " . $this->intranet->getId());
+            $db->query("INSERT INTO product_related SET product_id = ".$this->id.", related_product_id = ".(int)$id.", intranet_id = ".$this->intranet->getId());
             return true;
         } else {
-            $db->query("DELETE FROM product_related WHERE product_id = " . $this->id . " AND intranet_id = " . $this->intranet->getId() . " AND related_product_id = " . (int)$id);
+            $db->query("DELETE FROM product_related WHERE product_id = ".$this->id." AND intranet_id = ".$this->intranet->getId()." AND related_product_id = ".(int)$id);
             return true;
         }
     }
@@ -656,7 +656,7 @@ 
     public function deleteRelatedProduct($id)
     {
         $db = new DB_Sql;
-        $db->query("DELETE FROM product_related WHERE product_id = " . $this->id . " AND intranet_id = " . $this->intranet->getId() . " AND related_product_id = " . (int)$id);
+        $db->query("DELETE FROM product_related WHERE product_id = ".$this->id." AND intranet_id = ".$this->intranet->getId()." AND related_product_id = ".(int)$id);
         return true;
     }
 
@@ -670,7 +670,7 @@ 
     public function deleteRelatedProducts()
     {
         $db = new DB_Sql;
-        $db->query("DELETE FROM product_related WHERE product_id = " . $this->id . " AND intranet_id = " . $this->intranet->getId());
+        $db->query("DELETE FROM product_related WHERE product_id = ".$this->id." AND intranet_id = ".$this->intranet->getId());
         return true;
     }
 
@@ -685,12 +685,12 @@ 
         $key      = 0;
         $ids      = array();
         $db       = new DB_Sql;
-        $sql      = "SELECT related_product_id FROM product_related WHERE product_id = " . $this->id . " AND intranet_id = " . $this->intranet->getId();
+        $sql      = "SELECT related_product_id FROM product_related WHERE product_id = ".$this->id." AND intranet_id = ".$this->intranet->getId();
         $db->query($sql);
 
         // r�kkef�lgen er vigtig - f�rst hente fra product og bagefter tilf�je nye v�rdier til arrayet
         while ($db->nextRecord()) {
-            $product                      = new Product($this->kernel, $db->f('related_product_id'));
+            $product = new Product($this->kernel, $db->f('related_product_id'));
             if ($product->get('id') == 0 || $product->get('active') == 0 || ($show == 'webshop' && $product->get('do_show') == 0)) {
                 continue;
             }
@@ -725,7 +725,7 @@ 
             }
             // den her skal vist lige kigges igennem, for den tager jo alt med p� nettet?
             // 0 = only stock
-            if ($this->kernel->setting->get('intranet', 'webshop.show_online') == 0 and !empty($which) and $which=='webshop') { // only stock
+            if ($this->kernel->setting->get('intranet', 'webshop.show_online') == 0 and !empty($which) and $which == 'webshop') { // only stock
                 if (array_key_exists('for_sale', $products[$key]['stock_status']) and $products[$key]['stock_status']['for_sale'] <= 0) {
                     continue;
                 }
@@ -754,7 +754,7 @@ 
         }
 
         $db = MDB2::singleton(DB_DSN);
-        $result = $db->query("SELECT id FROM product_x_attribute_group WHERE intranet_id = ".$db->quote($this->intranet->getId())." AND product_id=" . $this->getId()  . " AND product_attribute_group_id = " . (int)$id);
+        $result = $db->query("SELECT id FROM product_x_attribute_group WHERE intranet_id = ".$db->quote($this->intranet->getId())." AND product_id=".$this->getId()." AND product_attribute_group_id = ".(int)$id);
         if (PEAR::isError($result)) {
             throw new Exception('Error in query :'.$result->getUserInfo());
         }
@@ -762,7 +762,7 @@ 
         if ($result->numRows() > 0) {
             return true;
         }
-        $result = $db->exec("INSERT INTO product_x_attribute_group SET product_id = " . $this->getId() . ", product_attribute_group_id = " . (int)$id . ", intranet_id = " . $this->intranet->getId());
+        $result = $db->exec("INSERT INTO product_x_attribute_group SET product_id = ".$this->getId().", product_attribute_group_id = ".(int)$id.", intranet_id = ".$this->intranet->getId());
         if (PEAR::isError($result)) {
             throw new Exception('Error in insert :'.$result->getUserInfo());
         }
@@ -784,7 +784,7 @@ 
         }
 
         $db = MDB2::singleton(DB_DSN);
-        $result = $db->exec("DELETE FROM product_x_attribute_group WHERE intranet_id = ".$db->quote($this->intranet->getId())." AND product_id=" . $this->getId()  . " AND product_attribute_group_id = " . (int)$id);
+        $result = $db->exec("DELETE FROM product_x_attribute_group WHERE intranet_id = ".$db->quote($this->intranet->getId())." AND product_id=".$this->getId()." AND product_attribute_group_id = ".(int)$id);
         if (PEAR::isError($result)) {
             throw new Exception('Error in query :'.$result->getUserInfo());
         }
@@ -812,12 +812,12 @@ 
         // NOTE: Very important that it is ordered by product_attribute_group.id so the groups
         // does always get attached to the correct attribute number on the variation. Se above todo in method doc
         $db = MDB2::singleton(DB_DSN);
-        $result = $db->query("SELECT product_attribute_group.* FROM product_x_attribute_group " .
-                "INNER JOIN product_attribute_group " .
-                    "ON product_x_attribute_group.product_attribute_group_id = product_attribute_group.id " .
-                    "AND product_attribute_group.intranet_id = ".$db->quote($this->intranet->getId())." " .
-                "WHERE product_x_attribute_group.intranet_id = ".$db->quote($this->intranet->getId())." " .
-                    "AND product_x_attribute_group.product_id=" . $this->getId()  . " " .
+        $result = $db->query("SELECT product_attribute_group.* FROM product_x_attribute_group ".
+                "INNER JOIN product_attribute_group ".
+                    "ON product_x_attribute_group.product_attribute_group_id = product_attribute_group.id ".
+                    "AND product_attribute_group.intranet_id = ".$db->quote($this->intranet->getId())." ".
+                "WHERE product_x_attribute_group.intranet_id = ".$db->quote($this->intranet->getId())." ".
+                    "AND product_x_attribute_group.product_id=".$this->getId()." ".
                  "ORDER BY product_attribute_group.id");
 
         if (PEAR::isError($result)) {
@@ -871,7 +871,7 @@ 
     public function isFilledIn()
     {
         $db = new DB_Sql;
-        $db->query("SELECT count(*) AS antal FROM product WHERE intranet_id = " . $this->intranet->getId());
+        $db->query("SELECT count(*) AS antal FROM product WHERE intranet_id = ".$this->intranet->getId());
         if ($db->nextRecord()) {
             return $db->f('antal');
         }
@@ -886,7 +886,7 @@ 
     public function any()
     {
         $db = new DB_Sql;
-        $db->query("SELECT id FROM product WHERE intranet_id = " . $this->intranet->getId()." AND active = 1");
+        $db->query("SELECT id FROM product WHERE intranet_id = ".$this->intranet->getId()." AND active = 1");
         return $db->numRows();
     }
 

src/Intraface/modules/product/Controller/Productattributegroup.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 
         $data = array('product' => $product, 'groups' => $groups);
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/tpl/productattributegroup');
+        $smarty = $this->template->create(dirname(__FILE__).'/tpl/productattributegroup');
         return $smarty->render($this, $data);
     }
 

src/Intraface/modules/product/Controller/Selectproduct.php

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
 
         $data = array('products' => $list);
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/tpl/selectproduct');
+        $smarty = $this->template->create(dirname(__FILE__).'/tpl/selectproduct');
         return $smarty->render($this, $data);
     }
 

src/Intraface/modules/product/Controller/tpl/variation.tpl.php

Spacing +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <div id="colOne">
 
     <div class="box">
-        <h2><?php e(t('Product')); ?> #<?php e($product->get('number'));  ?> <?php e($product->get('name')); ?></h2>
-        <h2><?php e(t('Variation')); ?> #<?php e($variation->getNumber());  ?> <?php e($variation->getName()); ?></h2>
+        <h2><?php e(t('Product')); ?> #<?php e($product->get('number')); ?> <?php e($product->get('name')); ?></h2>
+        <h2><?php e(t('Variation')); ?> #<?php e($variation->getNumber()); ?> <?php e($variation->getName()); ?></h2>
         <ul class="options">
             <li><a href="<?php e(url('../../')); ?>"><?php e(t('close')); ?></a></li>
         </ul>

src/Intraface/modules/product/Controller/tpl/show.tpl.php

Spacing +8 added lines, -8 removed lines

@@ -1,7 +1,7 @@ 
 <div id="colOne">
 
 <div class="box">
-    <h2>#<?php e($product->get('number'));  ?> <?php e($product->get('name')); ?></h2>
+    <h2>#<?php e($product->get('number')); ?> <?php e($product->get('name')); ?></h2>
     <ul class="options">
         <?php if ($product->get('locked') != 1) { ?>
         <li><a href="<?php e(url(null, array('edit'))); ?>"><?php e(t('Edit')); ?></a></li>
@@ -39,7 +39,7 @@ 
         <td>
             <?php
                 // getting settings
-                $unit_choises  = Product::getUnits();
+                $unit_choises = Product::getUnits();
                 e(t($unit_choises[$product->get('unit_id')]['combined']));
             ?>
         </td>
@@ -93,7 +93,7 @@ 
             } else {
                 $account = Account::factory($year, $product->get('state_account_id'));
                 if ($account->get('name')) {
-                    e($account->get('number') . ' ' . $account->get('name'));
+                    e($account->get('number').' '.$account->get('name'));
                 } else {
                     echo t('Not set');
                 }
@@ -165,10 +165,10 @@ 
                         <td><?php e($variation->getNumber()); ?></td>
                         <td><?php e($variation->getName()); ?></td>
                         <td><?php e($variation->getDetail()->getPrice($product)->getAsLocal('da_dk', 2)); ?> </td>
-                        <td><?php e($product->get('weight')+$variation->getDetail()->getWeightDifference()); ?></td>
+                        <td><?php e($product->get('weight') + $variation->getDetail()->getWeightDifference()); ?></td>
                         <?php if ($kernel->user->hasModuleAccess("stock") and $product->get('stock')) : ?>
                             <td><?php e($variation->getStock($product)->get('actual_stock')); ?></td>
-                            <td><a href="<?php e(url('variation/' . $variation->getId())); ?>"><?php e(t('Details')); ?></a></td>
+                            <td><a href="<?php e(url('variation/'.$variation->getId())); ?>"><?php e(t('Details')); ?></a></td>
                         <?php endif; ?>
 
                     </tr>
@@ -197,9 +197,9 @@ 
         $related = $product->getRelatedProducts();
     if (!empty($related) and count($related) > 0) {
         foreach ($related as $p) {
-            echo '<li>'. $p['name'];
+            echo '<li>'.$p['name'];
             if ($p['locked'] == 0) {
-                echo ' <a class="delete" href="'.url('related', array('delete', 'del_related' => $p['related_id'])) .'">'.t('remove').'</a>';
+                echo ' <a class="delete" href="'.url('related', array('delete', 'del_related' => $p['related_id'])).'">'.t('remove').'</a>';
             }
             echo '</li>';
         }
@@ -254,7 +254,7 @@ 
                 <?php $category_type = new Intraface_Category_Type('shop', $shop->getId()); ?>
                 <h3><?php e($shop->getName()); ?></h3>
                 <ul class="options">
-                    <li><a href="<?php e(url('shop/'. $shop->getId() . '/categories/', array('product_id' => $product->getId()))); ?>"><?php e(t('Add product to categories')); ?></a></li>
+                    <li><a href="<?php e(url('shop/'.$shop->getId().'/categories/', array('product_id' => $product->getId()))); ?>"><?php e(t('Add product to categories')); ?></a></li>
                 </ul>
                 <?php
                 $category = new Intraface_Category($kernel, $db, $category_type);

src/Intraface/modules/product/Controller/tpl/show-plain-text.tpl.php

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
     </tr>
     <tr>
         <td><?php e(t('Number')); ?></td>
-        <td><?php e($product->get('number'));  ?></td>
+        <td><?php e($product->get('number')); ?></td>
     </tr>
     <tr>
         <td><?php e(t('Name')); ?></td>
@@ -87,7 +87,7 @@ 
                     <td><?php e($variation->getNumber()); ?></td>
                     <td><?php e($variation->getName()); ?></td>
                     <td><?php e($variation->getDetail()->getPrice($product)->getAsLocal('da_dk', 2)); ?> </td>
-                    <td><?php e($product->get('weight')+$variation->getDetail()->getWeightDifference()); ?></td>
+                    <td><?php e($product->get('weight') + $variation->getDetail()->getWeightDifference()); ?></td>
                     <?php if ($kernel->user->hasModuleAccess("stock") and $product->get('stock')) : ?>
                         <td><?php e($variation->getStock($product)->get('actual_stock')); ?></td>
                     <?php endif; ?>

src/Intraface/modules/product/Controller/tpl/selectproduct.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
                 <tr>
                     <td>
                         <?php if ($p['has_variation']) : ?>
-                            <a href="<?php e(url($p['id'] . '/selectvariation', array('set_quantity' => $context->quantity, 'multiple' => $context->multiple))); ?>" /><?php echo '<img class="variation" src="/images/icons/silk/table_multiple.png" title="'.t("See the product's variations").'"/> '; ?></a>
+                            <a href="<?php e(url($p['id'].'/selectvariation', array('set_quantity' => $context->quantity, 'multiple' => $context->multiple))); ?>" /><?php echo '<img class="variation" src="/images/icons/silk/table_multiple.png" title="'.t("See the product's variations").'"/> '; ?></a>
                         <?php elseif ($context->multiple && $context->quantity) : ?>
                             <input id="<?php e($p['id']); ?>" type="text" name="selected[<?php e($p['id']); ?>]" value="<?php if (isset($selected_products[$p['id']])) :
                                 e($selected_products[$p['id']]);

src/Intraface/modules/product/Controller/tpl/edit.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -152,7 +152,7 @@
         $year->loadActiveYear();
 
         $account = new Account($year);
-        $accounts =  $account->getList('sale');
+        $accounts = $account->getList('sale');
 
     ?>
     <fieldset>

src/Intraface/modules/product/Controller/Selectproductvariation.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
             'product' => $product
         );
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/tpl/selectproductvariation');
+        $smarty = $this->template->create(dirname(__FILE__).'/tpl/selectproductvariation');
         return $smarty->render($this, $data);
     }