From d0cf0b6d5dbc1be4dd47bed665b1b8fd59fda431 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 31 May 2023 15:59:16 +0000 Subject: [PATCH] fix bugs --- Controller.js | 2 +- Controller/BackendController.php | 4 ++-- Theme/Backend/client-list.tpl.php | 5 ++--- Theme/Backend/client-profile-bills.tpl.php | 4 ++-- Theme/Backend/client-profile-items.tpl.php | 4 ++-- Theme/Backend/client-profile.tpl.php | 6 +++--- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/Controller.js b/Controller.js index 1fa8e50..d020d8b 100755 --- a/Controller.js +++ b/Controller.js @@ -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; } diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 359f1a1..b1afeda 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -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']); diff --git a/Theme/Backend/client-list.tpl.php b/Theme/Backend/client-list.tpl.php index de9d982..18fe035 100755 --- a/Theme/Backend/client-list.tpl.php +++ b/Theme/Backend/client-list.tpl.php @@ -101,9 +101,8 @@ echo $this->data['nav']->render(); ?> $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); + ?> printHtml($value->number); ?> printHtml($value->account->name1); ?> printHtml($value->account->name2); ?> diff --git a/Theme/Backend/client-profile-bills.tpl.php b/Theme/Backend/client-profile-bills.tpl.php index b60d608..e6d1dd9 100755 --- a/Theme/Backend/client-profile-bills.tpl.php +++ b/Theme/Backend/client-profile-bills.tpl.php @@ -181,8 +181,8 @@ $bills = $this->data['newestInvoices'] ?? []; billZip; ?> billCity; ?> billCountry; ?> - netSales->getCurrency(); ?> - netProfit->getCurrency(); ?> + getCurrency($value->netSales); ?> + getCurrency($value->netProfit); ?> createdAt->format('Y-m-d'); ?> diff --git a/Theme/Backend/client-profile-items.tpl.php b/Theme/Backend/client-profile-items.tpl.php index 7aa5473..f30e1ca 100755 --- a/Theme/Backend/client-profile-items.tpl.php +++ b/Theme/Backend/client-profile-items.tpl.php @@ -145,11 +145,11 @@ $items = $this->data['items'] ?? []; printHtml($value->itemNumber); ?> printHtml($value->itemName); ?> printHtml((string) $value->getQuantity()); ?> - printHtml($value->singleSalesPriceNet->getCurrency()); ?> + getcurrency($value->singleSalesPriceNet); ?> - printHtml($value->totalSalesPriceNet->getCurrency()); ?> + getcurrency($value->totalSalesPriceNet); ?> getHtml('Empty', '0', '0'); ?> diff --git a/Theme/Backend/client-profile.tpl.php b/Theme/Backend/client-profile.tpl.php index 1350f8e..0a22b29 100755 --- a/Theme/Backend/client-profile.tpl.php +++ b/Theme/Backend/client-profile.tpl.php @@ -43,7 +43,7 @@ echo $this->data['nav']->render();
  • -
  • +
  • @@ -93,7 +93,7 @@ echo $this->data['nav']->render();
    getHtml('Contact'); ?> - +
    @@ -110,7 +110,7 @@ echo $this->data['nav']->render();
    getHtml('Address'); ?> - +