intraface / intraface.dk

src/Intraface/modules/stock/Controller/Product.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
     function renderHtml()
     {
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/product');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/product');
         return $smarty->render($this);
     }
 

src/Intraface/modules/stock/Controller/Variations.php

Spacing +2 added lines, -2 removed lines

@@ -13,9 +13,9 @@
 
     function renderHtml()
     {
-        $this->document->setTitle('Set stock for variations for product ' . $this->getProduct()->get('name'));
+        $this->document->setTitle('Set stock for variations for product '.$this->getProduct()->get('name'));
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/variations');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/variations');
         return $smarty->render($this, array('variations' => $this->getProduct()->getVariations(), 'product' => $this->context->getProduct()));
     }
 

src/Intraface/modules/procurement/Procurement.php

Indentation +1 added lines, -1 removed lines

@@ -123,7 +123,7 @@
 
     function loadItem($id = 0)
     {
-         $this->item = new ProcurementItem($this, (int)$id);
+            $this->item = new ProcurementItem($this, (int)$id);
     }
 
     function update($input)

Doc Comments +10 added lines, -2 removed lines

@@ -280,6 +280,9 @@ 
         return true;
     }
 
+    /**
+     * @param string $dk_paid_date
+     */
     function setPaid($dk_paid_date)
     {
         if ($this->get('id') == 0) {
@@ -369,6 +372,11 @@ 
      *
      * @param object year year object
      * @param integer voucher_number
+     * @param Year $year
+     * @param integer $voucher_number
+     * @param string $voucher_date
+     * @param integer $credit_account_id
+     * @param Stub_Translation $translation
      *
      * @return boolean
      */
@@ -685,7 +693,7 @@ 
      *
      * @todo: duplicate in Procurement class
      *
-     * @return array status types
+     * @return string[] status types
      */
     private function getStatusTypes()
     {
@@ -700,7 +708,7 @@ 
      * returns the possible regions where procurement is bought
      * @todo: duplicate in Procurement class
      *
-     * @return array possible regions
+     * @return string[] possible regions
      */
     public function getRegionTypes()
     {

Spacing +17 added lines, -17 removed lines

@@ -414,7 +414,7 @@ 
         }
 
 
-        $text = $translation->get('procurement').'# ' . $this->get('number') . ': ' . $this->get('description');
+        $text = $translation->get('procurement').'# '.$this->get('number').': '.$this->get('description');
         require_once 'Intraface/modules/accounting/Voucher.php';
         $voucher = Voucher::factory($year, $voucher_number);
         $voucher->save(array(
@@ -433,7 +433,7 @@ 
             $credit_total += $amount;
 
             if (!empty($line['text'])) {
-                $line_text = $text. ' - ' . $line['text'];
+                $line_text = $text.' - '.$line['text'];
             } else {
                 $line_text = $text;
             }
@@ -487,7 +487,7 @@ 
             $voucher_date->convert2db();
         }
 
-        $db->query("UPDATE procurement SET date_stated = '".$voucher_date->get()."', voucher_id = ".intval($voucher_number)." WHERE id = " . $this->id . " AND intranet_id = " . $this->kernel->intranet->get('id'));
+        $db->query("UPDATE procurement SET date_stated = '".$voucher_date->get()."', voucher_id = ".intval($voucher_number)." WHERE id = ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id'));
         return 1;
     }
 
@@ -570,15 +570,15 @@ 
         $total = 0;
         $vat = 0;
         foreach ($debet_accounts as $key => $debet_account) {
-            if ($validator->isNumeric($debet_account['amount'], 'Ugyldig beløb i linje ' . ($key + 1) . ' "' . $debet_account['text'] . '"', 'greater_than_zero')) {
+            if ($validator->isNumeric($debet_account['amount'], 'Ugyldig beløb i linje '.($key + 1).' "'.$debet_account['text'].'"', 'greater_than_zero')) {
                 $amount = new Intraface_Amount($debet_account['amount']);
                 $amount->convert2db();
                 $total += $amount->get();
 
-                $validator->isString($debet_account['text'], 'Ugyldig tekst i linje ' . ($key + 1) . ' "' . $debet_account['text'] . '"', '', 'allow_empty');
+                $validator->isString($debet_account['text'], 'Ugyldig tekst i linje '.($key + 1).' "'.$debet_account['text'].'"', '', 'allow_empty');
 
                 if (empty($debet_account['state_account_id'])) {
-                    $this->error->set('Linje ' . ($key + 1) . ' "' . $debet_account['text'] . '" ved ikke hvor den skal bogføres');
+                    $this->error->set('Linje '.($key + 1).' "'.$debet_account['text'].'" ved ikke hvor den skal bogføres');
                 } else {
                     require_once 'Intraface/modules/accounting/Account.php';
                     $account = Account::factory($year, $debet_account['state_account_id']);
@@ -586,9 +586,9 @@ 
                     // @todo check this. I changed it to make sure that we are able to state varekøb til videresalg
                     // || $account->get('type') != 'operating'
                     if ($account->get('id') == 0) {
-                        $this->error->set('Ugyldig konto for bogføring af linje ' . ($key + 1) . ' "' . $debet_account['text'] . '"');
+                        $this->error->set('Ugyldig konto for bogføring af linje '.($key + 1).' "'.$debet_account['text'].'"');
                     } elseif ($account->get('vat') == 'in') {
-                        $vat += $amount->get() / 100 * $account->get('vat_percent');
+                        $vat += $amount->get()/100*$account->get('vat_percent');
                     }
                 }
             }
@@ -605,8 +605,8 @@ 
             }
 
             if (round($vat, 2) != $this->get('vat')) {
-                $expected = number_format($this->get('vat') * 4, 2, ',', '.');
-                $this->error->set('Momsen af de beløb du bogfører på konti med moms stemmer ikke overens med momsen på det samlede indkøb (vi forventede '.number_format($vat, 2, ',', '.').' i moms og det samlede beløb burde have været ' . $expected . '). Har du fået alle varer med? Har du husket at skrive beløbet uden moms for varerne?');
+                $expected = number_format($this->get('vat')*4, 2, ',', '.');
+                $this->error->set('Momsen af de beløb du bogfører på konti med moms stemmer ikke overens med momsen på det samlede indkøb (vi forventede '.number_format($vat, 2, ',', '.').' i moms og det samlede beløb burde have været '.$expected.'). Har du fået alle varer med? Har du husket at skrive beløbet uden moms for varerne?');
             }
         }
 
@@ -635,15 +635,15 @@ 
         $total = 0;
         $vat = 0;
         foreach ($debet_accounts as $key => $debet_account) {
-            if ($validator->isNumeric($debet_account['amount'], 'Ugyldig beløb i linje ' . ($key + 1) . ' "' . $debet_account['text'] . '"', 'greater_than_zero')) {
+            if ($validator->isNumeric($debet_account['amount'], 'Ugyldig beløb i linje '.($key + 1).' "'.$debet_account['text'].'"', 'greater_than_zero')) {
                 $amount = new Intraface_Amount($debet_account['amount']);
                 $amount->convert2db();
                 $total += $amount->get();
 
-                $validator->isString($debet_account['text'], 'Ugyldig tekst i linje ' . ($key + 1) . ' "' . $debet_account['text'] . '"', '', 'allow_empty');
+                $validator->isString($debet_account['text'], 'Ugyldig tekst i linje '.($key + 1).' "'.$debet_account['text'].'"', '', 'allow_empty');
 
                 if (empty($debet_account['state_account_id'])) {
-                    $this->error->set('Linje ' . ($key + 1) . ' "' . $debet_account['text'] . '" ved ikke hvor den skal bogføres');
+                    $this->error->set('Linje '.($key + 1).' "'.$debet_account['text'].'" ved ikke hvor den skal bogføres');
                 } else {
                     require_once 'Intraface/modules/accounting/Account.php';
                     $account = Account::factory($year, $debet_account['state_account_id']);
@@ -651,9 +651,9 @@ 
                     // @todo check this. I changed it to make sure that we are able to state varekøb til videresalg
                     // || $account->get('type') != 'operating'
                     if ($account->get('id') == 0) {
-                        $this->error->set('Ugyldig konto for bogføring af linje ' . ($key + 1) . ' "' . $debet_account['text'] . '"');
+                        $this->error->set('Ugyldig konto for bogføring af linje '.($key + 1).' "'.$debet_account['text'].'"');
                     } elseif ($account->get('vat') == 'in') {
-                        $vat += $amount->get() / 100 * $account->get('vat_percent');
+                        $vat += $amount->get()/100*$account->get('vat_percent');
                     }
                 }
             }
@@ -670,8 +670,8 @@ 
 
         if (round($vat, 2) != $this->get('vat')) {
             $expected_vat = number_format($vat, 2, ',', '.');
-            $expected_value = number_format($this->get('vat') * 4, 2, ',', '.');
-            $this->error->set('Momsen af de beløb du bogfører på konti med moms stemmer ikke overens med momsen på det samlede indkøb (vi forventede ' . $expected_vat . ' i moms og det samlede beløb burde have været ' . $expected_value . '). Har du fået alle varer med? Har du husket at skrive beløbet uden moms for varerne?');
+            $expected_value = number_format($this->get('vat')*4, 2, ',', '.');
+            $this->error->set('Momsen af de beløb du bogfører på konti med moms stemmer ikke overens med momsen på det samlede indkøb (vi forventede '.$expected_vat.' i moms og det samlede beløb burde have været '.$expected_value.'). Har du fået alle varer med? Har du husket at skrive beløbet uden moms for varerne?');
         }
         
         if ($this->error->isError()) {

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

Spacing +2 added lines, -2 removed lines

@@ -67,7 +67,7 @@ 
             'procurements' => $procurements
         );
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/index');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/index');
         return $smarty->render($this, $data);
     }
 
@@ -82,7 +82,7 @@ 
             'gateway' => $this->getProcurementGateway()
         );
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/procurement-edit');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/procurement-edit');
         return $smarty->render($this, $data);
     }
 

src/Intraface/modules/procurement/Controller/Item.php

Spacing +2 added lines, -2 removed lines

@@ -66,7 +66,7 @@ 
 
         if (isset($_GET['change_product'])) {
             $redirect = Intraface_Redirect::factory($this->getKernel(), 'go');
-            $url = $redirect->setDestination(NET_SCHEME . NET_HOST . $this->url('selectproduct'), NET_SCHEME . NET_HOST . $this->url());
+            $url = $redirect->setDestination(NET_SCHEME.NET_HOST.$this->url('selectproduct'), NET_SCHEME.NET_HOST.$this->url());
             $redirect->askParameter('product_id');
             return new k_SeeOther($url);
         }
@@ -81,7 +81,7 @@ 
 
         $data = array('procurement' => $procurement, 'values' => $values);
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/item-edit');
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/item-edit');
         return $tpl->render($this, $data);
 
     }

