Jingga/oms-ClientManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-ClientManagement.git synced 2026-01-11 15:28:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bugs

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-31 15:59:16 +00:00
parent c553584810
commit d0cf0b6d5d
6 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Controller.js
View File

@ -53,7 +53,7 @@ jsOMS.Modules.ClientManagement = class {
bindMap (map)
{
if (typeof map === 'undefined' || !map) {
jsOMS.Log.Logger.instance.error('Invalid map: ' + map, 'ClientManager');
jsOMS.Log.Logger.instance.error('Invalid map: ' + map, 'ClientManagement');
return;
}

4
Controller/BackendController.php
View File

@ -202,7 +202,7 @@ final class BackendController extends Controller
*/
public function viewClientManagementClientProfile(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
{
$head = $response->get('Content')->head;
$head = $response->data['Content']->head;
$head->addAsset(AssetType::CSS, 'Resources/chartjs/Chartjs/chart.css');
$head->addAsset(AssetType::JSLATE, 'Resources/chartjs/Chartjs/chart.js');
$head->addAsset(AssetType::JSLATE, 'Resources/OpenLayers/OpenLayers.js');
@ -320,7 +320,7 @@ final class BackendController extends Controller
*/
public function viewClientAnalysis(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
{
$head = $response->get('Content')->head;
$head = $response->data['Content']->head;
$head->addAsset(AssetType::CSS, 'Resources/chartjs/Chartjs/chart.css');
$head->addAsset(AssetType::JSLATE, 'Resources/chartjs/Chartjs/chart.js');
$head->addAsset(AssetType::JSLATE, 'Modules/ClientManagement/Controller.js', ['type' => 'module']);

5
Theme/Backend/client-list.tpl.php
View File

@ -101,9 +101,8 @@ echo $this->data['nav']->render(); ?>
</label>
<tbody>
<?php $count = 0; foreach ($clients as $key => $value) : ++$count;
$url = UriFactory::build('{/base}/sales/client/profile?{?}&id=' . $value->id);
$image = $value->getFileByTypeName('client_profile_image');
?>
$url = UriFactory::build('{/base}/sales/client/profile?{?}&id=' . $value->id);
?>
<tr data-href="<?= $url; ?>">
<td data-label="<?= $this->getHtml('ID', '0', '0'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->number); ?></a>
<td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->account->name1); ?> <?= $this->printHtml($value->account->name2); ?></a>

4
Theme/Backend/client-profile-bills.tpl.php
View File

@ -181,8 +181,8 @@ $bills = $this->data['newestInvoices'] ?? [];
<td><a href="<?= $url; ?>"><?= $value->billZip; ?></a>
<td><a href="<?= $url; ?>"><?= $value->billCity; ?></a>
<td><a href="<?= $url; ?>"><?= $value->billCountry; ?></a>
<td><a href="<?= $url; ?>"><?= $value->netSales->getCurrency(); ?></a>
<td><a href="<?= $url; ?>"><?= $value->netProfit->getCurrency(); ?></a>
<td><a href="<?= $url; ?>"><?= $this->getCurrency($value->netSales); ?></a>
<td><a href="<?= $url; ?>"><?= $this->getCurrency($value->netProfit); ?></a>
<td><a href="<?= $url; ?>"><?= $value->createdAt->format('Y-m-d'); ?></a>
<?php endforeach; ?>
<?php if ($count === 0) : ?>

4
Theme/Backend/client-profile-items.tpl.php
View File

@ -145,11 +145,11 @@ $items = $this->data['items'] ?? [];
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->itemNumber); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->itemName); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml((string) $value->getQuantity()); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->singleSalesPriceNet->getCurrency()); ?></a>
<td><a href="<?= $url; ?>"><?= $this->getcurrency($value->singleSalesPriceNet); ?></a>
<td>
<td>
<td>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->totalSalesPriceNet->getCurrency()); ?></a>
<td><a href="<?= $url; ?>"><?= $this->getcurrency($value->totalSalesPriceNet); ?></a>
<?php endforeach; ?>
<?php if ($count === 0) : ?>
<tr><td colspan="9" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>

6
Theme/Backend/client-profile.tpl.php
View File

@ -43,7 +43,7 @@ echo $this->data['nav']->render();
<li><label for="c-tab-3"><?= $this->getHtml('Addresses'); ?></label></li>
<li><label for="c-tab-5"><?= $this->getHtml('Payment'); ?></label></li>
<li><label for="c-tab-6"><?= $this->getHtml('Prices'); ?></label></li>
<li><label for="c-tab-7"><?= $this->getHtml('Attributes'); ?></label></li>
<li><label for="c-tab-7"><?= $this->getHtml('Attributes', 'Attribute', 'Backend'); ?></label></li>
<li><label for="c-tab-8"><?= $this->getHtml('Files'); ?></label></li>
<li><label for="c-tab-9"><?= $this->getHtml('Invoices'); ?></label>
<li><label for="c-tab-10"><?= $this->getHtml('Articles'); ?></label>
@ -93,7 +93,7 @@ echo $this->data['nav']->render();
<section class="portlet">
<div class="portlet-head">
<?= $this->getHtml('Contact'); ?>
<a class="floatRight" href=""><i class="fa fa-envelope-o btn"></i></a>
<a class="end-xs" href=""><i class="fa fa-envelope-o btn"></i></a>
</div>
<div class="portlet-body">
<table class="layout wf-100">
@ -110,7 +110,7 @@ echo $this->data['nav']->render();
<section class="portlet map-small">
<div class="portlet-head">
<?= $this->getHtml('Address'); ?>
<span class="clickPopup floatRight">
<span class="clickPopup end-xs">
<label for="addressDropdown"><i class="fa fa-print btn"></i></label>
<input id="addressDropdown" name="addressDropdown" type="checkbox">
<div class="popup">