Changeset 740 for trunk/Modules/FinanceBankAPI

Timestamp:

Jul 3, 2015, 11:36:07 PM (9 years ago)

Author:

chronos

Message:

• Modified: Changed Direction column of FinanceOperation and Invoices to more general ValueSign.
• FinanceOperationGroup and InvoiceGroup tables introduced and operations and invoices are now linked directly

to group id instead of DocumentLine.

Location:

trunk/Modules/FinanceBankAPI

Files:

• FileImport.php (modified) (3 diffs)
• FinanceBankAPI.php (modified) (2 diffs)

trunk/Modules/FinanceBankAPI/FileImport.php

@@ -34 +34 @@
         {
           $DbRow2 = $DbResult2->fetch_assoc();
-          // TODO: Replace constants by links to real database numbers
           if($DbRow['Value'] >= 0) {
-            $DocumentLine = 3; // Receive money
-            $Direction = 1;
+            $FinanceGroup = $this->System->Modules['Finance']->GetFinanceGroupById(OPERATION_GROUP_ACCOUNT_IN, 'FinanceOperationGroup');
           } else {
-            $DocumentLine = 4; // Send money
-            $Direction = -1;
+            $FinanceGroup = $this->System->Modules['Finance']->GetFinanceGroupById(OPERATION_GROUP_ACCOUNT_OUT, 'FinanceOperationGroup');
           }
           $Year = date('Y', MysqlDateToTime($DbRow['Time']));
-          $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($DocumentLine, $Year);
+          $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($FinanceGroup['DocumentLine'], $Year);
           $DbResult3 = $this->Database->insert('FinanceOperation', array('Subject' => $DbRow2['Id'], 'Cash' => 0,
-            'Value' => Abs($DbRow['Value']), 'Direction' => $Direction, 'Taxable' => 1, 'BankAccount' => $DbRow['BankAccount'], 'Network' => 1,
-            'Time' => $DbRow['Time'], 'Text' => $DbRow['Description'], 'BillCode' => $BillCode, 'DocumentLine' => $DocumentLine));
+            'Value' => Abs($DbRow['Value']), 'ValueSign' => $FinanceGroup['ValueSign'], 'Taxable' => 1, 'BankAccount' => $DbRow['BankAccount'], 'Network' => 1,
+            'Time' => $DbRow['Time'], 'Text' => $DbRow['Description'], 'BillCode' => $BillCode, 'Group' => $FinanceGroup['Id']));
           $this->Database->update('FinanceBankImport', 'Id='.$DbRow['Id'], array('FinanceOperation' => $this->Database->insert_id));
         }
@@ -139 +136 @@
   }
 
-  function InsertMoney($Subject, $Value, $Direction, $Cash, $Taxable, $Time, $Text, $DocumentLine)
+  function InsertMoney($Subject, $Value, $ValueSign, $Cash, $Taxable, $Time, $Text, $Group)
   {
     $Year = date('Y', $Time);
-    $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($DocumentLine, $Year);
+    $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($Group['DocumentLine'], $Year);
     $this->Database->insert('FinanceOperation', array('Text' => $Text,
-      'Subject' => $Subject, 'Cash' => $Cash, 'Value' => $Value, 'Direction' => $Direction,
+      'Subject' => $Subject, 'Cash' => $Cash, 'Value' => $Value, 'ValueSign' => $ValueSign,
       'Time' => TimeToMysqlDateTime($Time), 'Taxable' => $Taxable, 'BillCode' => $BillCode));
   }
@@ -155 +152 @@
     for($I = $_POST['ItemCount'] - 1; $I >= 0 ; $I--)
     {
-      // TODO: Use links to database records instead of contants
-      if($_POST['Money'.$I] < 0) {
-        $DocumentLine = 4;
-        $Direction = -1;
+      if($_POST['Money'.$I] >= 0) {
+        $FinanceGroup = $Finance->GetFinanceGroupById(OPERATION_GROUP_ACCOUNT_IN, 'FinanceOperationGroup');
       } else {
-        $DocumentLine = 3;
-        $Direction = 1;
+        $FinanceGroup = $Finance->GetFinanceGroupById(OPERATION_GROUP_ACCOUNT_OUT, 'FinanceOperationGroup');
       }
       $Date = explode('-', $_POST['Date'.$I]);
       $Date = mktime(0, 0, 0, $Date[1], $Date[2], $Date[0]);
-      $this->InsertMoney($_POST['Subject'.$I], Abs($_POST['Money'.$I]), $Direction, 0, $_POST['Taxable'.$I], $Date, $_POST['Text'.$I], $DocumentLine);
+      $this->InsertMoney($_POST['Subject'.$I], Abs($_POST['Money'.$I]), $FinanceGroup['ValueSign'],
+        0, $_POST['Taxable'.$I], $Date, $_POST['Text'.$I], $FinanceGroup);
       $Output .= $I.', ';
       $this->System->ModuleManager->Modules['Log']->NewRecord('Finance', 'NewPaymentInserted');

trunk/Modules/FinanceBankAPI/FinanceBankAPI.php

@@ -69 +69 @@
   {
     $Preset = array();
-    if($Item['Value'] < 0) $DocumentLine = DOC_LINE_ACCOUNT_OUT;
-       else $DocumentLine = DOC_LINE_ACCOUNT_IN;
+    if($Item['Value'] < 0) $OperationGroupId = OPERATION_GROUP_ACCOUNT_OUT;
+       else $OperationGroupId = OPERATION_GROUP_ACCOUNT_IN;
+    $FinanceGroup = $this->System->Modules['Finance']->GetFinanceGroupById($OperationGroupId, 'FinanceOperationGroup');
+
     $Preset = array(
       'presetTime' => $Item['Time'],
@@ -78 +80 @@
       'presetNetwork' => 1,
       'presetBankAccount' => $Item['BankAccount'],
-      'presetDocumentLine' => $DocumentLine);
+      'presetDocumentLine' => $FinanceGroup['DocumentLine']);
     return($Preset);
   }