From 29a98ac9779f7c8d1b24d019af625aa1463253a8 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Mon, 9 Oct 2023 22:06:39 +0000 Subject: [PATCH] update --- Admin/Installer.php | 6 +++--- Controller.js | 5 +++-- Controller/ApiController.php | 5 +++-- Controller/BackendController.php | 6 +++--- Theme/Backend/Lang/ar.lang.php | 8 ++++---- Theme/Backend/Lang/cs.lang.php | 8 ++++---- Theme/Backend/Lang/da.lang.php | 8 ++++---- Theme/Backend/Lang/de.lang.php | 8 ++++---- Theme/Backend/Lang/el.lang.php | 8 ++++---- Theme/Backend/Lang/es.lang.php | 8 ++++---- Theme/Backend/Lang/fi.lang.php | 8 ++++---- Theme/Backend/Lang/fr.lang.php | 8 ++++---- Theme/Backend/Lang/hu.lang.php | 8 ++++---- Theme/Backend/Lang/it.lang.php | 8 ++++---- Theme/Backend/Lang/ja.lang.php | 8 ++++---- Theme/Backend/Lang/ko.lang.php | 8 ++++---- Theme/Backend/Lang/no.lang.php | 8 ++++---- Theme/Backend/Lang/pl.lang.php | 8 ++++---- Theme/Backend/Lang/pt.lang.php | 8 ++++---- Theme/Backend/Lang/ru.lang.php | 8 ++++---- Theme/Backend/Lang/sv.lang.php | 8 ++++---- Theme/Backend/Lang/th.lang.php | 8 ++++---- Theme/Backend/Lang/tr.lang.php | 8 ++++---- Theme/Backend/Lang/uk.lang.php | 8 ++++---- Theme/Backend/Lang/zh.lang.php | 8 ++++---- .../Controller/Api/ApiControllerAttributeTrait.php | 14 +++++++------- .../Controller/Api/ApiControllerSupplierTrait.php | 8 ++++---- 27 files changed, 107 insertions(+), 105 deletions(-) diff --git a/Admin/Installer.php b/Admin/Installer.php index be74341..821a6e9 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -103,7 +103,7 @@ final class Installer extends InstallerAbstract $module->apiSupplierL11nTypeCreate($request, $response); - $responseData = $response->get(''); + $responseData = $response->getData(''); if (!\is_array($responseData)) { continue; } @@ -150,7 +150,7 @@ final class Installer extends InstallerAbstract $module->apiSupplierAttributeTypeCreate($request, $response); - $responseData = $response->get(''); + $responseData = $response->getData(''); if (!\is_array($responseData)) { continue; } @@ -221,7 +221,7 @@ final class Installer extends InstallerAbstract $module->apiSupplierAttributeValueCreate($request, $response); - $responseData = $response->get(''); + $responseData = $response->getData(''); if (!\is_array($responseData)) { continue; } diff --git a/Controller.js b/Controller.js index dcee1de..9fc99c0 100755 --- a/Controller.js +++ b/Controller.js @@ -1,8 +1,9 @@ +import { jsOMS } from '../../jsOMS/Utils/oLib.js'; import { Autoloader } from '../../jsOMS/Autoloader.js'; -Autoloader.defineNamespace('jsOMS.Modules'); +Autoloader.defineNamespace('omsApp.Modules'); -jsOMS.Modules.SupplierManagement = class { +omsApp.Modules.SupplierManagement = class { /** * @constructor * diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 643768c..3a0928c 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -289,7 +289,8 @@ final class ApiController extends Controller return; } - $attribute = $this->createAttributeFromRequest($request); + $type = SupplierAttributeTypeMapper::get()->where('id', (int) $request->getData('type'))->execute(); + $attribute = $this->createAttributeFromRequest($request, $type); $this->createModel($request->header->account, $attribute, SupplierAttributeMapper::class, 'attribute', $request->getOrigin()); $this->createStandardCreateResponse($request, $response, $attribute); } @@ -499,7 +500,7 @@ final class ApiController extends Controller $request->setData('virtualpath', '/Modules/SupplierManagement/' . $request->getData('id'), true); $this->app->moduleManager->get('Editor')->apiEditorCreate($request, $response, $data); - $data = $response->get($request->uri->__toString()); + $data = $response->getDataArray($request->uri->__toString()); if (!\is_array($data)) { return; } diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 57f1775..5f45f8b 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -202,8 +202,8 @@ final class BackendController extends Controller $head = $response->data['Content']->head; $nonce = $this->app->appSettings->getOption('script-nonce'); - $head->addAsset(AssetType::CSS, 'Resources/chartjs/Chartjs/chart.css'); - $head->addAsset(AssetType::JSLATE, 'Resources/chartjs/Chartjs/chart.js', ['nonce' => $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']); @@ -217,7 +217,7 @@ final class BackendController extends Controller ->with('contactElements') ->with('mainAddress') ->with('files')->limit(5, 'files')->sort('files/id', OrderType::DESC) - ->with('notes')->limit(5, 'files')->sort('notes/id', OrderType::DESC) + ->with('notes')->limit(5, 'notes')->sort('notes/id', OrderType::DESC) ->where('id', (int) $request->getData('id')) ->execute(); diff --git a/Theme/Backend/Lang/ar.lang.php b/Theme/Backend/Lang/ar.lang.php index 6a052a6..151eb97 100755 --- a/Theme/Backend/Lang/ar.lang.php +++ b/Theme/Backend/Lang/ar.lang.php @@ -36,7 +36,7 @@ return ['SupplierManagement' => [ 'Contact' => 'اتصل', 'Country' => 'دولة', 'Created' => 'خلقت', - 'CreatedAt' => '#VALUE!', + 'CreatedAt' => '', 'CreditRating' => 'التصنيف الائتماني', 'Creditcard' => 'بطاقة إئتمان', 'DSO' => 'DSO.', @@ -48,7 +48,7 @@ return ['SupplierManagement' => [ 'DiscountBonus' => '', 'DiscountP' => 'خصم ٪', 'Documents' => 'وثائق', - 'Due' => '#VALUE!', + 'Due' => '', 'Email' => 'بريد الالكتروني', 'Fax' => 'فاكس', 'Files' => 'الملفات', @@ -104,11 +104,11 @@ return ['SupplierManagement' => [ 'Suppliers' => 'الموردون', 'Support' => 'يدعم', 'Tags' => 'كذا', - 'Title' => '#VALUE!', + 'Title' => '', 'TotalPrice' => '', 'Type' => 'نوع', 'UnitPrice' => '', - 'Website' => '#VALUE!', + 'Website' => '', 'Wire' => 'الأسلاك', 'YTDSales' => 'مبيعات YTD', 'Zip' => 'أزيز', diff --git a/Theme/Backend/Lang/cs.lang.php b/Theme/Backend/Lang/cs.lang.php index a92241d..fd0711f 100755 --- a/Theme/Backend/Lang/cs.lang.php +++ b/Theme/Backend/Lang/cs.lang.php @@ -36,7 +36,7 @@ return ['SupplierManagement' => [ 'Contact' => 'Kontakt', 'Country' => 'Země', 'Created' => 'Vytvořený', - 'CreatedAt' => '#VALUE!', + 'CreatedAt' => '', 'CreditRating' => 'Úvěrový rating', 'Creditcard' => 'Kreditní karta', 'DSO' => 'DSO.', @@ -48,7 +48,7 @@ return ['SupplierManagement' => [ 'DiscountBonus' => '', 'DiscountP' => 'Sleva%', 'Documents' => 'Dokumenty', - 'Due' => '#VALUE!', + 'Due' => '', 'Email' => 'E-mailem', 'Fax' => 'Fax', 'Files' => 'Soubory', @@ -104,11 +104,11 @@ return ['SupplierManagement' => [ 'Suppliers' => 'Dodavatelé', 'Support' => 'Podpěra, podpora', 'Tags' => 'Tagy', - 'Title' => '#VALUE!', + 'Title' => '', 'TotalPrice' => '', 'Type' => 'Typ', 'UnitPrice' => '', - 'Website' => '#VALUE!', + 'Website' => '', 'Wire' => 'Drát', 'YTDSales' => 'Prodej YTD.', 'Zip' => 'Zip', diff --git a/Theme/Backend/Lang/da.lang.php b/Theme/Backend/Lang/da.lang.php index ee233c7..3f99605 100755 --- a/Theme/Backend/Lang/da.lang.php +++ b/Theme/Backend/Lang/da.lang.php @@ -36,7 +36,7 @@ return ['SupplierManagement' => [ 'Contact' => 'Kontakt', 'Country' => 'Land', 'Created' => 'Oprettet', - 'CreatedAt' => '#VALUE!', + 'CreatedAt' => '', 'CreditRating' => 'Kreditvurdering', 'Creditcard' => 'Kreditkort', 'DSO' => 'DSO.', @@ -48,7 +48,7 @@ return ['SupplierManagement' => [ 'DiscountBonus' => '', 'DiscountP' => 'Rabat%', 'Documents' => 'Dokumenter', - 'Due' => '#VALUE!', + 'Due' => '', 'Email' => 'Email.', 'Fax' => 'Fax', 'Files' => 'Filer.', @@ -104,11 +104,11 @@ return ['SupplierManagement' => [ 'Suppliers' => 'Leverandører.', 'Support' => 'Support', 'Tags' => 'Tags.', - 'Title' => '#VALUE!', + 'Title' => '', 'TotalPrice' => '', 'Type' => 'Type', 'UnitPrice' => '', - 'Website' => '#VALUE!', + 'Website' => '', 'Wire' => 'Tråd', 'YTDSales' => 'YTD SALG', 'Zip' => 'Zip.', diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php index 2097a73..321e275 100755 --- a/Theme/Backend/Lang/de.lang.php +++ b/Theme/Backend/Lang/de.lang.php @@ -36,7 +36,7 @@ return ['SupplierManagement' => [ 'Contact' => 'Kontakt', 'Country' => 'Land', 'Created' => 'Erstellt', - 'CreatedAt' => '#VALUE!', + 'CreatedAt' => '', 'CreditRating' => 'Kreditbeurteilung', 'Creditcard' => 'Kreditkarte', 'DSO' => 'DSO.', @@ -48,7 +48,7 @@ return ['SupplierManagement' => [ 'DiscountBonus' => '', 'DiscountP' => 'Rabatt %', 'Documents' => 'Unterlagen', - 'Due' => '#VALUE!', + 'Due' => '', 'Email' => 'Email', 'Fax' => 'Fax', 'Files' => 'Dateien', @@ -104,11 +104,11 @@ return ['SupplierManagement' => [ 'Suppliers' => 'Lieferanten', 'Support' => 'Unterstützung', 'Tags' => 'Stichworte', - 'Title' => '#VALUE!', + 'Title' => '', 'TotalPrice' => '', 'Type' => 'Typ', 'UnitPrice' => '', - 'Website' => '#VALUE!', + 'Website' => '', 'Wire' => 'Kabel', 'YTDSales' => 'Ytd Sales.', 'Zip' => 'Reißverschluss', diff --git a/Theme/Backend/Lang/el.lang.php b/Theme/Backend/Lang/el.lang.php index fc68433..c977c9a 100755 --- a/Theme/Backend/Lang/el.lang.php +++ b/Theme/Backend/Lang/el.lang.php @@ -36,7 +36,7 @@ return ['SupplierManagement' => [ 'Contact' => 'Επικοινωνία', 'Country' => 'Χώρα', 'Created' => 'Δημιουργήθηκε', - 'CreatedAt' => '#VALUE!', + 'CreatedAt' => '', 'CreditRating' => 'Αξιολόγησης της πιστοληπτικής ικανότητας', 'Creditcard' => 'Πιστωτική κάρτα', 'DSO' => 'ΔΣΟ', @@ -48,7 +48,7 @@ return ['SupplierManagement' => [ 'DiscountBonus' => '', 'DiscountP' => 'Έκπτωση%', 'Documents' => 'Εγγραφα', - 'Due' => '#VALUE!', + 'Due' => '', 'Email' => 'ΗΛΕΚΤΡΟΝΙΚΗ ΔΙΕΥΘΥΝΣΗ', 'Fax' => 'Φαξ', 'Files' => 'Αρχεία', @@ -104,11 +104,11 @@ return ['SupplierManagement' => [ 'Suppliers' => 'Προμηθευτές', 'Support' => 'Υποστήριξη', 'Tags' => 'Ετικέτες', - 'Title' => '#VALUE!', + 'Title' => '', 'TotalPrice' => '', 'Type' => 'Τύπος', 'UnitPrice' => '', - 'Website' => '#VALUE!', + 'Website' => '', 'Wire' => 'Σύρμα', 'YTDSales' => 'Ytd πωλήσεις', 'Zip' => 'Φερμουάρ', diff --git a/Theme/Backend/Lang/es.lang.php b/Theme/Backend/Lang/es.lang.php index 32b9d27..69b5ed5 100755 --- a/Theme/Backend/Lang/es.lang.php +++ b/Theme/Backend/Lang/es.lang.php @@ -36,7 +36,7 @@ return ['SupplierManagement' => [ 'Contact' => 'Contacto', 'Country' => 'País', 'Created' => 'Creado', - 'CreatedAt' => '#VALUE!', + 'CreatedAt' => '', 'CreditRating' => 'Calificación crediticia', 'Creditcard' => 'Tarjeta de crédito', 'DSO' => 'DSO', @@ -48,7 +48,7 @@ return ['SupplierManagement' => [ 'DiscountBonus' => '', 'DiscountP' => 'Descuento%', 'Documents' => 'Documentos', - 'Due' => '#VALUE!', + 'Due' => '', 'Email' => 'Correo electrónico', 'Fax' => 'Fax', 'Files' => 'Archivos', @@ -104,11 +104,11 @@ return ['SupplierManagement' => [ 'Suppliers' => 'Proveedores', 'Support' => 'Apoyo', 'Tags' => 'Etiquetas', - 'Title' => '#VALUE!', + 'Title' => '', 'TotalPrice' => '', 'Type' => 'Escribe', 'UnitPrice' => '', - 'Website' => '#VALUE!', + 'Website' => '', 'Wire' => 'Cable', 'YTDSales' => 'Ytd ventas', 'Zip' => 'Cremallera', diff --git a/Theme/Backend/Lang/fi.lang.php b/Theme/Backend/Lang/fi.lang.php index 03e532d..4f4c053 100755 --- a/Theme/Backend/Lang/fi.lang.php +++ b/Theme/Backend/Lang/fi.lang.php @@ -36,7 +36,7 @@ return ['SupplierManagement' => [ 'Contact' => 'Ottaa yhteyttä', 'Country' => 'Maa', 'Created' => 'Luotu', - 'CreatedAt' => '#VALUE!', + 'CreatedAt' => '', 'CreditRating' => 'Luottoluokitus', 'Creditcard' => 'Luottokortti', 'DSO' => 'Dso', @@ -48,7 +48,7 @@ return ['SupplierManagement' => [ 'DiscountBonus' => '', 'DiscountP' => 'Alennus %', 'Documents' => 'Asiakirjat', - 'Due' => '#VALUE!', + 'Due' => '', 'Email' => 'Sähköposti', 'Fax' => 'Faksi', 'Files' => 'Tiedostot', @@ -104,11 +104,11 @@ return ['SupplierManagement' => [ 'Suppliers' => 'Toimittajat', 'Support' => 'Tuki', 'Tags' => 'Tunnisteet', - 'Title' => '#VALUE!', + 'Title' => '', 'TotalPrice' => '', 'Type' => 'Tyyppi', 'UnitPrice' => '', - 'Website' => '#VALUE!', + 'Website' => '', 'Wire' => 'Lanka', 'YTDSales' => 'YTD-myynti', 'Zip' => 'Postinumero', diff --git a/Theme/Backend/Lang/fr.lang.php b/Theme/Backend/Lang/fr.lang.php index eac8ab0..40c6f7a 100755 --- a/Theme/Backend/Lang/fr.lang.php +++ b/Theme/Backend/Lang/fr.lang.php @@ -36,7 +36,7 @@ return ['SupplierManagement' => [ 'Contact' => 'Contact', 'Country' => 'Pays', 'Created' => 'Établi', - 'CreatedAt' => '#VALUE!', + 'CreatedAt' => '', 'CreditRating' => 'Cote de crédit', 'Creditcard' => 'Carte de crédit', 'DSO' => 'Dso', @@ -48,7 +48,7 @@ return ['SupplierManagement' => [ 'DiscountBonus' => '', 'DiscountP' => 'Remise %', 'Documents' => 'Documents', - 'Due' => '#VALUE!', + 'Due' => '', 'Email' => 'E-mail', 'Fax' => 'Fax', 'Files' => 'Des dossiers', @@ -104,11 +104,11 @@ return ['SupplierManagement' => [ 'Suppliers' => 'Fournisseurs', 'Support' => 'Soutien', 'Tags' => 'Mots clés', - 'Title' => '#VALUE!', + 'Title' => '', 'TotalPrice' => '', 'Type' => 'Taper', 'UnitPrice' => '', - 'Website' => '#VALUE!', + 'Website' => '', 'Wire' => 'Fil', 'YTDSales' => 'Ventes YTD', 'Zip' => 'Zipper', diff --git a/Theme/Backend/Lang/hu.lang.php b/Theme/Backend/Lang/hu.lang.php index 018063e..a4650e1 100755 --- a/Theme/Backend/Lang/hu.lang.php +++ b/Theme/Backend/Lang/hu.lang.php @@ -36,7 +36,7 @@ return ['SupplierManagement' => [ 'Contact' => 'Kapcsolatba lépni', 'Country' => 'Ország', 'Created' => 'Létrehozott', - 'CreatedAt' => '#VALUE!', + 'CreatedAt' => '', 'CreditRating' => 'Hitelminősítő', 'Creditcard' => 'Hitelkártya', 'DSO' => 'DSO', @@ -48,7 +48,7 @@ return ['SupplierManagement' => [ 'DiscountBonus' => '', 'DiscountP' => 'Árengedmény%', 'Documents' => 'Dokumentumok', - 'Due' => '#VALUE!', + 'Due' => '', 'Email' => 'Email', 'Fax' => 'Fax', 'Files' => 'Fájlok', @@ -104,11 +104,11 @@ return ['SupplierManagement' => [ 'Suppliers' => 'Beszállítók', 'Support' => 'Támogatás', 'Tags' => 'Címkék', - 'Title' => '#VALUE!', + 'Title' => '', 'TotalPrice' => '', 'Type' => 'típus', 'UnitPrice' => '', - 'Website' => '#VALUE!', + 'Website' => '', 'Wire' => 'Huzal', 'YTDSales' => 'YTD értékesítés', 'Zip' => 'Postai irányítószám', diff --git a/Theme/Backend/Lang/it.lang.php b/Theme/Backend/Lang/it.lang.php index 4271166..37610d8 100755 --- a/Theme/Backend/Lang/it.lang.php +++ b/Theme/Backend/Lang/it.lang.php @@ -36,7 +36,7 @@ return ['SupplierManagement' => [ 'Contact' => 'Contatto', 'Country' => 'Nazione', 'Created' => 'Creato', - 'CreatedAt' => '#VALUE!', + 'CreatedAt' => '', 'CreditRating' => 'Rating del credito', 'Creditcard' => 'Carta di credito', 'DSO' => 'DSO.', @@ -48,7 +48,7 @@ return ['SupplierManagement' => [ 'DiscountBonus' => '', 'DiscountP' => 'Sconto%', 'Documents' => 'Documenti', - 'Due' => '#VALUE!', + 'Due' => '', 'Email' => 'E-mail', 'Fax' => 'Fax', 'Files' => 'File', @@ -104,11 +104,11 @@ return ['SupplierManagement' => [ 'Suppliers' => 'Fornitori', 'Support' => 'Supporto', 'Tags' => 'Tags.', - 'Title' => '#VALUE!', + 'Title' => '', 'TotalPrice' => '', 'Type' => 'Tipo', 'UnitPrice' => '', - 'Website' => '#VALUE!', + 'Website' => '', 'Wire' => 'Filo', 'YTDSales' => 'Vendite di ytd.', 'Zip' => 'Cerniera lampo', diff --git a/Theme/Backend/Lang/ja.lang.php b/Theme/Backend/Lang/ja.lang.php index 3eece40..79ea760 100755 --- a/Theme/Backend/Lang/ja.lang.php +++ b/Theme/Backend/Lang/ja.lang.php @@ -36,7 +36,7 @@ return ['SupplierManagement' => [ 'Contact' => 'コンタクト', 'Country' => '国', 'Created' => '作成した', - 'CreatedAt' => '#VALUE!', + 'CreatedAt' => '', 'CreditRating' => '信用格付け', 'Creditcard' => 'クレジットカード', 'DSO' => 'DSO', @@ -48,7 +48,7 @@ return ['SupplierManagement' => [ 'DiscountBonus' => '', 'DiscountP' => '割引 ％', 'Documents' => '文書', - 'Due' => '#VALUE!', + 'Due' => '', 'Email' => 'Eメール', 'Fax' => 'ファックス', 'Files' => 'ファイル', @@ -104,11 +104,11 @@ return ['SupplierManagement' => [ 'Suppliers' => 'サプライヤー', 'Support' => 'サポート', 'Tags' => 'タグ', - 'Title' => '#VALUE!', + 'Title' => '', 'TotalPrice' => '', 'Type' => 'タイプ', 'UnitPrice' => '', - 'Website' => '#VALUE!', + 'Website' => '', 'Wire' => 'ワイヤー', 'YTDSales' => 'ytd売上高', 'Zip' => 'ジップ', diff --git a/Theme/Backend/Lang/ko.lang.php b/Theme/Backend/Lang/ko.lang.php index a58f305..82df2aa 100755 --- a/Theme/Backend/Lang/ko.lang.php +++ b/Theme/Backend/Lang/ko.lang.php @@ -36,7 +36,7 @@ return ['SupplierManagement' => [ 'Contact' => '연락하다', 'Country' => '국가', 'Created' => '만들어진', - 'CreatedAt' => '#VALUE!', + 'CreatedAt' => '', 'CreditRating' => '신용 등급', 'Creditcard' => '신용 카드', 'DSO' => 'DSO.', @@ -48,7 +48,7 @@ return ['SupplierManagement' => [ 'DiscountBonus' => '', 'DiscountP' => '할인 %', 'Documents' => '서류', - 'Due' => '#VALUE!', + 'Due' => '', 'Email' => '이메일', 'Fax' => '팩스', 'Files' => '파일', @@ -104,11 +104,11 @@ return ['SupplierManagement' => [ 'Suppliers' => '공급자', 'Support' => '지원하다', 'Tags' => '태그', - 'Title' => '#VALUE!', + 'Title' => '', 'TotalPrice' => '', 'Type' => '유형', 'UnitPrice' => '', - 'Website' => '#VALUE!', + 'Website' => '', 'Wire' => '철사', 'YTDSales' => 'YTD 판매', 'Zip' => '지퍼', diff --git a/Theme/Backend/Lang/no.lang.php b/Theme/Backend/Lang/no.lang.php index 72944e9..1346a67 100755 --- a/Theme/Backend/Lang/no.lang.php +++ b/Theme/Backend/Lang/no.lang.php @@ -36,7 +36,7 @@ return ['SupplierManagement' => [ 'Contact' => 'Kontakt', 'Country' => 'Land', 'Created' => 'Opprettet', - 'CreatedAt' => '#VALUE!', + 'CreatedAt' => '', 'CreditRating' => 'Kredittvurdering', 'Creditcard' => 'Kredittkort', 'DSO' => 'DSO', @@ -48,7 +48,7 @@ return ['SupplierManagement' => [ 'DiscountBonus' => '', 'DiscountP' => 'Rabatt%', 'Documents' => 'Dokumenter', - 'Due' => '#VALUE!', + 'Due' => '', 'Email' => 'E-post', 'Fax' => 'Faks', 'Files' => 'Filer', @@ -104,11 +104,11 @@ return ['SupplierManagement' => [ 'Suppliers' => 'Leverandører', 'Support' => 'Brukerstøtte', 'Tags' => 'Tags.', - 'Title' => '#VALUE!', + 'Title' => '', 'TotalPrice' => '', 'Type' => 'Type', 'UnitPrice' => '', - 'Website' => '#VALUE!', + 'Website' => '', 'Wire' => 'Metalltråd', 'YTDSales' => 'YTD-salg', 'Zip' => 'Glidelås', diff --git a/Theme/Backend/Lang/pl.lang.php b/Theme/Backend/Lang/pl.lang.php index 9c09544..3a958bc 100755 --- a/Theme/Backend/Lang/pl.lang.php +++ b/Theme/Backend/Lang/pl.lang.php @@ -36,7 +36,7 @@ return ['SupplierManagement' => [ 'Contact' => 'Kontakt', 'Country' => 'Kraj', 'Created' => 'Utworzony', - 'CreatedAt' => '#VALUE!', + 'CreatedAt' => '', 'CreditRating' => 'Rating kredytowy', 'Creditcard' => 'Karta kredytowa', 'DSO' => 'DSO.', @@ -48,7 +48,7 @@ return ['SupplierManagement' => [ 'DiscountBonus' => '', 'DiscountP' => 'Zniżka %', 'Documents' => 'Dokumenty', - 'Due' => '#VALUE!', + 'Due' => '', 'Email' => 'E-mail', 'Fax' => 'Faks', 'Files' => 'Pliki', @@ -104,11 +104,11 @@ return ['SupplierManagement' => [ 'Suppliers' => 'Dostawcy', 'Support' => 'Wsparcie', 'Tags' => 'Tagi.', - 'Title' => '#VALUE!', + 'Title' => '', 'TotalPrice' => '', 'Type' => 'Rodzaj', 'UnitPrice' => '', - 'Website' => '#VALUE!', + 'Website' => '', 'Wire' => 'Drut', 'YTDSales' => 'Sprzedaż Ytd.', 'Zip' => 'Zamek błyskawiczny', diff --git a/Theme/Backend/Lang/pt.lang.php b/Theme/Backend/Lang/pt.lang.php index 552d366..f4b2f29 100755 --- a/Theme/Backend/Lang/pt.lang.php +++ b/Theme/Backend/Lang/pt.lang.php @@ -36,7 +36,7 @@ return ['SupplierManagement' => [ 'Contact' => 'Contato', 'Country' => 'País', 'Created' => 'Criado', - 'CreatedAt' => '#VALUE!', + 'CreatedAt' => '', 'CreditRating' => 'Rating de crédito', 'Creditcard' => 'Cartão de crédito', 'DSO' => 'Dso.', @@ -48,7 +48,7 @@ return ['SupplierManagement' => [ 'DiscountBonus' => '', 'DiscountP' => 'Desconto%', 'Documents' => 'Documentos', - 'Due' => '#VALUE!', + 'Due' => '', 'Email' => 'E-mail', 'Fax' => 'Fax', 'Files' => 'arquivos', @@ -104,11 +104,11 @@ return ['SupplierManagement' => [ 'Suppliers' => 'Fornecedores', 'Support' => 'Apoio, suporte', 'Tags' => 'Tag', - 'Title' => '#VALUE!', + 'Title' => '', 'TotalPrice' => '', 'Type' => 'Modelo', 'UnitPrice' => '', - 'Website' => '#VALUE!', + 'Website' => '', 'Wire' => 'Fio', 'YTDSales' => 'Vendas do ano', 'Zip' => 'Fecho eclair', diff --git a/Theme/Backend/Lang/ru.lang.php b/Theme/Backend/Lang/ru.lang.php index 2b92190..0c0b157 100755 --- a/Theme/Backend/Lang/ru.lang.php +++ b/Theme/Backend/Lang/ru.lang.php @@ -36,7 +36,7 @@ return ['SupplierManagement' => [ 'Contact' => 'Контакт', 'Country' => 'Страна', 'Created' => 'Созданный', - 'CreatedAt' => '#VALUE!', + 'CreatedAt' => '', 'CreditRating' => 'Кредитный рейтинг', 'Creditcard' => 'Кредитная карта', 'DSO' => 'DSO', @@ -48,7 +48,7 @@ return ['SupplierManagement' => [ 'DiscountBonus' => '', 'DiscountP' => 'Скидка %', 'Documents' => 'Документы', - 'Due' => '#VALUE!', + 'Due' => '', 'Email' => 'Электронное письмо', 'Fax' => 'Факс', 'Files' => 'Файлы', @@ -104,11 +104,11 @@ return ['SupplierManagement' => [ 'Suppliers' => 'Поставщики', 'Support' => 'Служба поддержки', 'Tags' => 'Теги', - 'Title' => '#VALUE!', + 'Title' => '', 'TotalPrice' => '', 'Type' => 'Тип', 'UnitPrice' => '', - 'Website' => '#VALUE!', + 'Website' => '', 'Wire' => 'Проволока', 'YTDSales' => 'YTD Sales.', 'Zip' => 'Zip.', diff --git a/Theme/Backend/Lang/sv.lang.php b/Theme/Backend/Lang/sv.lang.php index 4733cac..89087f8 100755 --- a/Theme/Backend/Lang/sv.lang.php +++ b/Theme/Backend/Lang/sv.lang.php @@ -36,7 +36,7 @@ return ['SupplierManagement' => [ 'Contact' => 'Kontakt', 'Country' => 'Land', 'Created' => 'Skapad', - 'CreatedAt' => '#VALUE!', + 'CreatedAt' => '', 'CreditRating' => 'Kreditvärdighet', 'Creditcard' => 'Kreditkort', 'DSO' => 'Do', @@ -48,7 +48,7 @@ return ['SupplierManagement' => [ 'DiscountBonus' => '', 'DiscountP' => 'Rabatt%', 'Documents' => 'Dokument', - 'Due' => '#VALUE!', + 'Due' => '', 'Email' => 'E-post', 'Fax' => 'Fax', 'Files' => 'Filer', @@ -104,11 +104,11 @@ return ['SupplierManagement' => [ 'Suppliers' => 'Leverantörer', 'Support' => 'Stöd', 'Tags' => 'Tagg', - 'Title' => '#VALUE!', + 'Title' => '', 'TotalPrice' => '', 'Type' => 'Typ', 'UnitPrice' => '', - 'Website' => '#VALUE!', + 'Website' => '', 'Wire' => 'Tråd', 'YTDSales' => 'YTD-försäljning', 'Zip' => 'Blixtlås', diff --git a/Theme/Backend/Lang/th.lang.php b/Theme/Backend/Lang/th.lang.php index b6a4d83..8aa1515 100755 --- a/Theme/Backend/Lang/th.lang.php +++ b/Theme/Backend/Lang/th.lang.php @@ -36,7 +36,7 @@ return ['SupplierManagement' => [ 'Contact' => 'ติดต่อ', 'Country' => 'ประเทศ', 'Created' => 'สร้าง', - 'CreatedAt' => '#VALUE!', + 'CreatedAt' => '', 'CreditRating' => 'การจัดอันดับเครดิต', 'Creditcard' => 'บัตรเครดิต', 'DSO' => 'DSO', @@ -48,7 +48,7 @@ return ['SupplierManagement' => [ 'DiscountBonus' => '', 'DiscountP' => 'การลดราคา %', 'Documents' => 'เอกสาร', - 'Due' => '#VALUE!', + 'Due' => '', 'Email' => 'อีเมล', 'Fax' => 'แฟกซ์', 'Files' => 'ไฟล์', @@ -104,11 +104,11 @@ return ['SupplierManagement' => [ 'Suppliers' => 'ซัพพลายเออร์', 'Support' => 'สนับสนุน', 'Tags' => 'แท็ก', - 'Title' => '#VALUE!', + 'Title' => '', 'TotalPrice' => '', 'Type' => 'พิมพ์', 'UnitPrice' => '', - 'Website' => '#VALUE!', + 'Website' => '', 'Wire' => 'ลวด', 'YTDSales' => 'ขาย YTD', 'Zip' => 'ซิป', diff --git a/Theme/Backend/Lang/tr.lang.php b/Theme/Backend/Lang/tr.lang.php index a377790..9542dbe 100755 --- a/Theme/Backend/Lang/tr.lang.php +++ b/Theme/Backend/Lang/tr.lang.php @@ -36,7 +36,7 @@ return ['SupplierManagement' => [ 'Contact' => 'Temas', 'Country' => 'Ülke', 'Created' => 'Yaratılmış', - 'CreatedAt' => '#VALUE!', + 'CreatedAt' => '', 'CreditRating' => 'Kredi notu', 'Creditcard' => 'Kredi kartı', 'DSO' => 'Dso', @@ -48,7 +48,7 @@ return ['SupplierManagement' => [ 'DiscountBonus' => '', 'DiscountP' => 'İndirim %', 'Documents' => 'Belgeler', - 'Due' => '#VALUE!', + 'Due' => '', 'Email' => 'E-posta', 'Fax' => 'Faks', 'Files' => 'Dosyalar', @@ -104,11 +104,11 @@ return ['SupplierManagement' => [ 'Suppliers' => 'Tedarikçiler', 'Support' => 'Destek', 'Tags' => 'Etiketler', - 'Title' => '#VALUE!', + 'Title' => '', 'TotalPrice' => '', 'Type' => 'Tip', 'UnitPrice' => '', - 'Website' => '#VALUE!', + 'Website' => '', 'Wire' => 'Tel', 'YTDSales' => 'YTD satışları', 'Zip' => 'Zip', diff --git a/Theme/Backend/Lang/uk.lang.php b/Theme/Backend/Lang/uk.lang.php index b0f988d..6efb32c 100755 --- a/Theme/Backend/Lang/uk.lang.php +++ b/Theme/Backend/Lang/uk.lang.php @@ -36,7 +36,7 @@ return ['SupplierManagement' => [ 'Contact' => 'Контакт', 'Country' => 'Країна', 'Created' => 'Створений', - 'CreatedAt' => '#VALUE!', + 'CreatedAt' => '', 'CreditRating' => 'Кредитний рейтинг', 'Creditcard' => 'Кредитна карта', 'DSO' => 'Дз', @@ -48,7 +48,7 @@ return ['SupplierManagement' => [ 'DiscountBonus' => '', 'DiscountP' => 'Знижка%', 'Documents' => 'Документи', - 'Due' => '#VALUE!', + 'Due' => '', 'Email' => 'Електронна пошта', 'Fax' => 'Факс', 'Files' => 'Файли', @@ -104,11 +104,11 @@ return ['SupplierManagement' => [ 'Suppliers' => 'Постачальники', 'Support' => 'Підтримка', 'Tags' => 'Теги', - 'Title' => '#VALUE!', + 'Title' => '', 'TotalPrice' => '', 'Type' => 'Тип', 'UnitPrice' => '', - 'Website' => '#VALUE!', + 'Website' => '', 'Wire' => 'Дріт', 'YTDSales' => 'Ytd продажі', 'Zip' => 'Блиск', diff --git a/Theme/Backend/Lang/zh.lang.php b/Theme/Backend/Lang/zh.lang.php index b2f2df4..8d4564e 100755 --- a/Theme/Backend/Lang/zh.lang.php +++ b/Theme/Backend/Lang/zh.lang.php @@ -36,7 +36,7 @@ return ['SupplierManagement' => [ 'Contact' => '接触', 'Country' => '国家', 'Created' => '创造了', - 'CreatedAt' => '#VALUE!', + 'CreatedAt' => '', 'CreditRating' => '信用评级', 'Creditcard' => '信用卡', 'DSO' => 'DSO', @@ -48,7 +48,7 @@ return ['SupplierManagement' => [ 'DiscountBonus' => '', 'DiscountP' => '折扣 ％', 'Documents' => '文件', - 'Due' => '#VALUE!', + 'Due' => '', 'Email' => '电子邮件', 'Fax' => '传真', 'Files' => '文件', @@ -104,11 +104,11 @@ return ['SupplierManagement' => [ 'Suppliers' => '供应商', 'Support' => '支持', 'Tags' => '标签', - 'Title' => '#VALUE!', + 'Title' => '', 'TotalPrice' => '', 'Type' => '类型', 'UnitPrice' => '', - 'Website' => '#VALUE!', + 'Website' => '', 'Wire' => '金属丝', 'YTDSales' => 'ytd销售', 'Zip' => '压缩', diff --git a/tests/Controller/Api/ApiControllerAttributeTrait.php b/tests/Controller/Api/ApiControllerAttributeTrait.php index 3a2a141..806769c 100755 --- a/tests/Controller/Api/ApiControllerAttributeTrait.php +++ b/tests/Controller/Api/ApiControllerAttributeTrait.php @@ -38,7 +38,7 @@ trait ApiControllerAttributeTrait $request->setData('language', ISO639x1Enum::_EN); $this->module->apiSupplierAttributeTypeCreate($request, $response); - self::assertGreaterThan(0, $response->get('')['response']->id); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); } /** @@ -56,7 +56,7 @@ trait ApiControllerAttributeTrait $request->setData('language', ISO639x1Enum::_DE); $this->module->apiSupplierAttributeTypeL11nCreate($request, $response); - self::assertGreaterThan(0, $response->get('')['response']->id); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); } /** @@ -76,7 +76,7 @@ trait ApiControllerAttributeTrait $request->setData('country', ISO3166TwoEnum::_DEU); $this->module->apiSupplierAttributeValueCreate($request, $response); - self::assertGreaterThan(0, $response->get('')['response']->id); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); } /** @@ -95,7 +95,7 @@ trait ApiControllerAttributeTrait $request->setData('country', ISO3166TwoEnum::_DEU); $this->module->apiSupplierAttributeValueCreate($request, $response); - self::assertGreaterThan(0, $response->get('')['response']->id); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); } /** @@ -114,7 +114,7 @@ trait ApiControllerAttributeTrait $request->setData('country', ISO3166TwoEnum::_DEU); $this->module->apiSupplierAttributeValueCreate($request, $response); - self::assertGreaterThan(0, $response->get('')['response']->id); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); } /** @@ -133,7 +133,7 @@ trait ApiControllerAttributeTrait $request->setData('country', ISO3166TwoEnum::_DEU); $this->module->apiSupplierAttributeValueCreate($request, $response); - self::assertGreaterThan(0, $response->get('')['response']->id); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); } /** @@ -151,7 +151,7 @@ trait ApiControllerAttributeTrait $request->setData('type', '1'); $this->module->apiSupplierAttributeCreate($request, $response); - self::assertGreaterThan(0, $response->get('')['response']->id); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); } /** diff --git a/tests/Controller/Api/ApiControllerSupplierTrait.php b/tests/Controller/Api/ApiControllerSupplierTrait.php index 743365b..524efba 100755 --- a/tests/Controller/Api/ApiControllerSupplierTrait.php +++ b/tests/Controller/Api/ApiControllerSupplierTrait.php @@ -55,7 +55,7 @@ trait ApiControllerSupplierTrait $request->setData('country', ISO3166TwoEnum::_USA); $this->module->apiSupplierCreate($request, $response); - self::assertGreaterThan(0, $response->get('')['response']->id); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); } /** @@ -101,7 +101,7 @@ trait ApiControllerSupplierTrait ]); $this->module->apiFileCreate($request, $response); - $file = $response->get('')['response']; + $file = $response->getDataArray('')['response']; self::assertGreaterThan(0, \reset($file)->id); } @@ -131,7 +131,7 @@ trait ApiControllerSupplierTrait ]); $this->module->apiFileCreate($request, $response); - $file = $response->get('')['response']; + $file = $response->getDataArray('')['response']; self::assertGreaterThan(0, \reset($file)->id); } @@ -153,7 +153,7 @@ trait ApiControllerSupplierTrait $request->setData('plain', \preg_replace('/^.+\n/', '', $MARKDOWN)); $this->module->apiNoteCreate($request, $response); - self::assertGreaterThan(0, $response->get('')['response']->id); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); } /**