intraface / intraface.dk

src/Intraface/modules/product/Variation/X/Attribute.php

Spacing +2 added lines, -2 removed lines

@@ -19,10 +19,10 @@
         //$this->loadTemplate('Intraface_Doctrine_Template_Intranet');
         $this->actAs('Intraface_Doctrine_Template_Intranet');
         
-        $this->hasOne('Intraface_modules_product_Attribute as attribute', array('local' => 'product_attribute_id','foreign' => 'id'));
+        $this->hasOne('Intraface_modules_product_Attribute as attribute', array('local' => 'product_attribute_id', 'foreign' => 'id'));
         // Notice that Variation/OneAttributeGroup and TwoAttributeGroup extends Variation, which means we do not get
         // all functionality in the relation specified below here. 
-        $this->hasOne('Intraface_modules_product_Variation as variation', array('local' => 'product_variation_id','foreign' => 'id'));
+        $this->hasOne('Intraface_modules_product_Variation as variation', array('local' => 'product_variation_id', 'foreign' => 'id'));
         
     }
     

src/Intraface/modules/product/Product/Details.php

Indentation +12 added lines, -12 removed lines

@@ -319,23 +319,23 @@
     {
         $units = array(
             1 => array('singular' => '',
-                      'plural' => '',
-                      'combined' => ''),
+                        'plural' => '',
+                        'combined' => ''),
             2 => array('singular' => 'unit',
-                      'plural' => 'units',
-                      'combined' => 'unit(s)'),
+                        'plural' => 'units',
+                        'combined' => 'unit(s)'),
             3 => array('singular' => 'day',
-                      'plural' => 'days',
-                      'combined' => 'day(s)'),
+                        'plural' => 'days',
+                        'combined' => 'day(s)'),
             4 => array('singular' => 'month (singular)',
-                      'plural' => 'month (plural)',
-                      'combined' => 'month (combined)'),
+                        'plural' => 'month (plural)',
+                        'combined' => 'month (combined)'),
             5 => array('singular' => 'year',
-                      'plural' => 'years',
-                      'combined' => 'year(s)'),
+                        'plural' => 'years',
+                        'combined' => 'year(s)'),
             6 => array('singular' => 'hour',
-                      'plural' => 'hours',
-                      'combined' => 'hour(s)')
+                        'plural' => 'hours',
+                        'combined' => 'hour(s)')
         );
 
         if ($key === null) {

Doc Comments +14 added lines, -14 removed lines

@@ -184,7 +184,7 @@ 
     /**
      * Returns the price of the product
      *
-     * @return object Ilib_Variable_Float with price
+     * @return Ilib_Variable_Float Ilib_Variable_Float with price
      */
     public function getPrice()
     {
@@ -194,7 +194,7 @@ 
     /**
      * Used to set price
      *
-     * @param object $price Ilib_Variable_Float
+     * @param Ilib_Variable_Float $price Ilib_Variable_Float
      * @return void
      */
     public function setPrice(Ilib_Variable_Float $price)
@@ -206,9 +206,9 @@ 
      * Returns the price of the product in given currency
      *
      * @param object $currency Intraface_modules_currency_Currency
-     * @param integer $exchange_rage_id
+     * @param integer $exchange_rate_id
      *
-     * @return obejct Ilib_Variable_Float with price of the variation in given currency
+     * @return Ilib_Variable_Float Ilib_Variable_Float with price of the variation in given currency
      */
     public function getPriceInCurrency($currency, $exchange_rate_id = 0)
     {
@@ -218,7 +218,7 @@ 
     /**
      * Returns price include vat of the product
      *
-     * @return object Ilib_Variable_Float with price including vat
+     * @return Ilib_Variable_Float Ilib_Variable_Float with price including vat
      */
     public function getPriceIncludingVat()
     {
@@ -230,7 +230,7 @@ 
      *
      * @param object $currency Intraface_modules_currency_Currency
      * @param integer $exchange_rate_id
-     * @return object Ilib_Variable_Float with price including vat in given currency
+     * @return Ilib_Variable_Float Ilib_Variable_Float with price including vat in given currency
      */
     public function getPriceIncludingVatInCurrency($currency, $exchange_rate_id)
     {
@@ -245,7 +245,7 @@ 
     /**
      * Returns the before price of the product
      *
-     * @return object Ilib_Variable_Float with price
+     * @return Ilib_Variable_Float Ilib_Variable_Float with price
      */
     public function getBeforePrice()
     {
@@ -256,9 +256,9 @@ 
      * Returns the before price of the product in given currency
      *
      * @param object $currency Intraface_modules_currency_Currency
-     * @param integer $exchange_rage_id
+     * @param integer $exchange_rate_id
      *
-     * @return obejct Ilib_Variable_Float with price of the variation in given currency
+     * @return Ilib_Variable_Float Ilib_Variable_Float with price of the variation in given currency
      */
     public function getBeforePriceInCurrency($currency, $exchange_rate_id = 0)
     {
@@ -268,7 +268,7 @@ 
     /**
      * Returns before price include vat of the product
      *
-     * @return object Ilib_Variable_Float with price including vat
+     * @return Ilib_Variable_Float Ilib_Variable_Float with price including vat
      */
     public function getBeforePriceIncludingVat()
     {
@@ -280,7 +280,7 @@ 
      *
      * @param object $currency Intraface_modules_currency_Currency
      * @param integer $exchange_rate_id
-     * @return object Ilib_Variable_Float with price including vat in given currency
+     * @return Ilib_Variable_Float Ilib_Variable_Float with price including vat in given currency
      */
     public function getBeforePriceIncludingVatInCurrency($currency, $exchange_rate_id)
     {
@@ -289,7 +289,7 @@ 
 
     /**
      * Sets the weight
-     * @param object $value Ilib_Value_Float
+     * @param Ilib_Variable_Float $value Ilib_Value_Float
      * @return void
      */
     public function setWeight(Ilib_Variable_Float $value)
@@ -300,7 +300,7 @@ 
     /**
      * Returns the weight of the product
      *
-     * @return object Ilib_Variable_Float with price
+     * @return Ilib_Variable_Float Ilib_Variable_Float with price
      */
     public function getWeight()
     {
@@ -361,7 +361,7 @@ 
     /**
      * Returns the var percenttage of the product
      *
-     * @return object Ilib_Variable_Float with vat percent
+     * @return Ilib_Variable_Float Ilib_Variable_Float with vat percent
      */
     public function getVatPercent()
     {

Spacing +10 added lines, -10 removed lines

@@ -73,15 +73,15 @@ 
             //->innerJoin('Intraface_modules_product_ProductDoctrine.details AS details')
             //->addWhere('active = 1')
             ->addWhere('active = 1')
-            ->addWhere('number = ' . $this->number)
-            ->addWhere('intranet_id = ' . $this->intranet_id)
-            ->addWhere('product_id <> ' . $product_id);
+            ->addWhere('number = '.$this->number)
+            ->addWhere('intranet_id = '.$this->intranet_id)
+            ->addWhere('product_id <> '.$product_id);
 
         // not necessary to execute query when counting
         //$collection = $dql->execute();
 
         if ($dql->count() > 0) {
-            $this->getErrorStack()->add('number', $this->number . ' has already been added');
+            $this->getErrorStack()->add('number', $this->number.' has already been added');
         }
 
         return true;
@@ -212,7 +212,7 @@ 
      */
     public function getPriceInCurrency($currency, $exchange_rate_id = 0)
     {
-        return new Ilib_Variable_Float(round($this->getPrice()->getAsIso() / ($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso() / 100), 2));
+        return new Ilib_Variable_Float(round($this->getPrice()->getAsIso()/($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso()/100), 2));
     }
 
     /**
@@ -222,7 +222,7 @@ 
      */
     public function getPriceIncludingVat()
     {
-        return new Ilib_Variable_Float($this->getPrice()->getAsIso(2) * (1 + $this->getVatPercent()->getAsIso()/100));
+        return new Ilib_Variable_Float($this->getPrice()->getAsIso(2)*(1 + $this->getVatPercent()->getAsIso()/100));
     }
 
     /**
@@ -234,7 +234,7 @@ 
      */
     public function getPriceIncludingVatInCurrency($currency, $exchange_rate_id)
     {
-        return new Ilib_Variable_Float($this->getPriceIncludingVat()->getAsIso() / ($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso() / 100));
+        return new Ilib_Variable_Float($this->getPriceIncludingVat()->getAsIso()/($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso()/100));
     }
 
     public function setBeforePrice(Ilib_Variable_Float $value)
@@ -262,7 +262,7 @@ 
      */
     public function getBeforePriceInCurrency($currency, $exchange_rate_id = 0)
     {
-        return new Ilib_Variable_Float(round($this->getBeforePrice($product)->getAsIso() / ($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso() / 100), 2));
+        return new Ilib_Variable_Float(round($this->getBeforePrice($product)->getAsIso()/($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso()/100), 2));
     }
 
     /**
@@ -272,7 +272,7 @@ 
      */
     public function getBeforePriceIncludingVat()
     {
-        return new Ilib_Variable_Float($this->getBeforePrice()->getAsIso(2) * (1 + $this->getVatPercent()->getAsIso()/100));
+        return new Ilib_Variable_Float($this->getBeforePrice()->getAsIso(2)*(1 + $this->getVatPercent()->getAsIso()/100));
     }
 
     /**
@@ -284,7 +284,7 @@ 
      */
     public function getBeforePriceIncludingVatInCurrency($currency, $exchange_rate_id)
     {
-        return new Ilib_Variable_Float($this->getBeforePriceIncludingVat()->getAsIso() / ($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso() / 100));
+        return new Ilib_Variable_Float($this->getBeforePriceIncludingVat()->getAsIso()/($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso()/100));
     }
 
     /**

src/Intraface/modules/product/Controller/Show/PlainText.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
             'db' => $this->mdb2
         );
         
-        $smarty = $this->template->create(dirname(__FILE__) . '/../tpl/show-plain-text');
+        $smarty = $this->template->create(dirname(__FILE__).'/../tpl/show-plain-text');
         return $smarty->render($this, $data);
     }
 

src/Intraface/modules/product/Controller/Show/Variations.php

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
             'existing_groups' => $existing_groups,
             'groups' => $groups);
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/../tpl/variations');
+        $tpl = $this->template->create(dirname(__FILE__).'/../tpl/variations');
         return $tpl->render($this, $data);
     }
 
@@ -69,7 +69,7 @@ 
             'existing_groups' => $existing_groups,
             'groups' => $groups);
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/../tpl/variations-edit');
+        $tpl = $this->template->create(dirname(__FILE__).'/../tpl/variations-edit');
         return $tpl->render($this, $data);
     }
 

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

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
         $product->getDBQuery()->storeResult("use_stored", "products", "toplevel");
         $products = $product->getList();
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/tpl/batchedit');
+        $tpl = $this->template->create(dirname(__FILE__).'/tpl/batchedit');
         return $tpl->render($this, array('products' => $products, 'product' => $product));
     }
 

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

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
 
         $data = array('products' => $products, 'product' => $product);
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/tpl/batchpricechanger');
+        $tpl = $this->template->create(dirname(__FILE__).'/tpl/batchpricechanger');
         return $tpl->render($this, $data);
     }
 
@@ -29,7 +29,7 @@ 
         foreach ($this->body('product_id') AS $key => $product_id) {
             $product = new Product($this->context->getKernel(), $product_id);
             if ($this->body('change_type') == 'percent') {
-                $new_price = $product->get('price') + intval($product->get('price') * ($_POST['price_change'] / 100));
+                $new_price = $product->get('price') + intval($product->get('price')*($_POST['price_change']/100));
                 if ($this->body('round_off') == 'yes') {
                     $new_price = round($new_price, 0);
                 }

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

Spacing +4 added lines, -4 removed lines

@@ -81,7 +81,7 @@ 
             return new k_SeeOther($this->url());
         }
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/tpl/show');
+        $smarty = $this->template->create(dirname(__FILE__).'/tpl/show');
         return $smarty->render($this, $data);
     }
 
@@ -121,7 +121,7 @@ 
         if ($this->body('choose_file') && $this->getKernel()->user->hasModuleAccess('filemanager')) {
             $redirect = Intraface_Redirect::factory($this->getKernel(), 'go');
             $module_filemanager = $this->getKernel()->useModule('filemanager');
-            $url = $redirect->setDestination(NET_SCHEME . NET_HOST . $this->url('filehandler/selectfile', array('images'=>1, 'multiple_choice' => 1)), NET_SCHEME . NET_HOST . $this->url());
+            $url = $redirect->setDestination(NET_SCHEME.NET_HOST.$this->url('filehandler/selectfile', array('images'=>1, 'multiple_choice' => 1)), NET_SCHEME.NET_HOST.$this->url());
             $redirect->setIdentifier('product');
             $redirect->askParameter('file_handler_id', 'multiple');
 
@@ -139,7 +139,7 @@ 
             'product' => $this->getProductDoctrine(),
         );
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/tpl/edit');
+        $smarty = $this->template->create(dirname(__FILE__).'/tpl/edit');
         return $smarty->render($this, $data);
     }
 
@@ -208,7 +208,7 @@ 
     {
         $this->getKernel()->module('product');
         if ($id = $this->getProduct()->copy()) {
-            return new k_SeeOther($this->url('../' . $id));
+            return new k_SeeOther($this->url('../'.$id));
         }
         return $this->render();
     }

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

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
     {
         $module = $this->getKernel()->module('product');
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/tpl/index');
+        $smarty = $this->template->create(dirname(__FILE__).'/tpl/index');
         return $smarty->render($this);
     }
 
@@ -76,7 +76,7 @@ 
             $data['product'] = $this->product_doctrine;
         }
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/tpl/edit');
+        $smarty = $this->template->create(dirname(__FILE__).'/tpl/edit');
         return $smarty->render($this, $data);
     }
 

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

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
     {
         $kernel = $this->context->getKernel();
         $kernel->module('product');
-        $smarty = $this->template->create(dirname(__FILE__) . '/tpl/related');
+        $smarty = $this->template->create(dirname(__FILE__).'/tpl/related');
         return $smarty->render($this);
     }
 
@@ -59,7 +59,7 @@ 
         }
 
         $product->getDBQuery()->defineCharacter("character", "detail_translation.name");
-        $product->getDBQuery()->setCondition("product.id != " . $this->context->name());
+        $product->getDBQuery()->setCondition("product.id != ".$this->context->name());
         $product->getDBQuery()->setExtraUri("&id=".(int)$this->context->name());
         $product->getDBQuery()->usePaging("paging");
         $product->getDBQuery()->storeResult("use_stored", "related_products", "sublevel");
@@ -118,7 +118,7 @@ 
         }
 
         $product->getDBQuery()->defineCharacter("character", "detail_translation.name");
-        $product->getDBQuery()->setCondition("product.id != " . $this->context->name());
+        $product->getDBQuery()->setCondition("product.id != ".$this->context->name());
         $product->getDBQuery()->setExtraUri("&id=".(int)$this->context->name());
         $product->getDBQuery()->usePaging("paging");
         $product->getDBQuery()->storeResult("use_stored", "related_products", "sublevel");