intraface / intraface.dk

src/Intraface/modules/invoice/PaymentGateway.php

Doc Comments +5 added lines, -2 removed lines

@@ -19,6 +19,9 @@ 
         $this->dbquery = $this->getDBQuery();
     }
 
+    /**
+     * @param string|null $id
+     */
     function findById($id)
     {
         $db = new DB_Sql;
@@ -113,7 +116,7 @@ 
     /**
      * returns possible payment types
      *
-     * @return array payment types
+     * @return string[] payment types
      *
      */
     public static function getTypes()
@@ -128,7 +131,7 @@ 
     /**
      * returns the possible types payments can be for.
      *
-     * @return array payment for types
+     * @return string[] payment for types
      */
     private static function getPaymentForTypes()
     {

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
     function findById($id)
     {
         $db = new DB_Sql;
-        $db->query('SELECT * FROM invoice_payment WHERE id = ' . $id);
+        $db->query('SELECT * FROM invoice_payment WHERE id = '.$id);
 
         if (!$db->nextRecord()) {
             return false;

src/Intraface/modules/invoice/Pdf/Reminder.php

Doc Comments +3 added lines

@@ -11,6 +11,9 @@
     private $db;

     public $error;

 

+    /**
+     * @param Reminder $reminder
+     */
     function __construct($reminder, $id = 0)

     {

         $this->reminder = $reminder;

Spacing +7 added lines, -7 removed lines

@@ -61,7 +61,7 @@ 
             if ($line == "") {
                 $this->doc->setY('-'.$this->doc->get('font_spacing'));
 
-                if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+                if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                     $this->doc->nextPage(true);
                 }
             } else {
@@ -71,7 +71,7 @@ 
               
                     $this->doc->setY('-'.$this->doc->get("font_padding_bottom"));
 
-                    if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+                    if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                         $this->doc->nextPage(true);
                     }
                 }
@@ -82,7 +82,7 @@ 
 
         $this->doc->setY('-20'); // space to product list
 
-        if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 3) {
+        if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*3) {
             $this->doc->nextPage(true);
         }
 
@@ -96,7 +96,7 @@ 
         $this->doc->addText($apointX["text"], $this->doc->get('y'), $this->doc->get("font_size"), "Beskrivelse");
         $this->doc->addText($apointX["invoice_date"], $this->doc->get('y'), $this->doc->get("font_size"), "Dato");
         $this->doc->addText($apointX["due_date"], $this->doc->get('y'), $this->doc->get("font_size"), "Forfaldsdato");
-        $this->doc->addText($apointX["amount"] - $this->doc->getTextWidth($this->doc->get("font_size"), "Beløb") -3, $this->doc->get('y'), $this->doc->get("font_size"), "Bel�b");
+        $this->doc->addText($apointX["amount"] - $this->doc->getTextWidth($this->doc->get("font_size"), "Beløb") - 3, $this->doc->get('y'), $this->doc->get("font_size"), "Bel�b");
 
         $this->doc->setY('-'.($this->doc->get("font_spacing") - $this->doc->get("font_size")));
 
@@ -129,7 +129,7 @@ 
             $this->doc->setY('-'.$this->doc->get("font_padding_bottom"));
             $total += $items[$i]["arrears"];
 
-            if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+            if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                 $this->doc->nextPage(true);
             }
         }
@@ -154,7 +154,7 @@ 
             $this->doc->setY('-'.$this->doc->get("font_padding_bottom"));
             $total += $items[$i]["reminder_fee"];
 
-            if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+            if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                 $this->doc->nextPage(true);
             }
         }
@@ -175,7 +175,7 @@ 
             $this->doc->setY('-'.$this->doc->get("font_padding_bottom"));
             $total += $reminder->get("reminder_fee");
 
-            if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+            if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                 $this->doc->nextPage(true);
             }
         }

src/Intraface/modules/invoice/Reminder.php

Doc Comments +13 added lines, -4 removed lines

@@ -36,6 +36,9 @@ 
         return $this->dbquery;
     }
 
