intraface / intraface.dk

install/Helper/Accounting.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     {
         require_once 'Intraface/modules/accounting/Year.php';
         $year = new Year($this->kernel);
-        $year->save(array('from_date' => date('Y') . '-01-01', 'to_date' => date('Y') . '-12-31', 'label' => 'test', 'locked' => 0, 'vat' => 1));
+        $year->save(array('from_date' => date('Y').'-01-01', 'to_date' => date('Y').'-12-31', 'label' => 'test', 'locked' => 0, 'vat' => 1));
         $year->createAccounts('standard');
         $year->setYear();
     }

install/Helper/Debtor.php

Spacing +9 added lines, -9 removed lines

@@ -12,11 +12,11 @@ 
 
     public function createInvoice()
     {
-        require_once dirname (__FILE__) . '/Contact.php';
+        require_once dirname(__FILE__).'/Contact.php';
         $contact = new Install_Helper_Contact($this->kernel, $this->db);
         $contact_id = $contact->create();
 
-        require_once dirname(__FILE__) . '/Product.php';
+        require_once dirname(__FILE__).'/Product.php';
         $product = new Install_Helper_Product($this->kernel, $this->db);
         $product_id = $product->create();
 
@@ -26,7 +26,7 @@ 
             'contact_id' => $contact_id,
             'description' => 'Test invoice',
             'this_date' => date('d-m-Y'),
-            'due_date' => date('d-m-Y', time()+14*60*60*24)));
+            'due_date' => date('d-m-Y', time() + 14*60*60*24)));
 
         $debtor->loadItem();
         $debtor->item->save(array('product_id' => $product_id, 'quantity' => 3, 'description' => 'Test description on product'));
@@ -34,11 +34,11 @@ 
 
     public function createOrder()
     {
-        require_once dirname(__FILE__) . '/Contact.php';
+        require_once dirname(__FILE__).'/Contact.php';
         $contact = new Install_Helper_Contact($this->kernel, $this->db);
         $contact_id = $contact->create();
 
-        require_once dirname(__FILE__) . '/Product.php';
+        require_once dirname(__FILE__).'/Product.php';
         $product = new Install_Helper_Product($this->kernel, $this->db);
         $product_id = $product->create();
 
@@ -48,7 +48,7 @@ 
             'contact_id' => $contact_id,
             'description' => 'Test invoice',
             'this_date' => date('d-m-Y'),
-            'due_date' => date('d-m-Y', time()+14*60*60*24)));
+            'due_date' => date('d-m-Y', time() + 14*60*60*24)));
 
         $debtor->loadItem();
         $debtor->item->save(array('product_id' => $product_id, 'quantity' => 3, 'description' => 'Test description on product'));
@@ -56,11 +56,11 @@ 
 
     public function createOrderFromShop()
     {
-        require_once dirname(__FILE__) . '/Contact.php';
+        require_once dirname(__FILE__).'/Contact.php';
         $contact = new Install_Helper_Contact($this->kernel, $this->db);
         $contact_id = $contact->create();
 
-        require_once dirname(__FILE__) . '/Product.php';
+        require_once dirname(__FILE__).'/Product.php';
         $product = new Install_Helper_Product($this->kernel, $this->db);
         $product_id = $product->create();
 
@@ -70,7 +70,7 @@ 
             'contact_id' => $contact_id,
             'description' => 'From shop',
             'this_date' => date('d-m-Y'),
-            'due_date' => date('d-m-Y', time()+14*60*60*24)), 'webshop', 1);
+            'due_date' => date('d-m-Y', time() + 14*60*60*24)), 'webshop', 1);
 
         $debtor->loadItem();
         $debtor->item->save(array('product_id' => $product_id, 'quantity' => 3, 'description' => 'Test description on product'));

install/Helper/ModulePackage.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
     public function loadPackages()
     {
 
-        $sql_structure = file_get_contents(dirname(__FILE__) . '/../database-module_package-values.sql');
+        $sql_structure = file_get_contents(dirname(__FILE__).'/../database-module_package-values.sql');
         $sql_arr = Intraface_Install::splitSql($sql_structure);
 
         foreach ($sql_arr as $sql) {

install/Helper/Product.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
                 $variation->load();
                 $detail = $variation->getDetail();
                 $detail->price_difference = 0; /* Can be reimplemented: ($a1 * $a2); */
-                $detail->weight_difference = -1*($a1 * $a2);
+                $detail->weight_difference = -1*($a1*$a2);
                 $detail->save();
 
             }

install/Helper/Email.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
     public function create()
     {
-        require_once dirname(__FILE__) . '/Contact.php';
+        require_once dirname(__FILE__).'/Contact.php';
         $contact = new Install_Helper_Contact($this->kernel, $this->db);
         $contact_id = $contact->create();
 

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)

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);
     }