src/Intraface/modules/debtor/Visitor/Text.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
                 $currency_iso_code = 'DKK';
             }
 
-            $table->addRow(array(round($item["quantity"]), substr($item["name"], 0, 40), $currency_iso_code.' ' . $amount));
+            $table->addRow(array(round($item["quantity"]), substr($item["name"], 0, 40), $currency_iso_code.' '.$amount));
         }
         return $table->getTable();
     }

src/Intraface/modules/debtor/Debtor/Item.php

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
      */
     public function getAmount()
     {
-        return new Ilib_Variable_Float($this->getQuantity()->getAsIso(2) * $this->getProductPriceObject()->getPriceIncludingVat($this->getProduct())->getAsIso(2), 'iso');
+        return new Ilib_Variable_Float($this->getQuantity()->getAsIso(2)*$this->getProductPriceObject()->getPriceIncludingVat($this->getProduct())->getAsIso(2), 'iso');
     }
     
     public function getQuantity()

src/Intraface/modules/debtor/Controller/Settings.php

Spacing +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
             'kernel' => $this->context->getKernel(),
             'scan_in_contact' => $scan_in_contact);
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/settings');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/settings');
         return $smarty->render($this, $data);
     }
 
@@ -115,7 +115,7 @@ 
                 $contact_module = $this->context->getKernel()->useModule('contact');
 
                 $redirect = Intraface_Redirect::factory($this->context->getKernel(), 'go');
-                $url = $redirect->setDestination(NET_SCHEME . NET_HOST . $this->url('contact'), $debtor_module->getPath()."settings");
+                $url = $redirect->setDestination(NET_SCHEME.NET_HOST.$this->url('contact'), $debtor_module->getPath()."settings");
                 $redirect->askParameter('contact_id');
                 $redirect->setIdentifier('contact');
 

src/Intraface/modules/debtor/Controller/Payment.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
 
     function renderHtml()
     {
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/payment');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/payment');
         return $smarty->render($this);
     }
 
@@ -25,7 +25,7 @@ 
         $payment = $this->getModel();
         if ($id = $payment->update($_POST)) {
             if ($this->getKernel()->user->hasModuleAccess('accounting')) {
-                return new k_SeeOther($this->url($id . '/state'));
+                return new k_SeeOther($this->url($id.'/state'));
             } else {
                 return new k_SeeOther($this->url('../'));
             }