mirror of
https://github.com/Karaka-Management/oms-Support.git
synced 2026-02-13 23:08:41 +00:00
bug and media fixes
This commit is contained in:
parent
1ac8469d57
commit
2f268ca72f
|
|
@ -12,8 +12,6 @@
|
||||||
*/
|
*/
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
use phpOMS\Uri\UriFactory;
|
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<div class="content">
|
<div class="content">
|
||||||
|
|
|
||||||
|
|
@ -14,8 +14,6 @@ declare(strict_types=1);
|
||||||
|
|
||||||
namespace Modules\Shop\Admin\Install;
|
namespace Modules\Shop\Admin\Install;
|
||||||
|
|
||||||
use Model\Setting;
|
|
||||||
use Model\SettingMapper;
|
|
||||||
use phpOMS\Application\ApplicationAbstract;
|
use phpOMS\Application\ApplicationAbstract;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -16,10 +16,10 @@ namespace Modules\Support\Admin;
|
||||||
|
|
||||||
use Modules\Support\Models\SupportApp;
|
use Modules\Support\Models\SupportApp;
|
||||||
use Modules\Support\Models\SupportAppMapper;
|
use Modules\Support\Models\SupportAppMapper;
|
||||||
use phpOMS\Module\InstallerAbstract;
|
|
||||||
use phpOMS\DataStorage\Database\DatabasePool;
|
|
||||||
use phpOMS\Module\ModuleInfo;
|
|
||||||
use phpOMS\Config\SettingsInterface;
|
use phpOMS\Config\SettingsInterface;
|
||||||
|
use phpOMS\DataStorage\Database\DatabasePool;
|
||||||
|
use phpOMS\Module\InstallerAbstract;
|
||||||
|
use phpOMS\Module\ModuleInfo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Installer class.
|
* Installer class.
|
||||||
|
|
|
||||||
|
|
@ -15,24 +15,13 @@ declare(strict_types=1);
|
||||||
namespace Modules\Support\Controller;
|
namespace Modules\Support\Controller;
|
||||||
|
|
||||||
use Modules\Admin\Models\NullAccount;
|
use Modules\Admin\Models\NullAccount;
|
||||||
use Modules\Tag\Models\NullTag;
|
|
||||||
use Modules\Support\Models\Ticket;
|
|
||||||
use Modules\Support\Models\TicketElement;
|
|
||||||
use Modules\Support\Models\TicketElementMapper;
|
|
||||||
use Modules\Support\Models\TicketMapper;
|
|
||||||
use Modules\Support\Models\SupportApp;
|
|
||||||
use Modules\Support\Models\NullSupportApp;
|
|
||||||
use Modules\Support\Models\SupportAppMapper;
|
|
||||||
use Modules\Tasks\Models\TaskStatus;
|
|
||||||
use Modules\Tasks\Models\TaskType;
|
|
||||||
use phpOMS\Message\Http\HttpResponse;
|
|
||||||
use phpOMS\Message\Http\RequestStatusCode;
|
|
||||||
use phpOMS\Message\NotificationLevel;
|
|
||||||
use phpOMS\Message\RequestAbstract;
|
|
||||||
use phpOMS\Message\ResponseAbstract;
|
|
||||||
use phpOMS\Model\Message\FormValidation;
|
|
||||||
use phpOMS\Utils\Parser\Markdown\Markdown;
|
|
||||||
use Modules\Support\Models\AttributeValueType;
|
use Modules\Support\Models\AttributeValueType;
|
||||||
|
use Modules\Support\Models\NullSupportApp;
|
||||||
|
use Modules\Support\Models\NullTicketAttributeType;
|
||||||
|
use Modules\Support\Models\NullTicketAttributeValue;
|
||||||
|
use Modules\Support\Models\SupportApp;
|
||||||
|
use Modules\Support\Models\SupportAppMapper;
|
||||||
|
use Modules\Support\Models\Ticket;
|
||||||
use Modules\Support\Models\TicketAttribute;
|
use Modules\Support\Models\TicketAttribute;
|
||||||
use Modules\Support\Models\TicketAttributeMapper;
|
use Modules\Support\Models\TicketAttributeMapper;
|
||||||
use Modules\Support\Models\TicketAttributeType;
|
use Modules\Support\Models\TicketAttributeType;
|
||||||
|
|
@ -41,8 +30,17 @@ use Modules\Support\Models\TicketAttributeTypeL11nMapper;
|
||||||
use Modules\Support\Models\TicketAttributeTypeMapper;
|
use Modules\Support\Models\TicketAttributeTypeMapper;
|
||||||
use Modules\Support\Models\TicketAttributeValue;
|
use Modules\Support\Models\TicketAttributeValue;
|
||||||
use Modules\Support\Models\TicketAttributeValueMapper;
|
use Modules\Support\Models\TicketAttributeValueMapper;
|
||||||
use Modules\Support\Models\NullTicketAttributeType;
|
use Modules\Support\Models\TicketElement;
|
||||||
use Modules\Support\Models\NullTicketAttributeValue;
|
use Modules\Support\Models\TicketElementMapper;
|
||||||
|
use Modules\Support\Models\TicketMapper;
|
||||||
|
use Modules\Tasks\Models\TaskStatus;
|
||||||
|
use Modules\Tasks\Models\TaskType;
|
||||||
|
use phpOMS\Message\Http\RequestStatusCode;
|
||||||
|
use phpOMS\Message\NotificationLevel;
|
||||||
|
use phpOMS\Message\RequestAbstract;
|
||||||
|
use phpOMS\Message\ResponseAbstract;
|
||||||
|
use phpOMS\Model\Message\FormValidation;
|
||||||
|
use phpOMS\Utils\Parser\Markdown\Markdown;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Api controller for the tickets module.
|
* Api controller for the tickets module.
|
||||||
|
|
|
||||||
|
|
@ -16,15 +16,14 @@ namespace Modules\Support\Controller;
|
||||||
|
|
||||||
use Model\NullSetting;
|
use Model\NullSetting;
|
||||||
use Model\SettingMapper;
|
use Model\SettingMapper;
|
||||||
use Modules\Support\Models\SupportApp;
|
use Modules\Support\Models\SupportAppMapper;
|
||||||
use Modules\Support\Models\TicketMapper;
|
use Modules\Support\Models\TicketMapper;
|
||||||
use Modules\Support\Views\TicketView;
|
use Modules\Support\Views\TicketView;
|
||||||
|
use phpOMS\Asset\AssetType;
|
||||||
use phpOMS\Contract\RenderableInterface;
|
use phpOMS\Contract\RenderableInterface;
|
||||||
use phpOMS\Message\RequestAbstract;
|
use phpOMS\Message\RequestAbstract;
|
||||||
use phpOMS\Message\ResponseAbstract;
|
use phpOMS\Message\ResponseAbstract;
|
||||||
use phpOMS\Views\View;
|
use phpOMS\Views\View;
|
||||||
use phpOMS\Asset\AssetType;
|
|
||||||
use Modules\Support\Models\SupportAppMapper;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Support controller class.
|
* Support controller class.
|
||||||
|
|
|
||||||
|
|
@ -33,10 +33,10 @@ final class TicketAttributeMapper extends DataMapperAbstract
|
||||||
* @since 1.0.0
|
* @since 1.0.0
|
||||||
*/
|
*/
|
||||||
protected static array $columns = [
|
protected static array $columns = [
|
||||||
'support_ticket_attr_id' => ['name' => 'support_ticket_attr_id', 'type' => 'int', 'internal' => 'id'],
|
'support_ticket_attr_id' => ['name' => 'support_ticket_attr_id', 'type' => 'int', 'internal' => 'id'],
|
||||||
'support_ticket_attr_ticket' => ['name' => 'support_ticket_attr_ticket', 'type' => 'int', 'internal' => 'ticket'],
|
'support_ticket_attr_ticket' => ['name' => 'support_ticket_attr_ticket', 'type' => 'int', 'internal' => 'ticket'],
|
||||||
'support_ticket_attr_type' => ['name' => 'support_ticket_attr_type', 'type' => 'int', 'internal' => 'type'],
|
'support_ticket_attr_type' => ['name' => 'support_ticket_attr_type', 'type' => 'int', 'internal' => 'type'],
|
||||||
'support_ticket_attr_value' => ['name' => 'support_ticket_attr_value', 'type' => 'int', 'internal' => 'value'],
|
'support_ticket_attr_value' => ['name' => 'support_ticket_attr_value', 'type' => 'int', 'internal' => 'value'],
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -34,10 +34,10 @@ final class TicketElementMapper extends DataMapperAbstract
|
||||||
* @since 1.0.0
|
* @since 1.0.0
|
||||||
*/
|
*/
|
||||||
protected static array $columns = [
|
protected static array $columns = [
|
||||||
'support_ticket_element_id' => ['name' => 'support_ticket_element_id', 'type' => 'int', 'internal' => 'id'],
|
'support_ticket_element_id' => ['name' => 'support_ticket_element_id', 'type' => 'int', 'internal' => 'id'],
|
||||||
'support_ticket_element_task_element' => ['name' => 'support_ticket_element_task_element', 'type' => 'int', 'internal' => 'taskElement'],
|
'support_ticket_element_task_element' => ['name' => 'support_ticket_element_task_element', 'type' => 'int', 'internal' => 'taskElement'],
|
||||||
'support_ticket_element_time' => ['name' => 'support_ticket_element_time', 'type' => 'int', 'internal' => 'time'],
|
'support_ticket_element_time' => ['name' => 'support_ticket_element_time', 'type' => 'int', 'internal' => 'time'],
|
||||||
'support_ticket_element_ticket' => ['name' => 'support_ticket_element_ticket', 'type' => 'int', 'internal' => 'ticket'],
|
'support_ticket_element_ticket' => ['name' => 'support_ticket_element_ticket', 'type' => 'int', 'internal' => 'ticket'],
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -37,8 +37,8 @@ final class TicketMapper extends DataMapperAbstract
|
||||||
protected static array $columns = [
|
protected static array $columns = [
|
||||||
'support_ticket_id' => ['name' => 'support_ticket_id', 'type' => 'int', 'internal' => 'id'],
|
'support_ticket_id' => ['name' => 'support_ticket_id', 'type' => 'int', 'internal' => 'id'],
|
||||||
'support_ticket_task' => ['name' => 'support_ticket_task', 'type' => 'int', 'internal' => 'task'],
|
'support_ticket_task' => ['name' => 'support_ticket_task', 'type' => 'int', 'internal' => 'task'],
|
||||||
'support_ticket_for' => ['name' => 'support_ticket_for', 'type' => 'int', 'internal' => 'for'],
|
'support_ticket_for' => ['name' => 'support_ticket_for', 'type' => 'int', 'internal' => 'for'],
|
||||||
'support_ticket_app' => ['name' => 'support_ticket_app', 'type' => 'int', 'internal' => 'app'],
|
'support_ticket_app' => ['name' => 'support_ticket_app', 'type' => 'int', 'internal' => 'app'],
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
return ['Navigation' => [
|
return ['Navigation' => [
|
||||||
'Support' => 'Support',
|
'Support' => 'Support',
|
||||||
'Ticket' => 'Ticket',
|
'Ticket' => 'Ticket',
|
||||||
'Tickets' => 'Tickets',
|
'Tickets' => 'Tickets',
|
||||||
]];
|
]];
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ declare(strict_types=1);
|
||||||
return ['Support' => [
|
return ['Support' => [
|
||||||
'Account' => 'حساب',
|
'Account' => 'حساب',
|
||||||
'All' => 'الجميع',
|
'All' => 'الجميع',
|
||||||
'AverageAmount' => 'متوسط المبلغ',
|
'AverageAmount' => "متوسط \u{200b}\u{200b}المبلغ",
|
||||||
'AverageProcessTime' => 'متوسط وقت المعالجة',
|
'AverageProcessTime' => 'متوسط وقت المعالجة',
|
||||||
'Created' => 'مخلوق',
|
'Created' => 'مخلوق',
|
||||||
'Creator' => 'المنشئ',
|
'Creator' => 'المنشئ',
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ declare(strict_types=1);
|
||||||
use phpOMS\Uri\UriFactory;
|
use phpOMS\Uri\UriFactory;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var \phpOMS\Views\View $this
|
* @var \phpOMS\Views\View $this
|
||||||
* @var \Modules\Support\Models\Ticket[] $tickets
|
* @var \Modules\Support\Models\Ticket[] $tickets
|
||||||
*/
|
*/
|
||||||
$tickets = $this->getData('tickets');
|
$tickets = $this->getData('tickets');
|
||||||
|
|
|
||||||
|
|
@ -23,11 +23,11 @@ use phpOMS\Uri\UriFactory;
|
||||||
* @var \Modules\Support\Models\Ticket $ticket
|
* @var \Modules\Support\Models\Ticket $ticket
|
||||||
*/
|
*/
|
||||||
$ticket = $this->getData('ticket');
|
$ticket = $this->getData('ticket');
|
||||||
$task = $ticket->task;
|
$task = $ticket->task;
|
||||||
$taskMedia = $task->getMedia();
|
$taskMedia = $task->getMedia();
|
||||||
$elements = $task->invertTaskElements();
|
$elements = $task->invertTaskElements();
|
||||||
$cElements = \count($elements);
|
$cElements = \count($elements);
|
||||||
$color = 'red'; //$this->getStatus($task->getStatus());
|
$color = 'red'; //$this->getStatus($task->getStatus());
|
||||||
|
|
||||||
echo $this->getData('nav')->render(); ?>
|
echo $this->getData('nav')->render(); ?>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -392,4 +392,4 @@ function phpServe() : void
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
phpServe();
|
\phpServe();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user