diff --git a/.github/dev_bug_report.md b/.github/dev_bug_report.md deleted file mode 100755 index ef93e56..0000000 --- a/.github/dev_bug_report.md +++ /dev/null @@ -1,35 +0,0 @@ ---- -name: Dev Bug Report -about: Create a report to help us improve -title: '' -labels: stat_backlog, type_bug -assignees: '' - ---- - -# Bug Description -A clear and concise description of what the bug is. - -# How to Reproduce - -Steps to reproduce the behavior: - -1. Go to '...' -2. Click on '....' -3. Scroll down to '....' -4. See error - -## Minimal Code Example - -``` -// your code ... -``` - -# Expected Behavior -A clear and concise description of what you expected to happen. - -# Screenshots -If applicable, add screenshots to help explain your problem. - -# Additional Information -Add any other context about the problem here. diff --git a/.github/dev_feature_request.md b/.github/dev_feature_request.md deleted file mode 100755 index 9573c35..0000000 --- a/.github/dev_feature_request.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -name: Dev Feature Request -about: Suggest an idea for this project -title: '' -labels: stat_backlog, type_feature -assignees: '' - ---- - -# What is the feature you request -* A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -* A clear and concise description of what you want to happen. - -# Alternatives -A clear and concise description of any alternative solutions or features you've considered. - -# Additional Information -Add any other context or screenshots about the feature request here. diff --git a/Admin/Install/Admin.install.json b/Admin/Install/Admin.install.json deleted file mode 100644 index 2f81101..0000000 --- a/Admin/Install/Admin.install.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "description": "Default client segmentation (segment, section, sales group, product group)", - "type": "setting", - "name": "1003100001", - "content": "{\"segment\":1, \"section\":1, \"client_group\":1}", - "pattern": "", - "module": "ClientManagement" - } -] \ No newline at end of file diff --git a/Admin/Install/Admin.install.php b/Admin/Install/Admin.install.php new file mode 100644 index 0000000..096918f --- /dev/null +++ b/Admin/Install/Admin.install.php @@ -0,0 +1,27 @@ + "Default item segmentation (segment, section, sales group, product group)", + 'type' => 'setting', + 'name' => SettingsEnum::DEFAULT_SEGMENTATION, + 'content' => '{"segment":1, "section":1, "client_group":1}', + 'pattern' => '', + 'module' => ApiController::NAME, + ], +]; diff --git a/Admin/Install/Admin.php b/Admin/Install/Admin.php index 4bdf46a..093ebe5 100644 --- a/Admin/Install/Admin.php +++ b/Admin/Install/Admin.php @@ -38,6 +38,10 @@ class Admin */ public static function install(ApplicationAbstract $app, string $path) : void { - // \Modules\Admin\Admin\Installer::installExternal($app, ['path' => __DIR__ . '/Admin.install.json']); + // We are creating default items in the ClientManagement installer. + // This requires that these settings are already available + // However, this install script runs AFTER the primary installer runs. + // This causes problems for the item installation and is therefore moved to the "Installer". + // \Modules\Admin\Admin\Installer::installExternal($app, ['path' => __DIR__ . '/Admin.install.php']); } } diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index 6989fcc..0d1976d 100755 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -5,7 +5,7 @@ "type": 2, "subtype": 1, "name": "Clients", - "uri": "{/base}/sales/client/list", + "uri": "{/base}/sales/client/list?{?}", "target": "self", "icon": null, "order": 1, @@ -19,7 +19,7 @@ "type": 3, "subtype": 1, "name": "List", - "uri": "{/base}/sales/client/list", + "uri": "{/base}/sales/client/list?{?}", "target": "self", "icon": null, "order": 1, diff --git a/Admin/Install/attributes.json b/Admin/Install/attributes.json index 6cc8544..c8bb287 100755 --- a/Admin/Install/attributes.json +++ b/Admin/Install/attributes.json @@ -331,19 +331,6 @@ "default_value": "", "values": [] }, - { - "name": "order_limit", - "l11n": { - "en": "Order limit", - "de": "Bestelllimit" - }, - "value_type": 1, - "is_custom_allowed": true, - "validation_pattern": "", - "is_required": false, - "default_value": "", - "values": [] - }, { "name": "minimum_order", "l11n": { diff --git a/Admin/Install/localizations.json b/Admin/Install/localizations.json index c44dc44..71ee006 100755 --- a/Admin/Install/localizations.json +++ b/Admin/Install/localizations.json @@ -1,3 +1,6 @@ [ - + { + "name": "internal_matchcodes", + "is_required": false + } ] \ No newline at end of file diff --git a/Admin/Installer.php b/Admin/Installer.php index 248f68e..a2cfba3 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -61,7 +61,7 @@ final class Installer extends InstallerAbstract $attrTypes = self::createClientAttributeTypes($app, $attributes); $attrValues = self::createClientAttributeValues($app, $attrTypes, $attributes); - $data = \json_decode(\file_get_contents(__DIR__ . '/Install/Admin.install.json'), true); + $data = include __DIR__ . '/Install/Admin.install.php'; $content = \json_decode($data[0]['content'], true); foreach ($content as $type => $_) { @@ -102,7 +102,7 @@ final class Installer extends InstallerAbstract $l11nTypes = []; /** @var \Modules\ClientManagement\Controller\ApiController $module */ - $module = $app->moduleManager->getModuleInstance('ClientManagement'); + $module = $app->moduleManager->get('ClientManagement'); foreach ($l11ns as $l11n) { $response = new HttpResponse(); @@ -143,7 +143,7 @@ final class Installer extends InstallerAbstract $clientAttrType = []; /** @var \Modules\ClientManagement\Controller\ApiAttributeController $module */ - $module = $app->moduleManager->getModuleInstance('ClientManagement', 'ApiAttribute'); + $module = $app->moduleManager->get('ClientManagement', 'ApiAttribute'); /** @var array $attribute */ foreach ($attributes as $attribute) { @@ -211,7 +211,7 @@ final class Installer extends InstallerAbstract $clientAttrValue = []; /** @var \Modules\ClientManagement\Controller\ApiAttributeController $module */ - $module = $app->moduleManager->getModuleInstance('ClientManagement', 'ApiAttribute'); + $module = $app->moduleManager->get('ClientManagement', 'ApiAttribute'); foreach ($attributes as $attribute) { $clientAttrValue[$attribute['name']] = []; diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 0fede79..8da45ee 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -45,6 +45,7 @@ use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\Model\Message\FormValidation; use phpOMS\Utils\StringUtils; +use phpOMS\Validation\Finance\EUVat; /** * ClientManagement class. @@ -53,6 +54,12 @@ use phpOMS\Utils\StringUtils; * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 + * + * @todo Import client prices from csv/excel sheet + * https://github.com/Karaka-Management/oms-ClientManagement/issues/17 + * + * @todo Perform inflation increase on all client prices + * https://github.com/Karaka-Management/oms-ClientManagement/issues/18 */ final class ApiController extends Controller { @@ -108,7 +115,10 @@ final class ApiController extends Controller $validate = ['status' => -1]; - if (\in_array($client->mainAddress->country, ISO3166CharEnum::getRegion('eu'))) { + // Has to be in EU and match VAT pattern before we perform external API request + if (\in_array($client->mainAddress->country, ISO3166CharEnum::getRegion('eu')) + && EUVat::isValid($request->getDataString('vat_id') ?? '') + ) { $validate = EUVATVies::validateQualified( $request->getDataString('vat_id') ?? '', $unit->getAttribute('vat_id')->value->valueStr ?? '', @@ -289,7 +299,7 @@ final class ApiController extends Controller $client = new Client(); $client->number = $request->getDataString('number') ?? ''; $client->account = $account; - $client->unit = $request->getDataInt('unit') ?? 1; + $client->unit = $request->getDataInt('unit') ?? $this->app->unitId; $request->setData('name', null, true); $client->mainAddress = $this->app->moduleManager->get('Admin', 'Api')->createAddressFromRequest($request); diff --git a/Controller/BackendController.php b/Controller/BackendController.php index de84772..8b48645 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -20,11 +20,13 @@ use Modules\ClientManagement\Models\Attribute\ClientAttributeTypeMapper; use Modules\ClientManagement\Models\Attribute\ClientAttributeValueL11nMapper; use Modules\ClientManagement\Models\Attribute\ClientAttributeValueMapper; use Modules\ClientManagement\Models\ClientMapper; +use Modules\ClientManagement\Models\PermissionCategory; use Modules\ItemManagement\Models\Attribute\ItemAttributeTypeMapper; use Modules\ItemManagement\Models\Attribute\ItemAttributeValueL11nMapper; use Modules\Media\Models\MediaMapper; use Modules\Media\Models\MediaTypeMapper; use Modules\Organization\Models\Attribute\UnitAttributeMapper; +use phpOMS\Account\PermissionType; use phpOMS\Asset\AssetType; use phpOMS\Contract\RenderableInterface; use phpOMS\DataStorage\Database\Query\Builder; @@ -161,6 +163,7 @@ final class BackendController extends Controller $client = ClientMapper::getAll() ->with('account') ->with('mainAddress') + ->where('unit', $this->app->unitId) ->limit(25) ->execute(); @@ -207,10 +210,10 @@ final class BackendController extends Controller $head = $response->data['Content']->head; $nonce = $this->app->appSettings->getOption('script-nonce'); - $head->addAsset(AssetType::CSS, 'Resources/chartjs/chart.css'); - $head->addAsset(AssetType::JSLATE, 'Resources/chartjs/chart.js', ['nonce' => $nonce]); - $head->addAsset(AssetType::JSLATE, 'Resources/OpenLayers/OpenLayers.js', ['nonce' => $nonce]); - $head->addAsset(AssetType::JSLATE, 'Modules/ClientManagement/Controller.js', ['nonce' => $nonce, 'type' => 'module']); + $head->addAsset(AssetType::CSS, 'Resources/chartjs/chart.css?v=' . $this->app->version); + $head->addAsset(AssetType::JSLATE, 'Resources/chartjs/chart.js?v=' . $this->app->version, ['nonce' => $nonce]); + $head->addAsset(AssetType::JSLATE, 'Resources/OpenLayers/OpenLayers.js?v=' . $this->app->version, ['nonce' => $nonce]); + $head->addAsset(AssetType::JSLATE, 'Modules/ClientManagement/Controller.js?v=' . self::VERSION, ['nonce' => $nonce, 'type' => 'module']); $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/ClientManagement/Theme/Backend/client-view'); @@ -335,12 +338,24 @@ final class BackendController extends Controller $view->data['clientSegmentationTypes'] = $clientSegmentationTypes; - /** @var \Modules\Auditor\Models\Audit[] */ - $view->data['audits'] = AuditMapper::getAll() - ->where('type', StringUtils::intHash(ClientMapper::class)) - ->where('module', 'ClientManagement') - ->where('ref', (string) $view->data['client']->id) - ->execute(); + $logs = []; + if ($this->app->accountManager->get($request->header->account)->hasPermission( + PermissionType::READ, + $this->app->unitId, + null, + self::NAME, + PermissionCategory::CLIENT_LOG, + ) + ) { + /** @var \Modules\Auditor\Models\Audit[] */ + $logs = AuditMapper::getAll() + ->where('type', StringUtils::intHash(ClientMapper::class)) + ->where('module', 'ClientManagement') + ->where('ref', (string) $view->data['client']->id) + ->execute(); + } + + $view->data['logs'] = $logs; // @todo join audit with files, attributes, localization, prices, notes, ... diff --git a/Docs/Help/de/SUMMARY.md b/Docs/Help/de/SUMMARY.md new file mode 100644 index 0000000..bcbe68d --- /dev/null +++ b/Docs/Help/de/SUMMARY.md @@ -0,0 +1,3 @@ +# User Content + +* [Attributes]({%}&page=Help/attributes) diff --git a/Docs/Help/de/accounting.md b/Docs/Help/de/accounting.md new file mode 100644 index 0000000..e69de29 diff --git a/Docs/Help/de/attributes.md b/Docs/Help/de/attributes.md new file mode 100644 index 0000000..61eb812 --- /dev/null +++ b/Docs/Help/de/attributes.md @@ -0,0 +1,59 @@ +# Attributes + +## Default + +The module automatically installs the following default attributes which can be set in the attribute tab in the respective client. + +### General + +| Attribute | Description | Internal default value | +| --------- | ----------- | ---------------------- | +| abc_class | Custom client rating | | +| support_emails | Send email for support ticket changes | yes | +| support_email_address | Email address for support tickets | Account email | +| legal_form | Client legal form | | + +### Categories + +Clients can be put in categories for horizontal and vertical grouping. By default the system uses segment->section->client_group as categories as well as client_type. These categories also get used by other modules. Additional groups can be defined but are not used by other modules by default. + +| Attribute | Description | Internal default value | +| --------- | ----------- | ---------------------- | +| segment | Level 1 | 1 | +| section | Level 2 | 1 | +| client_group | Level 3 | 1 | +| client_type | **NOT** hierarchically. | 1 | +| client_area | **NOT** hierarchically. Area a client belongs to. Useful for grouping customers based on location or sales rep. | | + +| Level | > | > | > | > | > | > | Sample | +| :---: | :-----------------: | :-: | :-----------------: | :-: | :-----------------: | :-----------------: | :----------------: | +| 1 | > | > | > | > | Segment 1 | > | Segment 2 | +| 2 | > | > | Section 1.1 | > | Section 1.2 | > | Section 2.1 | +| 3 | Client Group 1.1.1 | > | Client Group 1.1.2 | > | Client Group 1.2.1 | Client Group 2.1.1 | Client Group 2.1.2 | + +> You could consider the client (number) itself `Level 4`. + +### Billing + +| Attribute | Description | Internal default value | +| --------- | ----------- | ---------------------- | +| bill_emails | Should bills get emailed to the customer | yes | +| bill_email_address | Email address used for sending bill via email | account email | +| bill_language | Language of the bill | Account language -> default bill language | +| bill_currency | Currency of the bill. Coming soon. | | + +### Purchase & Stock + +| Attribute | Description | Internal default value | +| --------- | ----------- | ---------------------- | +| minimum_order | Minimum order amount required from customer | | + +### Accounting + +| Attribute | Description | Internal default value | +| --------- | ----------- | ---------------------- | +| sales_tax_code | Tax code for sales | | +| vat_id | VAT id for european customers | | +| tax_id | Tax id for local tax id | | +| line_of_credit | Maximum amount allowed to be purchased taking unpaid invoices into account | | +| credit_rating | Credit rating | | \ No newline at end of file diff --git a/Docs/Help/de/introduction.md b/Docs/Help/de/introduction.md new file mode 100644 index 0000000..14e6a9e --- /dev/null +++ b/Docs/Help/de/introduction.md @@ -0,0 +1,54 @@ +# Introduction + +The **Item Management** module is an essential module for any ERP application. This module handles basic item management and is deeply integrated into **Billing** and **Warehouse Management**. + +## Target Group + +The target group for this module is anyone who wants to manage their tangible and non-tangible products. + +# Setup + +This module doesn't have any additional setup requirements and can be simply installed through the module interface. + +# Features + +## Item master file + +The module provides basic item data management + +* Attach documents to items +* Write notes for items +* Overview of most recent notes, documents, invoices and sales statistics (requires **Billing**) + +## Localization + +Localizations allow you to define item names and descriptions in multiple languages. You can also define custom text elements for external use (e.g. descriptions to be exported to other systems such as your own shop system). + +## Attributes + +Attributes allow you to define various item characteristics such as color, medical device class, segmentation, hazardous good, brand, model and many more. + +## Pricing + +By installing the **Billing** module you are can define multiple purchase and sales prices. Prices and discounts can be defined for individual items, customers and suppliers and for customer groups. You may also define quantity based prices. + +## Procurement + +Together with the **Purchase** module you can define stock levels, order conditions and delivery times for automated order suggestion calculations making it a breeze to ensure sufficient stocks. + +## Accounting + +Together with the **Accounting** module you can define cost center, cost object and taxes for every item. + +## Stock + +Together with the **Warehouse Management** module you can also track your stocks and + +# Recommendation + +Other modules that work great with this one together are: + +* [Warehouse Management](WarehouseManagement) +* [Supplier Management](SupplierManagement) +* [Purchase](Purchase) +* [Accounting](Accounting) diff --git a/Docs/Help/de/localization.md b/Docs/Help/de/localization.md new file mode 100644 index 0000000..94aa062 --- /dev/null +++ b/Docs/Help/de/localization.md @@ -0,0 +1,14 @@ +# Localization + +## Default + +The module automatically installs the following default localizations which can be set in the localization tab in the respective item. + +* name1 - Primary item name +* name2 - Secondary item name +* info - Internal item info +* internal_matchcodes - Match code for finding item based on a specific name or short description +* description_short - Short item description +* description_long - Long item description +* shop_name1 - Primary item name for a shop system +* shop_name2 - Secondary item name for a shop system \ No newline at end of file diff --git a/Docs/Help/de/pricing.md b/Docs/Help/de/pricing.md new file mode 100644 index 0000000..e69de29 diff --git a/Docs/Help/en/SUMMARY.md b/Docs/Help/en/SUMMARY.md new file mode 100644 index 0000000..bcbe68d --- /dev/null +++ b/Docs/Help/en/SUMMARY.md @@ -0,0 +1,3 @@ +# User Content + +* [Attributes]({%}&page=Help/attributes) diff --git a/Docs/Help/en/accounting.md b/Docs/Help/en/accounting.md new file mode 100644 index 0000000..e69de29 diff --git a/Docs/Help/en/attributes.md b/Docs/Help/en/attributes.md new file mode 100644 index 0000000..61eb812 --- /dev/null +++ b/Docs/Help/en/attributes.md @@ -0,0 +1,59 @@ +# Attributes + +## Default + +The module automatically installs the following default attributes which can be set in the attribute tab in the respective client. + +### General + +| Attribute | Description | Internal default value | +| --------- | ----------- | ---------------------- | +| abc_class | Custom client rating | | +| support_emails | Send email for support ticket changes | yes | +| support_email_address | Email address for support tickets | Account email | +| legal_form | Client legal form | | + +### Categories + +Clients can be put in categories for horizontal and vertical grouping. By default the system uses segment->section->client_group as categories as well as client_type. These categories also get used by other modules. Additional groups can be defined but are not used by other modules by default. + +| Attribute | Description | Internal default value | +| --------- | ----------- | ---------------------- | +| segment | Level 1 | 1 | +| section | Level 2 | 1 | +| client_group | Level 3 | 1 | +| client_type | **NOT** hierarchically. | 1 | +| client_area | **NOT** hierarchically. Area a client belongs to. Useful for grouping customers based on location or sales rep. | | + +| Level | > | > | > | > | > | > | Sample | +| :---: | :-----------------: | :-: | :-----------------: | :-: | :-----------------: | :-----------------: | :----------------: | +| 1 | > | > | > | > | Segment 1 | > | Segment 2 | +| 2 | > | > | Section 1.1 | > | Section 1.2 | > | Section 2.1 | +| 3 | Client Group 1.1.1 | > | Client Group 1.1.2 | > | Client Group 1.2.1 | Client Group 2.1.1 | Client Group 2.1.2 | + +> You could consider the client (number) itself `Level 4`. + +### Billing + +| Attribute | Description | Internal default value | +| --------- | ----------- | ---------------------- | +| bill_emails | Should bills get emailed to the customer | yes | +| bill_email_address | Email address used for sending bill via email | account email | +| bill_language | Language of the bill | Account language -> default bill language | +| bill_currency | Currency of the bill. Coming soon. | | + +### Purchase & Stock + +| Attribute | Description | Internal default value | +| --------- | ----------- | ---------------------- | +| minimum_order | Minimum order amount required from customer | | + +### Accounting + +| Attribute | Description | Internal default value | +| --------- | ----------- | ---------------------- | +| sales_tax_code | Tax code for sales | | +| vat_id | VAT id for european customers | | +| tax_id | Tax id for local tax id | | +| line_of_credit | Maximum amount allowed to be purchased taking unpaid invoices into account | | +| credit_rating | Credit rating | | \ No newline at end of file diff --git a/Docs/Help/en/introduction.md b/Docs/Help/en/introduction.md new file mode 100644 index 0000000..14e6a9e --- /dev/null +++ b/Docs/Help/en/introduction.md @@ -0,0 +1,54 @@ +# Introduction + +The **Item Management** module is an essential module for any ERP application. This module handles basic item management and is deeply integrated into **Billing** and **Warehouse Management**. + +## Target Group + +The target group for this module is anyone who wants to manage their tangible and non-tangible products. + +# Setup + +This module doesn't have any additional setup requirements and can be simply installed through the module interface. + +# Features + +## Item master file + +The module provides basic item data management + +* Attach documents to items +* Write notes for items +* Overview of most recent notes, documents, invoices and sales statistics (requires **Billing**) + +## Localization + +Localizations allow you to define item names and descriptions in multiple languages. You can also define custom text elements for external use (e.g. descriptions to be exported to other systems such as your own shop system). + +## Attributes + +Attributes allow you to define various item characteristics such as color, medical device class, segmentation, hazardous good, brand, model and many more. + +## Pricing + +By installing the **Billing** module you are can define multiple purchase and sales prices. Prices and discounts can be defined for individual items, customers and suppliers and for customer groups. You may also define quantity based prices. + +## Procurement + +Together with the **Purchase** module you can define stock levels, order conditions and delivery times for automated order suggestion calculations making it a breeze to ensure sufficient stocks. + +## Accounting + +Together with the **Accounting** module you can define cost center, cost object and taxes for every item. + +## Stock + +Together with the **Warehouse Management** module you can also track your stocks and + +# Recommendation + +Other modules that work great with this one together are: + +* [Warehouse Management](WarehouseManagement) +* [Supplier Management](SupplierManagement) +* [Purchase](Purchase) +* [Accounting](Accounting) diff --git a/Docs/Help/en/localization.md b/Docs/Help/en/localization.md new file mode 100644 index 0000000..94aa062 --- /dev/null +++ b/Docs/Help/en/localization.md @@ -0,0 +1,14 @@ +# Localization + +## Default + +The module automatically installs the following default localizations which can be set in the localization tab in the respective item. + +* name1 - Primary item name +* name2 - Secondary item name +* info - Internal item info +* internal_matchcodes - Match code for finding item based on a specific name or short description +* description_short - Short item description +* description_long - Long item description +* shop_name1 - Primary item name for a shop system +* shop_name2 - Secondary item name for a shop system \ No newline at end of file diff --git a/Docs/Help/en/pricing.md b/Docs/Help/en/pricing.md new file mode 100644 index 0000000..e69de29 diff --git a/Models/PermissionCategory.php b/Models/PermissionCategory.php index f8b754e..d0d4c42 100755 --- a/Models/PermissionCategory.php +++ b/Models/PermissionCategory.php @@ -31,4 +31,6 @@ abstract class PermissionCategory extends Enum public const ANALYSIS = 2; public const CLIENT_NOTE = 3; + + public const CLIENT_LOG = 101; } diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php index c57b693..dbb92ec 100755 --- a/Theme/Backend/Lang/de.lang.php +++ b/Theme/Backend/Lang/de.lang.php @@ -125,6 +125,6 @@ return ['ClientManagement' => [ 'ClientType' => 'Kundenart', 'ItemType' => 'Artikeltyp', 'Item' => 'Item', - 'EarningIndicator' => 'Erlöskennzeichen', - 'CostIndicator' => 'Kostenkennzeichen', + 'EarningIndicator' => 'Verkaufssteuerkennzeichen', + 'CostIndicator' => 'Einkaufssteuerkennzeichen', ]]; diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 7dbd990..40ae16a 100755 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -127,6 +127,6 @@ return ['ClientManagement' => [ 'ClientType' => 'Client Type', 'ItemType' => 'Item Type', 'Item' => 'Item', - 'EarningIndicator' => 'Earning Indicator', - 'CostIndicator' => 'Cost Indicator', + 'EarningIndicator' => 'Sales tax code', + 'CostIndicator' => 'Purchase tax code', ]]; diff --git a/Theme/Backend/client-view.tpl.php b/Theme/Backend/client-view.tpl.php index 1bbc0fb..ba5d235 100644 --- a/Theme/Backend/client-view.tpl.php +++ b/Theme/Backend/client-view.tpl.php @@ -40,6 +40,8 @@ $languages = ISO639Enum::getConstants(); $client = $this->data['client']; $clientImage = $this->data['clientImage'] ?? new NullMedia(); +$logs = $this->data['logs'] ?? []; + /** * @var \phpOMS\Views\View $this */ @@ -58,7 +60,7 @@ echo $this->data['nav']->render();
  • -
  • +
  • @@ -206,7 +208,7 @@ echo $this->data['nav']->render();
    -
    +
    @@ -217,7 +219,7 @@ echo $this->data['nav']->render();
    -
    +
    printHtml($warning->plain); ?>
    @@ -227,22 +229,22 @@ echo $this->data['nav']->render(); data['hasBilling']) : ?>
    -
    +
    getHtml('YTDSales'); ?>: - getCurrency(SalesBillMapper::getClientNetSales($client->id, SmartDateTime::startOfYear($this->data['business_start']), new \DateTime('now')), format: 'medium'); ?> + id, SmartDateTime::startOfYear($this->data['business_start']), new \DateTime('now'))->getAmount(); ?>
    getHtml('MTDSales'); ?>: - getCurrency(SalesBillMapper::getClientNetSales($client->id, SmartDateTime::startOfMonth(), new \DateTime('now')), format: 'medium'); ?> + id, SmartDateTime::startOfMonth(), new \DateTime('now'))->getAmount(); ?>
    getHtml('CLV'); ?>: - getCurrency(SalesBillMapper::getCLVHistoric($client->id), format: 'medium'); ?> + id)->getAmount(); ?>
    -
    +
    getHtml('LastContact'); ?>: @@ -257,7 +259,7 @@ echo $this->data['nav']->render();
    -
    +
    - + @@ -852,7 +854,7 @@ echo $this->data['nav']->render(); data['audits'] ?? []; - $previous = empty($audits) ? HttpHeader::getAllHeaders()['Referer'] ?? 'admin/module/settings?id={?id}#{\#}' : 'admin/module/settings?{?}&audit=' . \reset($audits)->id . '&ptype=p#{\#}'; - $next = empty($audits) ? HttpHeader::getAllHeaders()['Referer'] ?? 'admin/module/settings?id={?id}#{\#}' : 'admin/module/settings?{?}&audit=' . \end($audits)->id . '&ptype=n#{\#}'; + $previous = empty($logs) ? HttpHeader::getAllHeaders()['Referer'] ?? 'admin/module/settings?id={?id}#{\#}' : 'admin/module/settings?{?}&audit=' . \reset($logs)->id . '&ptype=p#{\#}'; + $next = empty($logs) ? HttpHeader::getAllHeaders()['Referer'] ?? 'admin/module/settings?id={?id}#{\#}' : 'admin/module/settings?{?}&audit=' . \end($logs)->id . '&ptype=n#{\#}'; - foreach ($audits as $key => $audit) : ++$count; + foreach ($logs as $key => $audit) : ++$count; $url = UriFactory::build('{/base}/admin/audit/view?{?}&id=' . $audit->id); ?>
    getHtml('DSO'); ?>: @@ -553,9 +555,9 @@ echo $this->data['nav']->render(); data-add-tpl="#clientSalesPriceTable tbody .oms-add-tpl-clientSalesPrice">
    getHtml('Pricing'); ?>
    - - - + + +
    @@ -600,8 +602,8 @@ echo $this->data['nav']->render();
    - - + +
    @@ -767,8 +769,8 @@ echo $this->data['nav']->render();
    - - + +
    @@ -813,7 +815,7 @@ echo $this->data['nav']->render();
    settings - + @@ -826,7 +828,7 @@ echo $this->data['nav']->render(); settings name !== 'default') : ?> - + @@ -866,7 +868,7 @@ echo $this->data['nav']->render(); printHtml($value->currency); ?> quantity->getAmount(); ?> discount->getAmount(); ?> - getPercentage($value->discountPercentage->value / 10000 / 100); ?> + getPercentage($value->discountPercentage); ?> bonus->getAmount(); ?> printHtml((string) $value->item); ?> printHtml((string) $value->itemsegment->getL11n()); ?> @@ -1153,8 +1155,8 @@ echo $this->data['nav']->render(); printHtml((string) $value->quantity->getAmount()); ?> getCurrency($value->singleSalesPriceNet, symbol: ''); ?> getCurrency($value->singleDiscountP, symbol: ''); ?> - getPercentage($value->singleDiscountR?->value ?? 0); ?> - getNumeric($value->discountQ?->value ?? 0); ?> + getPercentage($value->singleDiscountR); ?> + getNumeric($value->discountQ?->value); ?> getCurrency($value->totalSalesPriceNet, symbol: ''); ?> @@ -1172,6 +1174,7 @@ echo $this->data['nav']->render(); data['note']->render('client-note', 'notes', $client->notes); ?> +
    @@ -1203,11 +1206,10 @@ echo $this->data['nav']->render();
    id; ?> @@ -1232,5 +1234,6 @@ echo $this->data['nav']->render(); +