Changeset 765

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

Files:

• Application/FormClasses.php (modified) (1 diff)
• Application/Version.php (modified) (1 diff)
• Common/Setup/Updates.php (modified) (2 diffs)
• Modules/Customer/Customer.php (modified) (2 diffs)
• Modules/Finance/Finance.php (modified) (1 diff)
• Modules/FinanceBankAPI/FileImport.php (modified) (1 diff)
• Modules/FinanceBankAPI/ImportFio.php (modified) (1 diff)

trunk/Application/FormClasses.php

@@ -377 +377 @@
     'Filter' => '1',
   ),
-  'TFinanceOperationListAccount' => array(
+  'TFinanceOperationListGroup' => array(
+    'Type' => 'ManyToOne',
+    'Table' => 'FinanceOperation',
+    'Id' => 'Id',
+    'Ref' => 'Group',
+    'Filter' => '1',
+  ),
+    'TFinanceOperationListAccount' => array(
     'Type' => 'ManyToOne',
     'Table' => 'FinanceOperation',

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 764; // Subversion revision
-$DatabaseRevision = 763; // SQL structure revision
-$ReleaseTime = strtotime('2015-11-05');
+$Revision = 765; // Subversion revision
+$DatabaseRevision = 765; // SQL structure revision
+$ReleaseTime = strtotime('2015-11-06');

trunk/Common/Setup/Updates.php

@@ -1604 +1604 @@
 }
 
+function UpdateTo765($Manager)
+{
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `SupportActivity` (
+    `Id` int(11) NOT NULL AUTO_INCREMENT,
+    `Description` text NOT NULL,
+    `Customer` int(11) NOT NULL,
+    `User` int(11) NOT NULL,
+    `Time` datetime NOT NULL,
+    PRIMARY KEY (`Id`),
+    KEY `User` (`User`),
+    KEY `Customer` (`Customer`)
+   ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;');
+
+  $Manager->Execute('ALTER TABLE `SupportActivity`
+ADD CONSTRAINT `SupportActivity_ibfk_1` FOREIGN KEY (`Customer`) REFERENCES `Member` (`Id`),
+ADD CONSTRAINT `SupportActivity_ibfk_2` FOREIGN KEY (`User`) REFERENCES `User` (`Id`);');
+
+  // IS menu item
+  $Manager->Execute('INSERT INTO `Action` (`Id` ,`Name` ,`Title` ,`Type` ,`URL` ,
+`Group` ,`Icon` ,`PermissionOperation` ,`Enable`) VALUES (
+NULL , "", "Zákaznická podpora", "1", "/is/?t=SupportActivity&a=list", NULL , NULL , NULL , "1");');
+  $ActionId = $Manager->Database->insert_id;
+  $DbResult = $Manager->Execute('SELECT `Id` FROM `MenuItem` WHERE `Name`="Zákazníci"');
+  if($DbResult->num_rows > 0)
+  {
+    $DbRow = $DbResult->fetch_assoc();
+    $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
+        "VALUES (NULL , 'Zákazická podpora', ".$DbRow['Id'].", '".$ActionId."', '1');");
+  }
+}
 
 class Updates
@@ -1682 +1712 @@
       759 => array('Revision' => 762, 'Function' => 'UpdateTo762'),
       762 => array('Revision' => 763, 'Function' => 'UpdateTo763'),
+      763 => array('Revision' => 765, 'Function' => 'UpdateTo765'),
     ));
   }

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