andre 2 лет назад
Родитель
Сommit
2d4a0eb179
1 измененных файлов с 8 добавлено и 14 удалено
  1. 8 14
      app/UI/Client/EmailAccount/Pages/Accounts.php

+ 8 - 14
app/UI/Client/EmailAccount/Pages/Accounts.php

@@ -67,12 +67,6 @@ class Accounts extends DataTable implements ClientArea
             ->addColumn((new Column('mailbox'))
                 ->setOrderable(DataProvider::SORT_ASC)
                 ->setSearchable(true, Column::TYPE_STRING))
-            ->addColumn((new Column('date_created'))
-                ->setOrderable()
-                ->setSearchable(true))
-            ->addColumn((new Column('date_created'))
-                ->setOrderable()
-                ->setSearchable(true))
             ->addColumn((new Column('last_login'))
                 ->setOrderable()
                 ->setSearchable(true))
@@ -163,6 +157,7 @@ class Accounts extends DataTable implements ClientArea
         foreach($domains as $maildomain) {
             if(($maildomain['name']) === $this->getWhmcsParamByKey('domain')){ 
                 $this->maildomainID = $maildomain['id'];
+                $this->maildomain = $maildomain['name'];
             }
         }
         $productManager = new ProductManager();
@@ -187,21 +182,20 @@ class Accounts extends DataTable implements ClientArea
 
 
         $api->logout();
-/*        foreach ($accounts as $account)
+        foreach ($accounts as $account)
         {
 
             $accountArray = [
-                'id'           => $account->getId(),
-                'mailbox'      => $account->getName(),
-                'date_created' => AccountHelper::getFormattedData($account->getDataResourceA('kerioCreateTimestamp')),
-                'last_login'   => AccountHelper::getFormattedData($account->getDataResourceA('kerioLastLogonTimestamp'), 'd/m/Y H:i'),
-                'quota'        => AccountHelper::getQuotaAsMb($account->getDataResourceA('kerioMailQuota')),
-                'status'       => $account->getDataResourceA('kerioAccountStatus'),
+                'id'           => $account['id'],
+                'mailbox'      => $account['loginName'] . '@' . $this->maildomain,
+                'last_login'   => AccountHelper::getFormattedData($account['lastLoginInfo']['dateTime'], 'd/m/Y H:i'),
+                'quota'        => $account['diskSizeLimit'] ?  AccountHelper::getQuotaAsMb($account['kerioMailQuota']) : '∞',
+                'status'       => $account['isEnabled'] ? 'active' : 'default',
 
             ];
 
             $data[] = $accountArray;
-        } */
+        }
         $dataProv = new ArrayDataProvider();
         $dataProv->setDefaultSorting('mailbox', 'ASC')->setData($data);