+    /**
+     * @param string $type
+     */
     function getItems($type = null)
     {
         $this->loadItem();
@@ -297,7 +300,8 @@ 
     /**
      * Sets status for the reminder
      *
-     * @return true / false
+     * @param string $status
+     * @return boolean / false
      */
     function setStatus($status)
     {
@@ -356,7 +360,7 @@ 
     /**
      * returns DebtorAccount object
      *
-     * @return object DebtorAccount
+     * @return DebtorAccount DebtorAccount
      */
     public function getDebtorAccount()
     {
@@ -575,6 +579,11 @@ 
      * @param object year stating year
      * @param integer voucher_number
      * @param string voucher_date
+     * @param Year $year
+     * @param integer $voucher_number
+     * @param string $voucher_date
+     * @param integer $credit_account_number
+     * @param Stub_Translation $translation
      * @return boolean true or false
      */
     function state($year, $voucher_number, $voucher_date, $credit_account_number, $translation)
@@ -687,7 +696,7 @@ 
     /**
      * returns possible status types
      *
-     * @return array possible status types
+     * @return string[] possible status types
      */
     private static function getStatusTypes()
     {
@@ -702,7 +711,7 @@ 
     /**
      * returns possible payment methods
      *
-     * @return array possible payment methods
+     * @return string[] possible payment methods
      */
     private static function getPaymentMethods()
     {

Indentation +3 added lines, -3 removed lines

@@ -722,9 +722,9 @@
     function getPaymentInformation()
     {
         $info = array('bank_name'    => $this->kernel->setting->get("intranet", "bank_name"),
-                      'bank_reg_number' => $this->kernel->setting->get("intranet", "bank_reg_number"),
-                      'bank_account_number' => $this->kernel->setting->get("intranet", "bank_account_number"),
-                      'giro_account_number' => $this->kernel->setting->get("intranet", "giro_account_number")
+                        'bank_reg_number' => $this->kernel->setting->get("intranet", "bank_reg_number"),
+                        'bank_account_number' => $this->kernel->setting->get("intranet", "bank_account_number"),
+                        'giro_account_number' => $this->kernel->setting->get("intranet", "giro_account_number")
         );
 
         return $info;

Spacing +6 added lines, -6 removed lines

@@ -126,7 +126,7 @@ 
 
     function isNumberFree($number)
     {
-        $sql = "SELECT id FROM invoice_reminder WHERE number = ".intval($number)." AND id != ".$this->id . " AND intranet_id = " . $this->kernel->intranet->get('id');
+        $sql = "SELECT id FROM invoice_reminder WHERE number = ".intval($number)." AND id != ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id');
         $this->db->query($sql);
         if ($this->db->nextRecord()) {
             return false;
@@ -339,7 +339,7 @@ 
         }
 
         $db = new Db_Sql;
-        $db->query("UPDATE invoice_reminder SET status = ".$status_id.", ".$sql."  WHERE id = " . $this->id . " AND intranet_id = " . $this->kernel->intranet->get('id'));
+        $db->query("UPDATE invoice_reminder SET status = ".$status_id.", ".$sql."  WHERE id = ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id'));
         $this->load();
         return true;
     }
@@ -477,14 +477,14 @@ 
         }
         $db = new DB_Sql;
         $db->query("SELECT id
-            FROM invoice_reminder WHERE intranet_id = ".$this->kernel->intranet->get("id")." AND active = 1 AND contact_id=" . $contact_id);
+            FROM invoice_reminder WHERE intranet_id = ".$this->kernel->intranet->get("id")." AND active = 1 AND contact_id=".$contact_id);
         return $db->numRows();
     }
 
     function isFilledIn()
     {
         $db = new DB_Sql;
-        $db->query("SELECT id FROM invoice_reminder WHERE intranet_id = " . $this->kernel->intranet->get('id'));
+        $db->query("SELECT id FROM invoice_reminder WHERE intranet_id = ".$this->kernel->intranet->get('id'));
         return $db->numRows();
     }
 
@@ -500,7 +500,7 @@ 
     {
         // FIXME - check on date
         $db = new DB_Sql;
-        $db->query("UPDATE invoice_reminder SET date_stated = '" . $voucher_date . "', voucher_id = '".$voucher_id."' WHERE id = " . $this->id . " AND intranet_id = " . $this->kernel->intranet->get('id'));
+        $db->query("UPDATE invoice_reminder SET date_stated = '".$voucher_date."', voucher_id = '".$voucher_id."' WHERE id = ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id'));
         return true;
     }
 
@@ -647,7 +647,7 @@ 
 
         require_once 'Intraface/modules/accounting/VoucherFile.php';
         $voucher_file = new VoucherFile($voucher);
-        if (!$voucher_file->save(array('description' => $text, 'belong_to'=>'reminder','belong_to_id'=>$this->get('id')))) {
+        if (!$voucher_file->save(array('description' => $text, 'belong_to'=>'reminder', 'belong_to_id'=>$this->get('id')))) {
             $this->error->merge($voucher_file->error->getMessage());
             $this->error->set('Filen blev ikke overflyttet');
         }

src/Intraface/modules/invoice/ReminderGateway.php

Doc Comments +3 added lines

@@ -8,6 +8,9 @@
 

 class OnlinePaymentDefault extends OnlinePayment

 {

+    /**
+     * @param integer $id
+     */
     function __construct($kernel, $id) {

 

         parent::__construct($kernel, $id);

Spacing +4 added lines, -4 removed lines

@@ -24,7 +24,7 @@ 
 
     function findById($id)
     {
-        require_once dirname(__FILE__) . '/Reminder.php';
+        require_once dirname(__FILE__).'/Reminder.php';
         return new Reminder($this->kernel, $id);
     }
 
@@ -39,14 +39,14 @@ 
         }
         $db = new DB_Sql;
         $db->query("SELECT id
-            FROM invoice_reminder WHERE intranet_id = ".$this->kernel->intranet->get("id")." AND active = 1 AND contact_id=" . $contact_id);
+            FROM invoice_reminder WHERE intranet_id = ".$this->kernel->intranet->get("id")." AND active = 1 AND contact_id=".$contact_id);
         return $db->numRows();
     }
 
     function setNewContactId($old_contact_id, $new_contact_id)
     {
         $db = new DB_Sql;
-        $db->query('UPDATE invoice_reminder SET contact_id = ' . $new_contact_id . ' WHERE contact_id = ' . $old_contact_id);
+        $db->query('UPDATE invoice_reminder SET contact_id = '.$new_contact_id.' WHERE contact_id = '.$old_contact_id);
         return true;
     }
 
@@ -157,7 +157,7 @@ 
     function isFilledIn()
     {
         $db = new DB_Sql;
-        $db->query("SELECT id FROM invoice_reminder WHERE intranet_id = " . $this->kernel->intranet->get('id'));
+        $db->query("SELECT id FROM invoice_reminder WHERE intranet_id = ".$this->kernel->intranet->get('id'));
         return $db->numRows();
     }
 

src/Intraface/modules/onlinepayment/OnlinePayment.php

Doc Comments +10 added lines, -3 removed lines

@@ -298,6 +298,10 @@ 
         return $this->id;
     }
 
+    /**
+     * @param string $belong_to
+     * @param integer $belong_to_id
+     */
     function changeBelongTo($belong_to, $belong_to_id)
     {
         if ($this->id == 0) {
@@ -321,6 +325,9 @@ 
 
     }
 
+    /**
+     * @param string $status
+     */
     function setStatus($status)
     {
         if ($this->id == 0) {
@@ -582,7 +589,7 @@ 
     /**
      * returns the possible status types
      *
-     * @return array with status types
+     * @return string[] with status types
      */
     static function getStatusTypes()
     {
@@ -598,7 +605,7 @@ 
     /**
      * returns possible belong to types
      *
-     * @return array with belong to types
+     * @return string[] with belong to types
      */
     private function getBelongToTypes()
     {
@@ -611,7 +618,7 @@ 
     /**
      * returns the implemented providers
      *
-     * @return array with providers
+     * @return string[] with providers
      */
     static function getImplementedProviders()
     {

Indentation +2 added lines, -2 removed lines

@@ -133,7 +133,7 @@ 
      * @param array $input (belong_to, belong_to_id, transaction_number, transaction_status, amount)
      *
      * @return integer
-      */
+     */
     public function save($input)
     {
         $input = safeToDb($input);
@@ -163,7 +163,7 @@ 
         }
 
         if ($input['transaction_status'] == $this->transaction_status_authorized) {
-             $status_key = 2;
+                $status_key = 2;
         } else {
             $status_key = 1;
         }

Spacing +1 added lines, -1 removed lines

@@ -664,7 +664,7 @@
 
     function getStatus()
     {
-        $status =  $this->getStatusTypes();
+        $status = $this->getStatusTypes();
         return $status[$this->value['status_key']];
     }
 }

src/Intraface/modules/onlinepayment/provider/DanDomain.php

Doc Comments +3 added lines

@@ -8,6 +8,9 @@
 

 class OnlinePaymentDefault extends OnlinePayment

 {

+    /**
+     * @param integer $id
+     */
     function __construct($kernel, $id) {

 

         parent::__construct($kernel, $id);

Spacing +2 added lines, -2 removed lines

@@ -142,8 +142,8 @@
 
     function getSettings()
     {
-        $this->value['password'] =  $this->kernel->setting->get('intranet', 'onlinepayment.dandomain.password');
-        $this->value['merchant_id'] =   $this->kernel->setting->get('intranet', 'onlinepayment.dandomain.merchant_id');
+        $this->value['password'] = $this->kernel->setting->get('intranet', 'onlinepayment.dandomain.password');
+        $this->value['merchant_id'] = $this->kernel->setting->get('intranet', 'onlinepayment.dandomain.merchant_id');
         return $this->value;
     }
 

src/Intraface/modules/procurement/ProcurementItem.php

Doc Comments +3 added lines, -1 removed lines

@@ -58,6 +58,8 @@ 
      *
      * @param object Procurement
      * @param integer item id
+     * @param Procurement $procurement
+     * @param integer $id
      * @return void
      */
     public function __construct($procurement, $id)
@@ -201,7 +203,7 @@ 
     /**
      * Gets the tax percent on the individual product
      *
-     * @return float
+     * @return integer
      */
     public function getProductTaxPercent()
     {

Indentation +2 added lines, -2 removed lines

@@ -234,7 +234,7 @@ 
             $product = new Product($this->procurement->kernel, $input["product_id"], $input['product_detail_id']);
 
             if (!is_object($product) || $product->get('id') == 0) {
-                 $this->error->set("Ugyldigt produkt");
+                    $this->error->set("Ugyldigt produkt");
             } else {
                 $product_detail_id = $product->get("detail_id");
             }
@@ -347,7 +347,7 @@ 
         $product = new Product($this->procurement->kernel, $product_id);
 
         if (!is_object($product) || $product->get('id') == 0) {
-             throw new Excetion('Invalid product id');
+                throw new Excetion('Invalid product id');
         } else {
             $product_detail_id = $product->get("detail_id");
         }

Spacing +25 added lines, -25 removed lines

@@ -64,7 +64,7 @@ 
     {
         $this->procurement = $procurement;
         $this->error = new Intraface_Error;
-        $this->id = (int) $id;
+        $this->id = (int)$id;
 
         if ($this->id > 0) {
             $this->load();
@@ -86,7 +86,7 @@ 
 
         $db->query("SELECT procurement_item.* FROM procurement_item
                     INNER JOIN procurement ON procurement_item.procurement_id = procurement.id
-                    WHERE procurement_item.id = " . $this->id . " AND procurement.id = " . $this->procurement->get('id') . " AND procurement_item.intranet_id = " . $this->procurement->kernel->intranet->get("id"));
+                    WHERE procurement_item.id = " . $this->id." AND procurement.id = ".$this->procurement->get('id')." AND procurement_item.intranet_id = ".$this->procurement->kernel->intranet->get("id"));
         if ($db->nextRecord()) {
             $this->value["id"] = $db->f("id");
             $this->value["product_id"] = $db->f("product_id");
@@ -282,20 +282,20 @@ 
             exit;
         }
 
-        $sql = "product_id = " . $product->getId() . ",
-                product_detail_id = " . $product_detail_id . ",
-                product_variation_id = " . $variation_id . ",
-                product_variation_detail_id = " . $variation_detail_id . ",
-                quantity = " . $input["quantity"] . ",
+        $sql = "product_id = ".$product->getId().",
+                product_detail_id = " . $product_detail_id.",
+                product_variation_id = " . $variation_id.",
+                product_variation_detail_id = " . $variation_detail_id.",
+                quantity = " . $input["quantity"].",
                 unit_purchase_price = " . $input["unit_purchase_price"];
 
         $db = new DB_Sql;
 
         if ($this->id == 0) {
-            $db->query("INSERT INTO procurement_item SET " . $sql . ", intranet_id = " . $this->procurement->kernel->intranet->get("id") . ", procurement_id = " . $this->procurement->get("id") . ", active = 1");
+            $db->query("INSERT INTO procurement_item SET ".$sql.", intranet_id = ".$this->procurement->kernel->intranet->get("id").", procurement_id = ".$this->procurement->get("id").", active = 1");
             $this->id = $db->InsertedId();
         } else {
-            $db->query("UPDATE procurement_item SET " . $sql . " WHERE id = " . $this->id . " AND procurement_id = " . $this->procurement->get("id") . " AND intranet_id = " . $this->procurement->kernel->intranet->get("id"));
+            $db->query("UPDATE procurement_item SET ".$sql." WHERE id = ".$this->id." AND procurement_id = ".$this->procurement->get("id")." AND intranet_id = ".$this->procurement->kernel->intranet->get("id"));
         }
 
         return $this->id;
@@ -323,10 +323,10 @@ 
             return false;
         }
 
-        $sql = "unit_purchase_price = " . $unit_purchase_price->get();
+        $sql = "unit_purchase_price = ".$unit_purchase_price->get();
 
         $db = new DB_Sql;
-        $db->query("UPDATE procurement_item SET " . $sql . " WHERE id = " . $this->id . " AND procurement_id = " . $this->procurement->get("id") . " AND intranet_id = " . $this->procurement->kernel->intranet->get("id"));
+        $db->query("UPDATE procurement_item SET ".$sql." WHERE id = ".$this->id." AND procurement_id = ".$this->procurement->get("id")." AND intranet_id = ".$this->procurement->kernel->intranet->get("id"));
         return true;
     }
 
@@ -376,7 +376,7 @@ 
             product_variation_detail_id = ".$variation_detail_id;
 
         $db = new DB_Sql;
-        $db->query("UPDATE procurement_item SET " . $sql . " WHERE id = " . $this->id . " AND procurement_id = " . $this->procurement->get("id") . " AND intranet_id = " . $this->procurement->kernel->intranet->get("id"));
+        $db->query("UPDATE procurement_item SET ".$sql." WHERE id = ".$this->id." AND procurement_id = ".$this->procurement->get("id")." AND intranet_id = ".$this->procurement->kernel->intranet->get("id"));
 
         return true;
     }
@@ -388,7 +388,7 @@ 
     public function delete()
     {
         $db = new DB_Sql;
-        $db->query("UPDATE procurement_item SET active = 0 WHERE intranet_id = " . $this->procurement->kernel->intranet->get('id') . " AND id = " . $this->id . " AND procurement_id = " . $this->procurement->get("id"));
+        $db->query("UPDATE procurement_item SET active = 0 WHERE intranet_id = ".$this->procurement->kernel->intranet->get('id')." AND id = ".$this->id." AND procurement_id = ".$this->procurement->get("id"));
         $this->id = 0;
 
         return 1;
@@ -402,13 +402,13 @@ 
     public function getList()
     {
         $db = new DB_Sql;
-        $db->query("SELECT * FROM procurement_item WHERE active = 1 AND intranet_id = " . $this->procurement->kernel->intranet->get("id") . " AND procurement_id = " . $this->procurement->get("id") . " ORDER BY id ASC");
+        $db->query("SELECT * FROM procurement_item WHERE active = 1 AND intranet_id = ".$this->procurement->kernel->intranet->get("id")." AND procurement_id = ".$this->procurement->get("id")." ORDER BY id ASC");
         $i = 0;
-        $item = array ();
+        $item = array();
 
         if ($this->procurement->get("price_items") > 0) {
             // calculates shipment etc per item price kr
-            $calculated = $this->procurement->get("price_shipment_etc") / $this->procurement->get("price_items");
+            $calculated = $this->procurement->get("price_shipment_etc")/$this->procurement->get("price_items");
         } else {
             $calculated = 0;
         }
@@ -424,17 +424,17 @@ 
                 $item[$i]["unit"] = $unit['plural'];
             }
             $item[$i]["unit_purchase_price"] = $db->f("unit_purchase_price");
-            $item[$i]["calculated_unit_price"] = $db->f("unit_purchase_price") + $db->f("unit_purchase_price") * $calculated;
+            $item[$i]["calculated_unit_price"] = $db->f("unit_purchase_price") + $db->f("unit_purchase_price")*$calculated;
             $item[$i]["quantity"] = $db->f("quantity");
             $item[$i]["vat"] = $product->get("vat");
             $item[$i]["product_id"] = $product->get("id");
-            $item[$i]["amount"] = $db->f("quantity") * $db->f("unit_purchase_price");
+            $item[$i]["amount"] = $db->f("quantity")*$db->f("unit_purchase_price");
 
             if ($product->get('has_variation')) {
                 $variation = $product->getVariation($db->f('product_variation_id'));
                 $detail = $variation->getDetail($db->f('product_variation_detail_id'));
                 $item[$i]["name"] = $product->get("name").' - '.$variation->getName();
-                $item[$i]["number"]= $product->get("number").'.'.$variation->getNumber();
+                $item[$i]["number"] = $product->get("number").'.'.$variation->getNumber();
                 $item[$i]["price"] = $detail->getPrice($product);
             } else {
                 $item[$i]["name"] = $product->get("name");
@@ -451,7 +451,7 @@ 
      */
     public function getQuantity($status, $product_id, $product_variation_id, $from_date = "")
     {
-        if (!in_array($status, array (
+        if (!in_array($status, array(
                 'ordered',
                 'delivered'
             ))) {
@@ -465,8 +465,8 @@ 
                         FROM procurement_item INNER JOIN procurement
                             ON procurement_item.procurement_id = procurement.id
                         WHERE procurement_item.active = 1 AND procurement.active = 1
-                            AND procurement_item.intranet_id = " . $this->procurement->kernel->intranet->get("id") . " AND procurement.intranet_id = " . $this->procurement->kernel->intranet->get("id") . "
-                            AND procurement_item.product_id = " . $product_id . " AND procurement.status_key = 0
+                            AND procurement_item.intranet_id = " . $this->procurement->kernel->intranet->get("id")." AND procurement.intranet_id = ".$this->procurement->kernel->intranet->get("id")."
+                            AND procurement_item.product_id = " . $product_id." AND procurement.status_key = 0
                             AND procurement_item.product_variation_id = ".$product_variation_id);
             $db->nextRecord(); // a post will always be present
             return intval($db->f("on_order"));
@@ -476,11 +476,11 @@ 
                         FROM procurement_item INNER JOIN procurement
                             ON procurement_item.procurement_id = procurement.id
                         WHERE procurement_item.active = 1 AND procurement.active = 1
-                            AND procurement_item.intranet_id = " . $this->procurement->kernel->intranet->get("id") . " AND procurement.intranet_id = " . $this->procurement->kernel->intranet->get("id") . "
-                            AND procurement_item.product_id = " . $product_id . "
+                            AND procurement_item.intranet_id = " . $this->procurement->kernel->intranet->get("id")." AND procurement.intranet_id = ".$this->procurement->kernel->intranet->get("id")."
+                            AND procurement_item.product_id = " . $product_id."
                             AND procurement_item.product_variation_id = ".$product_variation_id."
                             AND procurement.status_key = 1
-                            AND procurement.date_recieved > \"" . $from_date . "\"");
+                            AND procurement.date_recieved > \"" . $from_date."\"");
             $db->nextRecord(); // a post will always be present
             return intval($db->f("stock_in"));
         }

src/Intraface/modules/product/Variation/Detail.php

Doc Comments +6 added lines, -6 removed lines

@@ -75,7 +75,7 @@ 
      *
      * @param object Product
      *
-     * @return object Ilib_Variable_Float with price
+     * @return Ilib_Variable_Float Ilib_Variable_Float with price
      */
     public function getPrice($product)
     {
@@ -92,10 +92,10 @@ 
      * @todo Product should not be given as parameter, but defined as relation. Product needs to be made in doctrine
      *
      * @param object $currency Intraface_modules_currency_Currency
-     * @param integer $exchange_rage_id
+     * @param integer $exchange_rate_id
      * @param object $product Product
      *
-     * @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, $product)
     {
@@ -109,7 +109,7 @@ 
      *
      * @param object $product Product
      *
-     * @return object Ilib_Variable_Float with price including vat
+     * @return Ilib_Variable_Float Ilib_Variable_Float with price including vat
      */
     public function getPriceIncludingVat($product)
     {
@@ -129,7 +129,7 @@ 
      * @param integer $exchange_rate_id
      * @param object product Product
      *
-     * @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, $product)
     {
@@ -143,7 +143,7 @@ 
      *
      * @param object Product
      *
-     * @return object Ilib_Variable_Float with price
+     * @return Ilib_Variable_Float Ilib_Variable_Float with price
      */
     public function getWeight($product)
     {

Spacing +4 added lines, -4 removed lines

@@ -99,7 +99,7 @@ 
      */
     public function getPriceInCurrency($currency, $exchange_rate_id = 0, $product)
     {
-        return new Ilib_Variable_Float(round($this->getPrice($product)->getAsIso() / ($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso() / 100), 2));
+        return new Ilib_Variable_Float(round($this->getPrice($product)->getAsIso()/($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso()/100), 2));
     }
 
     /**
@@ -114,9 +114,9 @@ 
     public function getPriceIncludingVat($product)
     {
         if (get_class($product) == 'Intraface_modules_product_ProductDoctrine') {
-            return new Ilib_Variable_Float($this->getPrice($product)->getAsIso(2) * (1 + $product->getDetails()->getVatPercent()->getAsIso()/100));
+            return new Ilib_Variable_Float($this->getPrice($product)->getAsIso(2)*(1 + $product->getDetails()->getVatPercent()->getAsIso()/100));
         } else {
-            return new Ilib_Variable_Float($this->getPrice($product)->getAsIso(2) * (1 + $product->get('vat_percent')/100));
+            return new Ilib_Variable_Float($this->getPrice($product)->getAsIso(2)*(1 + $product->get('vat_percent')/100));
         }
     }
 
@@ -133,7 +133,7 @@ 
      */
     public function getPriceIncludingVatInCurrency($currency, $exchange_rate_id, $product)
     {
-        return new Ilib_Variable_Float($this->getPriceIncludingVat($product)->getAsIso() / ($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso() / 100));
+        return new Ilib_Variable_Float($this->getPriceIncludingVat($product)->getAsIso()/($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso()/100));
     }
 
     /**

src/Intraface/modules/shop/Basket.php

Doc Comments +4 added lines, -3 removed lines

@@ -54,7 +54,7 @@ 
      *
      * @param object $db         The webshop object
      * @param object $intranet   The webshop object
-     * @param object $webshop    The webshop object
+     * @param object $shop    The webshop object
      * @param string $session_id A session id
      *
      * @return void
@@ -104,7 +104,7 @@ 
      * @param integer $product_id Product to remove
      * @param integer $quantity   How many should be removed
      *
-     * @return boelean
+     * @return boolean
      */
     public function remove($product_id, $product_variation_id = 0, $quantity = 1)
     {
@@ -122,6 +122,7 @@ 
      * @param integer $quantity         The quantity
      * @param string  $text             To add description to product, not yet implemented
      * @param integer $basketevaluation Wheter the product is from basketevaluation
+     * @param integer $product_variation_id
      *
      * @return boolean
      */
@@ -530,7 +531,7 @@ 
     /**
      * Gets the total weight of the basket
      *
-     * @return float
+     * @return integer
      */
     public function getTotalWeight()
     {

Spacing +41 added lines, -41 removed lines

@@ -69,16 +69,16 @@ 
         $this->resetItemCache();
 
         $this->conditions = array(
-            'session_id = ' . $this->db->quote($this->session_id, 'text'),
-            'shop_id = ' . $this->db->quote($this->webshop->getId(), 'integer'),
-            'intranet_id = ' . $this->db->quote($this->intranet->getId(), 'integer'));
+            'session_id = '.$this->db->quote($this->session_id, 'text'),
+            'shop_id = '.$this->db->quote($this->webshop->getId(), 'integer'),
+            'intranet_id = '.$this->db->quote($this->intranet->getId(), 'integer'));
 
         $this->cleanUp();
     }
 
     private function cleanUp()
     {
-        return $this->db->query("DELETE FROM basket WHERE DATE_ADD(date_changed, INTERVAL " . $this->db->quote(self::CLEAN_UP_AFTER, 'integer') . " HOUR) < NOW()");
+        return $this->db->query("DELETE FROM basket WHERE DATE_ADD(date_changed, INTERVAL ".$this->db->quote(self::CLEAN_UP_AFTER, 'integer')." HOUR) < NOW()");
     }
 
     /**
@@ -165,23 +165,23 @@ 
                 FROM basket
                 WHERE product_id = ".$product_id."
                     AND product_variation_id = ".$product_variation_id."
-                    AND product_detail_id = " . $product_detail_id . "
-                    AND basketevaluation_product = " . $basketevaluation . "
+                    AND product_detail_id = " . $product_detail_id."
+                    AND basketevaluation_product = " . $basketevaluation."
                     AND " . $sql_extra);
 
         if ($db->nextRecord()) {
             if ($quantity == 0) {
                 $db->query("DELETE FROM basket
-                    WHERE id = ".$db->f('id') . "
-                        AND basketevaluation_product = " . $basketevaluation . "
+                    WHERE id = ".$db->f('id')."
+                        AND basketevaluation_product = " . $basketevaluation."
                         AND " . $sql_extra);
             } else {
                 $db->query("UPDATE basket SET
                     quantity = $quantity,
                     date_changed = NOW(),
                     text = '".$text."'
-                    WHERE id = ".$db->f('id') . "
-                        AND basketevaluation_product = " . $basketevaluation . "
+                    WHERE id = ".$db->f('id')."
+                        AND basketevaluation_product = " . $basketevaluation."
                         AND " . $sql_extra);
             }
             return true;
@@ -192,7 +192,7 @@ 
                         quantity = $quantity,
                         date_changed = NOW(),
                         text = '".$text."',
-                        basketevaluation_product = " . $basketevaluation . ",
+                        basketevaluation_product = " . $basketevaluation.",
                         product_id = ".$product_id.",
                         product_variation_id = ".$product_variation_id.",
                         product_detail_id = ".$product_detail_id.",
@@ -220,10 +220,10 @@ 
         settype($input['email'], 'string');
         settype($input['phone'], 'string');
 
-        $sql = "name = \"".safeToDb($input['name'])."\"," .
-            "contactperson = \"".safeToDb($input['contactperson'])."\", " .
-            "address = \"".safeToDb($input['address'])."\", " .
-            "postcode = \"".safeToDb($input['postcode'])."\", " .
+        $sql = "name = \"".safeToDb($input['name'])."\",".
+            "contactperson = \"".safeToDb($input['contactperson'])."\", ".
+            "address = \"".safeToDb($input['address'])."\", ".
+            "postcode = \"".safeToDb($input['postcode'])."\", ".
             "city = \"".safeToDb($input['city'])."\", ".
             "country = \"".safeToDb($input['country'])."\", ".
             "cvr = \"".safeToDb($input['cvr'])."\", ".
@@ -305,13 +305,13 @@ 
         $sql_extra = implode(" AND ", $this->conditions);
 
         $db = new DB_Sql;
-        $db->query("SELECT id FROM basket_details WHERE " . $sql_extra. "
+        $db->query("SELECT id FROM basket_details WHERE ".$sql_extra."
                 AND intranet_id = " . $this->intranet->getId());
         if ($db->nextRecord()) {
             $db->query("UPDATE basket_details SET ".$sql.",
                 date_changed = NOW()
-                WHERE id = ".$db->f('id') . "
-                    AND " . $sql_extra . "
+                WHERE id = ".$db->f('id')."
+                    AND " . $sql_extra."
                     AND intranet_id = " . $this->intranet->getId());
             return true;
         } else {
@@ -339,7 +339,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT *
             FROM basket_details
-            WHERE " . $sql_extra . "
+            WHERE " . $sql_extra."
                 AND intranet_id = " . $this->intranet->getId());
         if (!$db->nextRecord()) {
             return array();
@@ -369,7 +369,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT customer_coupon
             FROM basket_details
-            WHERE " . $sql_extra . "
+            WHERE " . $sql_extra."
                 AND intranet_id = " . $this->intranet->getId());
         if (!$db->nextRecord()) {
             return array();
@@ -391,7 +391,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT customer_ean
             FROM basket_details
-            WHERE " . $sql_extra . "
+            WHERE " . $sql_extra."
                 AND intranet_id = " . $this->intranet->getId());
         if (!$db->nextRecord()) {
             return array();
@@ -413,7 +413,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT customer_comment
             FROM basket_details
-            WHERE " . $sql_extra . "
+            WHERE " . $sql_extra."
                 AND intranet_id = " . $this->intranet->getId());
         if (!$db->nextRecord()) {
             return array();
@@ -435,7 +435,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT payment_method_key
             FROM basket_details
-            WHERE " . $sql_extra . "
+            WHERE " . $sql_extra."
                 AND intranet_id = " . $this->intranet->getId());
         if (!$db->nextRecord() || $db->f('payment_method_key') == 0) {
             return array();
@@ -460,10 +460,10 @@ 
         $db = new DB_Sql;
         $db->query("SELECT *
             FROM basket
-            WHERE " . $sql_extra . "
-                AND product_id = " . $product_id . "
+            WHERE " . $sql_extra."
+                AND product_id = " . $product_id."
                 AND product_variation_id = ".$product_variation_id."
-                AND intranet_id = " . $this->intranet->getId() . "
+                AND intranet_id = " . $this->intranet->getId()."
       AND quantity > 0 LIMIT 1");
 
         if (!$db->nextRecord()) {
@@ -574,9 +574,9 @@ 
                 ON product.id = basket.product_id
             INNER JOIN product_detail
                 ON product.id = product_detail.product_id
-            WHERE " . $sql_extra . "
+            WHERE " . $sql_extra."
                 AND product_detail.active = 1
-                AND basket.intranet_id = " . $this->intranet->getId() . "
+                AND basket.intranet_id = " . $this->intranet->getId()."
             ORDER BY product_detail.vat DESC, basket.basketevaluation_product");
 
         $i = 0;
@@ -627,16 +627,16 @@ 
 
             // basket specific
             $items[$i]['quantity'] = $db->f('quantity');
-            $items[$i]['totalweight'] = $items[$i]['weight'] * $db->f('quantity');
-            $items[$i]['totalprice'] = $db->f('quantity') * $items[$i]['price'];
-            $items[$i]['totalprice_incl_vat'] = $db->f('quantity') * $items[$i]['price_incl_vat'];
+            $items[$i]['totalweight'] = $items[$i]['weight']*$db->f('quantity');
+            $items[$i]['totalprice'] = $db->f('quantity')*$items[$i]['price'];
+            $items[$i]['totalprice_incl_vat'] = $db->f('quantity')*$items[$i]['price_incl_vat'];
 
-            $items[$i]['currency']['DKK']['totalprice'] = $db->f('quantity') * $items[$i]['currency']['DKK']['price'];
-            $items[$i]['currency']['DKK']['totalprice_incl_vat'] = $db->f('quantity') * $items[$i]['currency']['DKK']['price_incl_vat'];
+            $items[$i]['currency']['DKK']['totalprice'] = $db->f('quantity')*$items[$i]['currency']['DKK']['price'];
+            $items[$i]['currency']['DKK']['totalprice_incl_vat'] = $db->f('quantity')*$items[$i]['currency']['DKK']['price_incl_vat'];
             if (is_object($currencies) && $currencies->count() > 0) {
                 foreach ($currencies as $currency) {
-                    $items[$i]['currency'][$currency->getType()->getIsoCode()]['totalprice'] = $db->f('quantity') * $items[$i]['currency'][$currency->getType()->getIsoCode()]['price'];
-                    $items[$i]['currency'][$currency->getType()->getIsoCode()]['totalprice_incl_vat'] = $db->f('quantity') * $items[$i]['currency'][$currency->getType()->getIsoCode()]['price_incl_vat'];
+                    $items[$i]['currency'][$currency->getType()->getIsoCode()]['totalprice'] = $db->f('quantity')*$items[$i]['currency'][$currency->getType()->getIsoCode()]['price'];
+                    $items[$i]['currency'][$currency->getType()->getIsoCode()]['totalprice_incl_vat'] = $db->f('quantity')*$items[$i]['currency'][$currency->getType()->getIsoCode()]['price_incl_vat'];
                 }
             }
 
@@ -665,10 +665,10 @@ 
     {
         $sql_extra = implode(" AND ", $this->conditions);
         $db = new DB_Sql;
-        $db->query("DELETE FROM basket " .
-                "WHERE basketevaluation_product = 1 " .
-                    "AND " . $sql_extra . " " .
-                    "AND intranet_id = " . $this->intranet->getId());
+        $db->query("DELETE FROM basket ".
+                "WHERE basketevaluation_product = 1 ".
+                    "AND ".$sql_extra." ".
+                    "AND intranet_id = ".$this->intranet->getId());
 
         $this->resetItemCache();
 
@@ -687,8 +687,8 @@ 
 
         $sql_extra = implode(" AND ", $this->conditions);
         $db = new DB_Sql;
-        $db->query("UPDATE basket SET session_id = '' WHERE " . $sql_extra . " AND intranet_id = " . $this->intranet->getId());
-        $db->query("UPDATE basket_details SET session_id = '' WHERE " . $sql_extra . " AND intranet_id = " . $this->intranet->getId());
+        $db->query("UPDATE basket SET session_id = '' WHERE ".$sql_extra." AND intranet_id = ".$this->intranet->getId());
+        $db->query("UPDATE basket_details SET session_id = '' WHERE ".$sql_extra." AND intranet_id = ".$this->intranet->getId());
 
         return true;
     }