Jingga/oms-ItemManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-ItemManagement.git synced 2026-02-15 19:58:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Karaka-Management/oms-ItemManagement into develop

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-09-24 20:30:19 +00:00
commit cdcade60e5
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Controller/ApiAttributeController.php
View File

@ -447,7 +447,6 @@ final class ApiAttributeController extends Controller
*/ */
public function apiItemAttributeValueDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiItemAttributeValueDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
return;
// @todo: I don't think values can be deleted? Only Attributes // @todo: I don't think values can be deleted? Only Attributes
// However, It should be possible to remove UNUSED default values // However, It should be possible to remove UNUSED default values
// either here or other function? // either here or other function?

2
Theme/Backend/Lang/da.lang.php
View File

@ -118,7 +118,7 @@ return ['ItemManagement' => [
'QA' => 'QA.', 'QA' => 'QA.',
'QM' => 'Qm.', 'QM' => 'Qm.',
'Quantity' => 'Antal', 'Quantity' => 'Antal',
'QuantityUnit' => 'Mængden af ​​mængde', 'QuantityUnit' => "Mængden af \u{200b}\u{200b}mængde",
'RecentInvoices' => '#VALUE!', 'RecentInvoices' => '#VALUE!',
'ReorderLevel' => 'Ombestillingsniveau', 'ReorderLevel' => 'Ombestillingsniveau',
'Reserved' => 'Reserveret', 'Reserved' => 'Reserveret',

4
Theme/Backend/Lang/fr.lang.php
View File

@ -113,7 +113,7 @@ return ['ItemManagement' => [
'Properties' => 'Propriétés', 'Properties' => 'Propriétés',
'Property' => 'Propriété', 'Property' => 'Propriété',
'Purchase' => 'Acheter', 'Purchase' => 'Acheter',
'PurchasePrice' => 'Prix ​​d\'achat', 'PurchasePrice' => "Prix \u{200b}\u{200b}d'achat",
'Purchasing' => 'Achat', 'Purchasing' => 'Achat',
'QA' => 'Qa', 'QA' => 'Qa',
'QM' => 'Qm', 'QM' => 'Qm',
@ -124,7 +124,7 @@ return ['ItemManagement' => [
'Reserved' => 'Réservé', 'Reserved' => 'Réservé',
'SN' => 'Sn', 'SN' => 'Sn',
'Sales' => 'Ventes', 'Sales' => 'Ventes',
'SalesPrice' => 'Prix ​​de vente', 'SalesPrice' => "Prix \u{200b}\u{200b}de vente",
'SalesPricing' => '', 'SalesPricing' => '',
'Segment' => 'Segment', 'Segment' => 'Segment',
'ShelfLife' => 'Durée de vie', 'ShelfLife' => 'Durée de vie',

5
tests/Controller/ApiControllerTest.php
View File

@ -45,6 +45,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
* @var \Modules\ItemManagement\Controller\ApiController * @var \Modules\ItemManagement\Controller\ApiController
*/ */
protected ModuleAbstract $module; protected ModuleAbstract $module;
protected ModuleAbstract $attrModule; protected ModuleAbstract $attrModule;
/** /**
@ -71,7 +72,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
$account = new Account(); $account = new Account();
TestUtils::setMember($account, 'id', 1); TestUtils::setMember($account, 'id', 1);
$permission = new AccountPermission(); $permission = new AccountPermission();
$permission->unit = 1; $permission->unit = 1;
$permission->app = 2; $permission->app = 2;
$permission->setPermission( $permission->setPermission(
@ -87,7 +88,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
$this->app->accountManager->add($account); $this->app->accountManager->add($account);
$this->app->router = new WebRouter(); $this->app->router = new WebRouter();
$this->module = $this->app->moduleManager->get('ItemManagement', 'Api'); $this->module = $this->app->moduleManager->get('ItemManagement', 'Api');
$this->attrModule = $this->app->moduleManager->get('ItemManagement', 'ApiAttribute'); $this->attrModule = $this->app->moduleManager->get('ItemManagement', 'ApiAttribute');
TestUtils::setMember($this->module, 'app', $this->app); TestUtils::setMember($this->module, 'app', $this->app);

2
tests/Models/ItemTest.php
View File

@ -15,10 +15,8 @@ declare(strict_types=1);
namespace Modules\ItemManagement\tests\Models; namespace Modules\ItemManagement\tests\Models;
use Modules\Attribute\Models\Attribute; use Modules\Attribute\Models\Attribute;
use Modules\Editor\Models\EditorDoc;
use Modules\ItemManagement\Models\Item; use Modules\ItemManagement\Models\Item;
use Modules\ItemManagement\Models\ItemStatus; use Modules\ItemManagement\Models\ItemStatus;
use Modules\Media\Models\Media;
use phpOMS\Localization\BaseStringL11n; use phpOMS\Localization\BaseStringL11n;
/** /**