Changeset 765 for trunk/Modules

Timestamp:

Nov 6, 2015, 8:40:19 PM (9 years ago)

Author:

chronos

Message:

• Added: Customer support activity table.
• Added: Show operations for operation group.

Location:

trunk/Modules

Files:

• Customer/Customer.php (modified) (2 diffs)
• Finance/Finance.php (modified) (1 diff)
• FinanceBankAPI/FileImport.php (modified) (1 diff)
• FinanceBankAPI/ImportFio.php (modified) (1 diff)

trunk/Modules/Customer/Customer.php

@@ -34 +34 @@
         'UserRel' => array('Type' => 'TUserCustomerRelListCustomer', 'Caption' => 'Přiřazení uživatelé', 'Default' => ''),
         'ServiceRel' => array('Type' => 'TServiceCustomerRelListCustomer', 'Caption' => 'Placené služby', 'Default' => ''),
+        'SupportActivity' => array('Type' => 'TSupportActivityListCustomer', 'Caption' => 'Zákaznická podpora', 'Default' => ''),
         'Consumption' => array('Type' => 'TCustomerStockSerialNumber', 'Caption' => 'Spotřeba zařízení', 'Default' => ''),
       ),
@@ -148 +149 @@
       'Filter' => '1',
     ));
+    $this->System->FormManager->RegisterClass('SupportActivity', array(
+      'Title' => 'Zákaznická podpora',
+      'Table' => 'SupportActivity',
+      'DefaultSortColumn' => 'Time',
+      'Items' => array(
+        'Time' => array('Type' => 'DateTime', 'Caption' => 'Čas', 'Default' => ''),
+        'Description' => array('Type' => 'Text', 'Caption' => 'Popis', 'Default' => ''),
+        'Customer' => array('Type' => 'TMember', 'Caption' => 'Zákazník', 'Default' => ''),
+        'User' => array('Type' => 'TUser', 'Caption' => 'Pracovník', 'Default' => ''),
+      ),
+    ));
+    $this->System->FormManager->RegisterFormType('TSupportActivityListCustomer', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'SupportActivity',
+      'Id' => 'Id',
+      'Ref' => 'Customer',
+      'Filter' => '1',
+    ));
 
     $this->System->ModuleManager->Modules['IS']->RegisterDashboardItem('Customer',

trunk/Modules/Finance/Finance.php

@@ -297 +297 @@
         'ValueSign' => array('Type' => 'TFinanceValueSign', 'Caption' => 'Znaménko hodnoty', 'Default' => '0'),
         'Direction' => array('Type' => 'TFinanceDirection', 'Caption' => 'Směr', 'Default' => '0'),
+        'Items' => array('Type' => 'TFinanceOperationListGroup', 'Caption' => 'Operace', 'Default' => ''),
       ),
     ));

trunk/Modules/FinanceBankAPI/FileImport.php

@@ -78 +78 @@
     $DbResult = $this->Database->select('FinanceBank', '*', 'Id='.$BankAccount['Bank']);
     $Bank = $DbResult->fetch_assoc();
-    $Output .= 'Účet: '.$BankAccount['Number'].'/'.$Bank['Code'].' ('.$Bank['Name'].')';
+    $Output .= 'Účet: '.$BankAccount['Number'].'/'.$Bank['Code'].' ('.$Bank['Name'].')'."\n";
 
     if($Bank['Code'] == '2010') $Import = new ImportFio($this->System);

trunk/Modules/FinanceBankAPI/ImportFio.php

@@ -38 +38 @@
         $Output .= '<td>'.$Record['UserIdent'].'</td>';
         $Output .= '<td>'.$Record['Value'].'</td>';
-        $Output .= '</tr>';
+        $Output .= '</tr>'."\n";
       }
     }