diff --git a/.docker/partdb-entrypoint.sh b/.docker/partdb-entrypoint.sh
index 5bfc6b48..ffd2b24a 100644
--- a/.docker/partdb-entrypoint.sh
+++ b/.docker/partdb-entrypoint.sh
@@ -42,6 +42,48 @@ fi
# Start PHP-FPM (the PHP_VERSION is replaced by the configured version in the Dockerfile)
service phpPHP_VERSION-fpm start
+
+# Run migrations if automigration is enabled via env variable DB_AUTOMIGRATE
+if [ "$DB_AUTOMIGRATE" = "true" ]; then
+ echo "Waiting for database to be ready..."
+ ATTEMPTS_LEFT_TO_REACH_DATABASE=60
+ until [ $ATTEMPTS_LEFT_TO_REACH_DATABASE -eq 0 ] || DATABASE_ERROR=$(sudo -E -u www-data php bin/console dbal:run-sql -q "SELECT 1" 2>&1); do
+ if [ $? -eq 255 ]; then
+ # If the Doctrine command exits with 255, an unrecoverable error occurred
+ ATTEMPTS_LEFT_TO_REACH_DATABASE=0
+ break
+ fi
+ sleep 1
+ ATTEMPTS_LEFT_TO_REACH_DATABASE=$((ATTEMPTS_LEFT_TO_REACH_DATABASE - 1))
+ echo "Still waiting for database to be ready... Or maybe the database is not reachable. $ATTEMPTS_LEFT_TO_REACH_DATABASE attempts left."
+ done
+
+ if [ $ATTEMPTS_LEFT_TO_REACH_DATABASE -eq 0 ]; then
+ echo "The database is not up or not reachable:"
+ echo "$DATABASE_ERROR"
+ exit 1
+ else
+ echo "The database is now ready and reachable"
+ fi
+
+ # Check if there are any available migrations to do, by executing doctrine:migrations:up-to-date
+ # and checking if the exit code is 0 (up to date) or 1 (not up to date)
+ if sudo -E -u www-data php bin/console doctrine:migrations:up-to-date --no-interaction; then
+ echo "Database is up to date, no migrations necessary."
+ else
+ echo "Migrations available..."
+ echo "Do backup of database..."
+
+ sudo -E -u www-data mkdir -p /var/www/html/uploads/.automigration-backup/
+ # Backup the database
+ sudo -E -u www-data php bin/console partdb:backup -n --database /var/www/html/uploads/.automigration-backup/backup-$(date +%Y-%m-%d_%H-%M-%S).zip
+
+ # Check if there are any migration files
+ sudo -E -u www-data php bin/console doctrine:migrations:migrate --no-interaction
+ fi
+
+fi
+
# first arg is `-f` or `--some-option` (taken from https://github.com/docker-library/php/blob/master/8.2/bullseye/apache/docker-php-entrypoint)
if [ "${1#-}" != "$1" ]; then
set -- apache2-foreground "$@"
diff --git a/.docker/symfony.conf b/.docker/symfony.conf
index 5788a630..b5229bf6 100644
--- a/.docker/symfony.conf
+++ b/.docker/symfony.conf
@@ -44,6 +44,8 @@
PassEnv PROVIDER_MOUSER_KEY PROVIDER_MOUSER_SEARCH_OPTION PROVIDER_MOUSER_SEARCH_LIMIT PROVIDER_MOUSER_SEARCH_WITH_SIGNUP_LANGUAGE
PassEnv PROVIDER_LCSC_ENABLED PROVIDER_LCSC_CURRENCY
PassEnv PROVIDER_OEMSECRETS_KEY PROVIDER_OEMSECRETS_COUNTRY_CODE PROVIDER_OEMSECRETS_CURRENCY PROVIDER_OEMSECRETS_ZERO_PRICE PROVIDER_OEMSECRETS_SET_PARAM PROVIDER_OEMSECRETS_SORT_CRITERIA
+ PassEnv PROVIDER_REICHELT_ENABLED PROVIDER_REICHELT_CURRENCY PROVIDER_REICHELT_COUNTRY PROVIDER_REICHELT_LANGUAGE PROVIDER_REICHELT_INCLUDE_VAT
+ PassEnv PROVIDER_POLLIN_ENABLED
PassEnv EDA_KICAD_CATEGORY_DEPTH
# For most configuration files from conf-available/, which are
diff --git a/.env b/.env
index ce2a6b03..1806e9c6 100644
--- a/.env
+++ b/.env
@@ -143,7 +143,8 @@ PROVIDER_TME_CURRENCY=EUR
PROVIDER_TME_LANGUAGE=en
# The country to get results for
PROVIDER_TME_COUNTRY=DE
-# Set this to 1 to get gross prices (including VAT) instead of net prices
+# [DEPRECATED] Set this to 1 to get gross prices (including VAT) instead of net prices
+# With private API keys, this option cannot be used anymore is ignored by Part-DB. The VAT inclusion depends on your TME account settings.
PROVIDER_TME_GET_GROSS_PRICES=1
# Octopart / Nexar Provider:
@@ -215,6 +216,27 @@ PROVIDER_OEMSECRETS_SET_PARAM=1
#If unset or set to any other value, no sorting is performed.
PROVIDER_OEMSECRETS_SORT_CRITERIA=C
+
+# Reichelt provider:
+# Reichelt.com offers no official API, so this info provider webscrapes the website to extract info
+# It could break at any time, use it at your own risk
+# We dont require an API key for Reichelt, just set this to 1 to enable Reichelt support
+PROVIDER_REICHELT_ENABLED=0
+# The country to get prices for
+PROVIDER_REICHELT_COUNTRY=DE
+# The language to get results in (en, de, fr, nl, pl, it, es)
+PROVIDER_REICHELT_LANGUAGE=en
+# Include VAT in prices (set to 1 to include VAT, 0 to exclude VAT)
+PROVIDER_REICHELT_INCLUDE_VAT=1
+# The currency to get prices in (only for countries with countries other than EUR)
+PROVIDER_REICHELT_CURRENCY=EUR
+
+# Pollin provider:
+# Pollin.de offers no official API, so this info provider webscrapes the website to extract info
+# It could break at any time, use it at your own risk
+# We dont require an API key for Pollin, just set this to 1 to enable Pollin support
+PROVIDER_POLLIN_ENABLED=0
+
##################################################################################
# EDA integration related settings
##################################################################################
diff --git a/assets/tomselect/extend_existing_selection/extend_existing_selection.js b/.env.dev
similarity index 100%
rename from assets/tomselect/extend_existing_selection/extend_existing_selection.js
rename to .env.dev
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 62bdc123..8e6ea54c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -18,7 +18,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- php-versions: [ '8.1', '8.2', '8.3' ]
+ php-versions: [ '8.1', '8.2', '8.3', '8.4' ]
db-type: [ 'mysql', 'sqlite', 'postgres' ]
env:
@@ -126,7 +126,7 @@ jobs:
run: ./bin/phpunit --coverage-clover=coverage.xml
- name: Upload coverage
- uses: codecov/codecov-action@v4
+ uses: codecov/codecov-action@v5
with:
env_vars: PHP_VERSION,DB_TYPE
token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/Dockerfile b/Dockerfile
index 15049166..0f909f16 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
ARG BASE_IMAGE=debian:bookworm-slim
-ARG PHP_VERSION=8.2
+ARG PHP_VERSION=8.3
FROM ${BASE_IMAGE} AS base
ARG PHP_VERSION
@@ -125,6 +125,7 @@ upload_max_filesize=256M
post_max_size=300M
opcache.preload_user=www-data
opcache.preload=/var/www/html/config/preload.php
+log_limit=8096
EOF
COPY ./.docker/symfony.conf /etc/apache2/sites-available/symfony.conf
diff --git a/VERSION b/VERSION
index 4ea8ad87..511a76e6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.14.3
+1.17.1
diff --git a/assets/ckeditor/plugins/PartDBLabel/PartDBLabelUI.js b/assets/ckeditor/plugins/PartDBLabel/PartDBLabelUI.js
index aa29e889..37e1dcbe 100644
--- a/assets/ckeditor/plugins/PartDBLabel/PartDBLabelUI.js
+++ b/assets/ckeditor/plugins/PartDBLabel/PartDBLabelUI.js
@@ -128,6 +128,8 @@ const PLACEHOLDERS = [
['[[BARCODE_QR]]', 'QR code linking to this element'],
['[[BARCODE_C128]]', 'Code 128 barcode linking to this element'],
['[[BARCODE_C39]]', 'Code 39 barcode linking to this element'],
+ ['[[BARCODE_C93]]', 'Code 93 barcode linking to this element'],
+ ['[[BARCODE_DATAMATRIX]]', 'Datamatrix code linking to this element'],
]
},
{
diff --git a/assets/ckeditor/plugins/PartDBLabel/lang/de.js b/assets/ckeditor/plugins/PartDBLabel/lang/de.js
index 2220cc0b..748b1607 100644
--- a/assets/ckeditor/plugins/PartDBLabel/lang/de.js
+++ b/assets/ckeditor/plugins/PartDBLabel/lang/de.js
@@ -69,6 +69,8 @@ Object.assign( window.CKEDITOR_TRANSLATIONS[ 'de' ].dictionary, {
'QR code linking to this element': 'QR Code verknüpft mit diesem Element',
'Code 128 barcode linking to this element': 'Code 128 Barcode verknüpft mit diesem Element',
'Code 39 barcode linking to this element': 'Code 39 Barcode verknüpft mit diesem Element',
+ 'Code 93 barcode linking to this element': 'Code 93 Barcode verknüpft mit diesem Element',
+ 'Datamatrix code linking to this element': 'Datamatrix Code verknüpft mit diesem Element',
'Location ID': 'Lagerort ID',
'Name': 'Name',
diff --git a/assets/controllers/elements/attachment_autocomplete_controller.js b/assets/controllers/elements/attachment_autocomplete_controller.js
index fe44baee..f8bc301e 100644
--- a/assets/controllers/elements/attachment_autocomplete_controller.js
+++ b/assets/controllers/elements/attachment_autocomplete_controller.js
@@ -23,6 +23,12 @@ import "tom-select/dist/css/tom-select.bootstrap5.css";
import '../../css/components/tom-select_extensions.css';
import TomSelect from "tom-select";
+import TomSelect_click_to_edit from '../../tomselect/click_to_edit/click_to_edit'
+import TomSelect_autoselect_typed from '../../tomselect/autoselect_typed/autoselect_typed'
+
+TomSelect.define('click_to_edit', TomSelect_click_to_edit)
+TomSelect.define('autoselect_typed', TomSelect_autoselect_typed)
+
export default class extends Controller {
_tomSelect;
@@ -46,6 +52,12 @@ export default class extends Controller {
}
return '
' . $dom->filter('div.product-detail-description-text')->html('');
+ }
+
+ private function parsePrices(Crawler $dom): array
+ {
+ //TODO: Properly handle multiple prices, for now we just look at the price for one piece
+
+ //We assume the currency is always the same
+ $currency = $dom->filter('meta[property="product:price:currency"]')->attr('content');
+
+ //If there is meta[property=highPrice] then use this as the price
+ if ($dom->filter('meta[itemprop="highPrice"]')->count() > 0) {
+ $price = $dom->filter('meta[itemprop="highPrice"]')->attr('content');
+ } else {
+ $price = $dom->filter('meta[property="product:price:amount"]')->attr('content');
+ }
+
+ return [
+ new PriceDTO(1.0, $price, $currency)
+ ];
+ }
+
+ public function getCapabilities(): array
+ {
+ return [
+ ProviderCapabilities::BASIC,
+ ProviderCapabilities::PICTURE,
+ ProviderCapabilities::PRICE,
+ ProviderCapabilities::DATASHEET
+ ];
+ }
+}
\ No newline at end of file
diff --git a/src/Services/InfoProviderSystem/Providers/ReicheltProvider.php b/src/Services/InfoProviderSystem/Providers/ReicheltProvider.php
new file mode 100644
index 00000000..0c31c411
--- /dev/null
+++ b/src/Services/InfoProviderSystem/Providers/ReicheltProvider.php
@@ -0,0 +1,285 @@
+.
+ */
+
+declare(strict_types=1);
+
+
+namespace App\Services\InfoProviderSystem\Providers;
+
+use App\Services\InfoProviderSystem\DTOs\FileDTO;
+use App\Services\InfoProviderSystem\DTOs\ParameterDTO;
+use App\Services\InfoProviderSystem\DTOs\PartDetailDTO;
+use App\Services\InfoProviderSystem\DTOs\PriceDTO;
+use App\Services\InfoProviderSystem\DTOs\PurchaseInfoDTO;
+use App\Services\InfoProviderSystem\DTOs\SearchResultDTO;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
+use Symfony\Component\DomCrawler\Crawler;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+
+class ReicheltProvider implements InfoProviderInterface
+{
+
+ public const DISTRIBUTOR_NAME = "Reichelt";
+
+ public function __construct(private readonly HttpClientInterface $client,
+ #[Autowire(env: "bool:PROVIDER_REICHELT_ENABLED")]
+ private readonly bool $enabled = true,
+ #[Autowire(env: "PROVIDER_REICHELT_LANGUAGE")]
+ private readonly string $language = "en",
+ #[Autowire(env: "PROVIDER_REICHELT_COUNTRY")]
+ private readonly string $country = "DE",
+ #[Autowire(env: "PROVIDER_REICHELT_INCLUDE_VAT")]
+ private readonly bool $includeVAT = false,
+ #[Autowire(env: "PROVIDER_REICHELT_CURRENCY")]
+ private readonly string $currency = "EUR",
+ )
+ {
+ }
+
+ public function getProviderInfo(): array
+ {
+ return [
+ 'name' => 'Reichelt',
+ 'description' => 'Webscraping from reichelt.com to get part information',
+ 'url' => 'https://www.reichelt.com/',
+ 'disabled_help' => 'Set PROVIDER_REICHELT_ENABLED env to 1'
+ ];
+ }
+
+ public function getProviderKey(): string
+ {
+ return 'reichelt';
+ }
+
+ public function isActive(): bool
+ {
+ return $this->enabled;
+ }
+
+ public function searchByKeyword(string $keyword): array
+ {
+ $response = $this->client->request('GET', sprintf($this->getBaseURL() . '/shop/search/%s', $keyword));
+ $html = $response->getContent();
+
+ //Parse the HTML and return the results
+ $dom = new Crawler($html);
+ //Iterate over all div.al_gallery_article elements
+ $results = [];
+ $dom->filter('div.al_gallery_article')->each(function (Crawler $element) use (&$results) {
+
+ //Extract product id from data-product attribute
+ $artId = json_decode($element->attr('data-product'), true, 2, JSON_THROW_ON_ERROR)['artid'];
+
+ $productID = $element->filter('meta[itemprop="productID"]')->attr('content');
+ $name = $element->filter('meta[itemprop="name"]')->attr('content');
+ $sku = $element->filter('meta[itemprop="sku"]')->attr('content');
+
+ //Try to extract a picture URL:
+ $pictureURL = $element->filter("div.al_artlogo img")->attr('src');
+
+ $results[] = new SearchResultDTO(
+ provider_key: $this->getProviderKey(),
+ provider_id: $artId,
+ name: $productID,
+ description: $name,
+ category: null,
+ manufacturer: $sku,
+ preview_image_url: $pictureURL,
+ provider_url: $element->filter('a.al_artinfo_link')->attr('href')
+ );
+ });
+
+ return $results;
+ }
+
+ public function getDetails(string $id): PartDetailDTO
+ {
+ //Check that the ID is a number
+ if (!is_numeric($id)) {
+ throw new \InvalidArgumentException("Invalid ID");
+ }
+
+ //Use this endpoint to resolve the artID to a product page
+ $response = $this->client->request('GET',
+ sprintf(
+ 'https://www.reichelt.com/?ACTION=514&id=74&article=%s&LANGUAGE=%s&CCOUNTRY=%s',
+ $id,
+ strtoupper($this->language),
+ strtoupper($this->country)
+ )
+ );
+ $json = $response->toArray();
+
+ //Retrieve the product page from the response
+ $productPage = $this->getBaseURL() . '/shop/product' . $json[0]['article_path'];
+
+
+ $response = $this->client->request('GET', $productPage, [
+ 'query' => [
+ 'CCTYPE' => $this->includeVAT ? 'private' : 'business',
+ 'currency' => $this->currency,
+ ],
+ ]);
+ $html = $response->getContent();
+ $dom = new Crawler($html);
+
+ //Extract the product notes
+ $notes = $dom->filter('p[itemprop="description"]')->html();
+
+ //Extract datasheets
+ $datasheets = [];
+ $dom->filter('div.articleDatasheet a')->each(function (Crawler $element) use (&$datasheets) {
+ $datasheets[] = new FileDTO($element->attr('href'), $element->filter('span')->text());
+ });
+
+ //Determine price for one unit
+ $priceString = $dom->filter('meta[itemprop="price"]')->attr('content');
+ $currency = $dom->filter('meta[itemprop="priceCurrency"]')->attr('content', 'EUR');
+
+ //Create purchase info
+ $purchaseInfo = new PurchaseInfoDTO(
+ distributor_name: self::DISTRIBUTOR_NAME,
+ order_number: $json[0]['article_artnr'],
+ prices: array_merge(
+ [new PriceDTO(1.0, $priceString, $currency, $this->includeVAT)]
+ , $this->parseBatchPrices($dom, $currency)),
+ product_url: $productPage
+ );
+
+ //Create part object
+ return new PartDetailDTO(
+ provider_key: $this->getProviderKey(),
+ provider_id: $id,
+ name: $json[0]['article_artnr'],
+ description: $json[0]['article_besch'],
+ category: $this->parseCategory($dom),
+ manufacturer: $json[0]['manufacturer_name'],
+ mpn: $this->parseMPN($dom),
+ preview_image_url: $json[0]['article_picture'],
+ provider_url: $productPage,
+ notes: $notes,
+ datasheets: $datasheets,
+ parameters: $this->parseParameters($dom),
+ vendor_infos: [$purchaseInfo]
+ );
+
+ }
+
+ private function parseMPN(Crawler $dom): string
+ {
+ //Find the small element directly after meta[itemprop="url"] element
+ $element = $dom->filter('meta[itemprop="url"] + small');
+ //If the text contains GTIN text, take the small element afterwards
+ if (str_contains($element->text(), 'GTIN')) {
+ $element = $dom->filter('meta[itemprop="url"] + small + small');
+ }
+
+ //The MPN is contained in the span inside the element
+ return $element->filter('span')->text();
+ }
+
+ private function parseBatchPrices(Crawler $dom, string $currency): array
+ {
+ //Iterate over each a.inline-block element in div.discountValue
+ $prices = [];
+ $dom->filter('div.discountValue a.inline-block')->each(function (Crawler $element) use (&$prices, $currency) {
+ //The minimum amount is the number in the span.block element
+ $minAmountText = $element->filter('span.block')->text();
+
+ //Extract a integer from the text
+ $matches = [];
+ if (!preg_match('/\d+/', $minAmountText, $matches)) {
+ return;
+ }
+
+ $minAmount = (int) $matches[0];
+
+ //The price is the text of the p.productPrice element
+ $priceString = $element->filter('p.productPrice')->text();
+ //Replace comma with dot
+ $priceString = str_replace(',', '.', $priceString);
+ //Strip any non-numeric characters
+ $priceString = preg_replace('/[^0-9.]/', '', $priceString);
+
+ $prices[] = new PriceDTO($minAmount, $priceString, $currency, $this->includeVAT);
+ });
+
+ return $prices;
+ }
+
+
+ private function parseCategory(Crawler $dom): string
+ {
+ // Look for ol.breadcrumb and iterate over the li elements
+ $category = '';
+ $dom->filter('ol.breadcrumb li.triangle-left')->each(function (Crawler $element) use (&$category) {
+ //Do not include the .breadcrumb-showmore element
+ if ($element->attr('id') === 'breadcrumb-showmore') {
+ return;
+ }
+
+ $category .= $element->text() . ' -> ';
+ });
+ //Remove the trailing ' -> '
+ $category = substr($category, 0, -4);
+
+ return $category;
+ }
+
+ /**
+ * @param Crawler $dom
+ * @return ParameterDTO[]
+ */
+ private function parseParameters(Crawler $dom): array
+ {
+ $parameters = [];
+ //Iterate over each ul.articleTechnicalData which contains the specifications of each group
+ $dom->filter('ul.articleTechnicalData')->each(function (Crawler $groupElement) use (&$parameters) {
+ $groupName = $groupElement->filter('li.articleTechnicalHeadline')->text();
+
+ //Iterate over each second li in ul.articleAttribute, which contains the specifications
+ $groupElement->filter('ul.articleAttribute li:nth-child(2n)')->each(function (Crawler $specElement) use (&$parameters, $groupName) {
+ $parameters[] = ParameterDTO::parseValueIncludingUnit(
+ name: $specElement->previousAll()->text(),
+ value: $specElement->text(),
+ group: $groupName
+ );
+ });
+ });
+
+ return $parameters;
+ }
+
+ private function getBaseURL(): string
+ {
+ //Without the trailing slash
+ return 'https://www.reichelt.com/' . strtolower($this->country) . '/' . strtolower($this->language);
+ }
+
+ public function getCapabilities(): array
+ {
+ return [
+ ProviderCapabilities::BASIC,
+ ProviderCapabilities::PICTURE,
+ ProviderCapabilities::DATASHEET,
+ ProviderCapabilities::PRICE,
+ ];
+ }
+}
\ No newline at end of file
diff --git a/src/Services/InfoProviderSystem/Providers/TMEClient.php b/src/Services/InfoProviderSystem/Providers/TMEClient.php
index 0e32e9a6..d4df133e 100644
--- a/src/Services/InfoProviderSystem/Providers/TMEClient.php
+++ b/src/Services/InfoProviderSystem/Providers/TMEClient.php
@@ -50,6 +50,16 @@ class TMEClient
return $this->token !== '' && $this->secret !== '';
}
+ /**
+ * Returns true if the client is using a private (account related token) instead of a deprecated anonymous token
+ * to authenticate with TME.
+ * @return bool
+ */
+ public function isUsingPrivateToken(): bool
+ {
+ //Private tokens are longer than anonymous ones (50 instead of 45 characters)
+ return strlen($this->token) > 45;
+ }
/**
* Generates the signature for the given action and parameters.
diff --git a/src/Services/InfoProviderSystem/Providers/TMEProvider.php b/src/Services/InfoProviderSystem/Providers/TMEProvider.php
index 61944b7d..32fc0c72 100644
--- a/src/Services/InfoProviderSystem/Providers/TMEProvider.php
+++ b/src/Services/InfoProviderSystem/Providers/TMEProvider.php
@@ -36,12 +36,19 @@ class TMEProvider implements InfoProviderInterface
private const VENDOR_NAME = 'TME';
+ /** @var bool If true, the prices are gross prices. If false, the prices are net prices. */
+ private readonly bool $get_gross_prices;
+
public function __construct(private readonly TMEClient $tmeClient, private readonly string $country,
private readonly string $language, private readonly string $currency,
- /** @var bool If true, the prices are gross prices. If false, the prices are net prices. */
- private readonly bool $get_gross_prices)
+ bool $get_gross_prices)
{
-
+ //If we have a private token, set get_gross_prices to false, as it is automatically determined by the account type then
+ if ($this->tmeClient->isUsingPrivateToken()) {
+ $this->get_gross_prices = false;
+ } else {
+ $this->get_gross_prices = $get_gross_prices;
+ }
}
public function getProviderInfo(): array
diff --git a/src/Services/LabelSystem/BarcodeScanner/BarcodeRedirector.php b/src/Services/LabelSystem/BarcodeScanner/BarcodeRedirector.php
new file mode 100644
index 00000000..2de7c035
--- /dev/null
+++ b/src/Services/LabelSystem/BarcodeScanner/BarcodeRedirector.php
@@ -0,0 +1,166 @@
+.
+ */
+
+declare(strict_types=1);
+
+/**
+ * This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
+ *
+ * Copyright (C) 2019 - 2022 Jan Böhmer (https://github.com/jbtronics)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+namespace App\Services\LabelSystem\BarcodeScanner;
+
+use App\Entity\LabelSystem\LabelSupportedElement;
+use App\Entity\Parts\Manufacturer;
+use App\Entity\Parts\Part;
+use App\Entity\Parts\PartLot;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityNotFoundException;
+use InvalidArgumentException;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+
+/**
+ * @see \App\Tests\Services\LabelSystem\Barcodes\BarcodeRedirectorTest
+ */
+final class BarcodeRedirector
+{
+ public function __construct(private readonly UrlGeneratorInterface $urlGenerator, private readonly EntityManagerInterface $em)
+ {
+ }
+
+ /**
+ * Determines the URL to which the user should be redirected, when scanning a QR code.
+ *
+ * @param BarcodeScanResultInterface $barcodeScan The result of the barcode scan
+ * @return string the URL to which should be redirected
+ *
+ * @throws EntityNotFoundException
+ */
+ public function getRedirectURL(BarcodeScanResultInterface $barcodeScan): string
+ {
+ if($barcodeScan instanceof LocalBarcodeScanResult) {
+ return $this->getURLLocalBarcode($barcodeScan);
+ }
+
+ if ($barcodeScan instanceof EIGP114BarcodeScanResult) {
+ return $this->getURLVendorBarcode($barcodeScan);
+ }
+
+ throw new InvalidArgumentException('Unknown $barcodeScan type: '.get_class($barcodeScan));
+ }
+
+ private function getURLLocalBarcode(LocalBarcodeScanResult $barcodeScan): string
+ {
+ switch ($barcodeScan->target_type) {
+ case LabelSupportedElement::PART:
+ return $this->urlGenerator->generate('app_part_show', ['id' => $barcodeScan->target_id]);
+ case LabelSupportedElement::PART_LOT:
+ //Try to determine the part to the given lot
+ $lot = $this->em->find(PartLot::class, $barcodeScan->target_id);
+ if (!$lot instanceof PartLot) {
+ throw new EntityNotFoundException();
+ }
+
+ return $this->urlGenerator->generate('app_part_show', ['id' => $lot->getPart()->getID()]);
+
+ case LabelSupportedElement::STORELOCATION:
+ return $this->urlGenerator->generate('part_list_store_location', ['id' => $barcodeScan->target_id]);
+
+ default:
+ throw new InvalidArgumentException('Unknown $type: '.$barcodeScan->target_type->name);
+ }
+ }
+
+ /**
+ * Gets the URL to a part from a scan of a Vendor Barcode
+ */
+ private function getURLVendorBarcode(EIGP114BarcodeScanResult $barcodeScan): string
+ {
+ $part = $this->getPartFromVendor($barcodeScan);
+ return $this->urlGenerator->generate('app_part_show', ['id' => $part->getID()]);
+ }
+
+ /**
+ * Gets a part from a scan of a Vendor Barcode by filtering for parts
+ * with the same Info Provider Id or, if that fails, by looking for parts with a
+ * matching manufacturer product number. Only returns the first matching part.
+ */
+ private function getPartFromVendor(EIGP114BarcodeScanResult $barcodeScan) : Part
+ {
+ // first check via the info provider ID (e.g. Vendor ID). This might fail if the part was not added via
+ // the info provider system or if the part was bought from a different vendor than the data was retrieved
+ // from.
+ if($barcodeScan->digikeyPartNumber) {
+ $qb = $this->em->getRepository(Part::class)->createQueryBuilder('part');
+ //Lower() to be case insensitive
+ $qb->where($qb->expr()->like('LOWER(part.providerReference.provider_id)', 'LOWER(:vendor_id)'));
+ $qb->setParameter('vendor_id', $barcodeScan->digikeyPartNumber);
+ $results = $qb->getQuery()->getResult();
+ if ($results) {
+ return $results[0];
+ }
+ }
+
+ if(!$barcodeScan->supplierPartNumber){
+ throw new EntityNotFoundException();
+ }
+
+ //Fallback to the manufacturer part number. This may return false positives, since it is common for
+ //multiple manufacturers to use the same part number for their version of a common product
+ //We assume the user is able to realize when this returns the wrong part
+ //If the barcode specifies the manufacturer we try to use that as well
+ $mpnQb = $this->em->getRepository(Part::class)->createQueryBuilder('part');
+ $mpnQb->where($mpnQb->expr()->like('LOWER(part.manufacturer_product_number)', 'LOWER(:mpn)'));
+ $mpnQb->setParameter('mpn', $barcodeScan->supplierPartNumber);
+
+ if($barcodeScan->mouserManufacturer){
+ $manufacturerQb = $this->em->getRepository(Manufacturer::class)->createQueryBuilder("manufacturer");
+ $manufacturerQb->where($manufacturerQb->expr()->like("LOWER(manufacturer.name)", "LOWER(:manufacturer_name)"));
+ $manufacturerQb->setParameter("manufacturer_name", $barcodeScan->mouserManufacturer);
+ $manufacturers = $manufacturerQb->getQuery()->getResult();
+
+ if($manufacturers) {
+ $mpnQb->andWhere($mpnQb->expr()->eq("part.manufacturer", ":manufacturer"));
+ $mpnQb->setParameter("manufacturer", $manufacturers);
+ }
+
+ }
+
+ $results = $mpnQb->getQuery()->getResult();
+ if($results){
+ return $results[0];
+ }
+ throw new EntityNotFoundException();
+ }
+}
diff --git a/src/Services/LabelSystem/Barcodes/BarcodeScanHelper.php b/src/Services/LabelSystem/BarcodeScanner/BarcodeScanHelper.php
similarity index 81%
rename from src/Services/LabelSystem/Barcodes/BarcodeScanHelper.php
rename to src/Services/LabelSystem/BarcodeScanner/BarcodeScanHelper.php
index c9750ea3..e5930b36 100644
--- a/src/Services/LabelSystem/Barcodes/BarcodeScanHelper.php
+++ b/src/Services/LabelSystem/BarcodeScanner/BarcodeScanHelper.php
@@ -39,7 +39,7 @@ declare(strict_types=1);
* along with this program. If not, see .
*/
-namespace App\Services\LabelSystem\Barcodes;
+namespace App\Services\LabelSystem\BarcodeScanner;
use App\Entity\LabelSystem\LabelSupportedElement;
use App\Entity\Parts\Part;
@@ -75,20 +75,23 @@ final class BarcodeScanHelper
* will try to guess the type.
* @param string $input
* @param BarcodeSourceType|null $type
- * @return BarcodeScanResult
+ * @return BarcodeScanResultInterface
*/
- public function scanBarcodeContent(string $input, ?BarcodeSourceType $type = null): BarcodeScanResult
+ public function scanBarcodeContent(string $input, ?BarcodeSourceType $type = null): BarcodeScanResultInterface
{
//Do specific parsing
if ($type === BarcodeSourceType::INTERNAL) {
return $this->parseInternalBarcode($input) ?? throw new InvalidArgumentException('Could not parse barcode');
}
- if ($type === BarcodeSourceType::VENDOR) {
- return $this->parseVendorBarcode($input) ?? throw new InvalidArgumentException('Could not parse barcode');
+ if ($type === BarcodeSourceType::USER_DEFINED) {
+ return $this->parseUserDefinedBarcode($input) ?? throw new InvalidArgumentException('Could not parse barcode');
}
if ($type === BarcodeSourceType::IPN) {
return $this->parseIPNBarcode($input) ?? throw new InvalidArgumentException('Could not parse barcode');
}
+ if ($type === BarcodeSourceType::EIGP114) {
+ return $this->parseEIGP114Barcode($input);
+ }
//Null means auto and we try the different formats
$result = $this->parseInternalBarcode($input);
@@ -97,12 +100,17 @@ final class BarcodeScanHelper
return $result;
}
- //Try to parse as vendor barcode
- $result = $this->parseVendorBarcode($input);
+ //Try to parse as User defined barcode
+ $result = $this->parseUserDefinedBarcode($input);
if ($result !== null) {
return $result;
}
+ //If the barcode is formatted as EIGP114, we can parse it directly
+ if (EIGP114BarcodeScanResult::isFormat06Code($input)) {
+ return $this->parseEIGP114Barcode($input);
+ }
+
//Try to parse as IPN barcode
$result = $this->parseIPNBarcode($input);
if ($result !== null) {
@@ -112,11 +120,16 @@ final class BarcodeScanHelper
throw new InvalidArgumentException('Unknown barcode');
}
- private function parseVendorBarcode(string $input): ?BarcodeScanResult
+ private function parseEIGP114Barcode(string $input): EIGP114BarcodeScanResult
+ {
+ return EIGP114BarcodeScanResult::parseFormat06Code($input);
+ }
+
+ private function parseUserDefinedBarcode(string $input): ?LocalBarcodeScanResult
{
$lot_repo = $this->entityManager->getRepository(PartLot::class);
//Find only the first result
- $results = $lot_repo->findBy(['vendor_barcode' => $input], limit: 1);
+ $results = $lot_repo->findBy(['user_barcode' => $input], limit: 1);
if (count($results) === 0) {
return null;
@@ -124,14 +137,14 @@ final class BarcodeScanHelper
//We found a part, so use it to create the result
$lot = $results[0];
- return new BarcodeScanResult(
+ return new LocalBarcodeScanResult(
target_type: LabelSupportedElement::PART_LOT,
target_id: $lot->getID(),
- source_type: BarcodeSourceType::VENDOR
+ source_type: BarcodeSourceType::USER_DEFINED
);
}
- private function parseIPNBarcode(string $input): ?BarcodeScanResult
+ private function parseIPNBarcode(string $input): ?LocalBarcodeScanResult
{
$part_repo = $this->entityManager->getRepository(Part::class);
//Find only the first result
@@ -143,7 +156,7 @@ final class BarcodeScanHelper
//We found a part, so use it to create the result
$part = $results[0];
- return new BarcodeScanResult(
+ return new LocalBarcodeScanResult(
target_type: LabelSupportedElement::PART,
target_id: $part->getID(),
source_type: BarcodeSourceType::IPN
@@ -155,9 +168,9 @@ final class BarcodeScanHelper
* If the barcode could not be parsed at all, null is returned. If the barcode is a valid format, but could
* not be found in the database, an exception is thrown.
* @param string $input
- * @return BarcodeScanResult|null
+ * @return LocalBarcodeScanResult|null
*/
- private function parseInternalBarcode(string $input): ?BarcodeScanResult
+ private function parseInternalBarcode(string $input): ?LocalBarcodeScanResult
{
$input = trim($input);
$matches = [];
@@ -167,7 +180,7 @@ final class BarcodeScanHelper
//Extract parts from QR code's URL
if (preg_match('#^https?://.*/scan/(\w+)/(\d+)/?$#', $input, $matches)) {
- return new BarcodeScanResult(
+ return new LocalBarcodeScanResult(
target_type: self::QR_TYPE_MAP[strtolower($matches[1])],
target_id: (int) $matches[2],
source_type: BarcodeSourceType::INTERNAL
@@ -183,7 +196,7 @@ final class BarcodeScanHelper
throw new InvalidArgumentException('Unknown prefix '.$prefix);
}
- return new BarcodeScanResult(
+ return new LocalBarcodeScanResult(
target_type: self::PREFIX_TYPE_MAP[$prefix],
target_id: $id,
source_type: BarcodeSourceType::INTERNAL
@@ -199,7 +212,7 @@ final class BarcodeScanHelper
throw new InvalidArgumentException('Unknown prefix '.$prefix);
}
- return new BarcodeScanResult(
+ return new LocalBarcodeScanResult(
target_type: self::PREFIX_TYPE_MAP[$prefix],
target_id: $id,
source_type: BarcodeSourceType::INTERNAL
@@ -208,7 +221,7 @@ final class BarcodeScanHelper
//Legacy Part-DB location labels used $L00336 format
if (preg_match('#^\$L(\d{5,})$#', $input, $matches)) {
- return new BarcodeScanResult(
+ return new LocalBarcodeScanResult(
target_type: LabelSupportedElement::STORELOCATION,
target_id: (int) $matches[1],
source_type: BarcodeSourceType::INTERNAL
@@ -217,7 +230,7 @@ final class BarcodeScanHelper
//Legacy Part-DB used EAN8 barcodes for part labels. Format 0000001(2) (note the optional 8th digit => checksum)
if (preg_match('#^(\d{7})\d?$#', $input, $matches)) {
- return new BarcodeScanResult(
+ return new LocalBarcodeScanResult(
target_type: LabelSupportedElement::PART,
target_id: (int) $matches[1],
source_type: BarcodeSourceType::INTERNAL
diff --git a/src/Services/LabelSystem/BarcodeScanner/BarcodeScanResultInterface.php b/src/Services/LabelSystem/BarcodeScanner/BarcodeScanResultInterface.php
new file mode 100644
index 00000000..88130351
--- /dev/null
+++ b/src/Services/LabelSystem/BarcodeScanner/BarcodeScanResultInterface.php
@@ -0,0 +1,36 @@
+.
+ */
+
+declare(strict_types=1);
+
+
+namespace App\Services\LabelSystem\BarcodeScanner;
+
+interface BarcodeScanResultInterface
+{
+ /**
+ * Returns all data that was decoded from the barcode in a format, that can be shown in a table to the user.
+ * The return values of this function are not meant to be parsed by code again, but should just give a information
+ * to the user.
+ * The keys of the returned array are the first column of the table and the values are the second column.
+ * @return array
+ */
+ public function getDecodedForInfoMode(): array;
+}
\ No newline at end of file
diff --git a/src/Services/LabelSystem/Barcodes/BarcodeSourceType.php b/src/Services/LabelSystem/BarcodeScanner/BarcodeSourceType.php
similarity index 83%
rename from src/Services/LabelSystem/Barcodes/BarcodeSourceType.php
rename to src/Services/LabelSystem/BarcodeScanner/BarcodeSourceType.php
index 20ba316a..40f707de 100644
--- a/src/Services/LabelSystem/Barcodes/BarcodeSourceType.php
+++ b/src/Services/LabelSystem/BarcodeScanner/BarcodeSourceType.php
@@ -21,7 +21,7 @@
declare(strict_types=1);
-namespace App\Services\LabelSystem\Barcodes;
+namespace App\Services\LabelSystem\BarcodeScanner;
/**
* This enum represents the different types, where a barcode/QR-code can be generated from
@@ -32,9 +32,14 @@ enum BarcodeSourceType
case INTERNAL;
/** This barcode is containing an internal part number (IPN) */
case IPN;
+
/**
- * This barcode is a custom barcode from a third party like a vendor, which was set via the vendor_barcode
- * field of a part lot.
+ * This barcode is a user defined barcode defined on a part lot
*/
- case VENDOR;
+ case USER_DEFINED;
+
+ /**
+ * EIGP114 formatted barcodes like used by digikey, mouser, etc.
+ */
+ case EIGP114;
}
\ No newline at end of file
diff --git a/src/Services/LabelSystem/BarcodeScanner/EIGP114BarcodeScanResult.php b/src/Services/LabelSystem/BarcodeScanner/EIGP114BarcodeScanResult.php
new file mode 100644
index 00000000..0b4f4b56
--- /dev/null
+++ b/src/Services/LabelSystem/BarcodeScanner/EIGP114BarcodeScanResult.php
@@ -0,0 +1,332 @@
+.
+ */
+
+declare(strict_types=1);
+
+
+namespace App\Services\LabelSystem\BarcodeScanner;
+
+/**
+ * This class represents the content of a EIGP114 barcode.
+ * Based on PR 811, EIGP 114.2018 (https://www.ecianow.org/assets/docs/GIPC/EIGP-114.2018%20ECIA%20Labeling%20Specification%20for%20Product%20and%20Shipment%20Identification%20in%20the%20Electronics%20Industry%20-%202D%20Barcode.pdf),
+ * , https://forum.digikey.com/t/digikey-product-labels-decoding-digikey-barcodes/41097
+ */
+class EIGP114BarcodeScanResult implements BarcodeScanResultInterface
+{
+
+ /**
+ * @var string|null Ship date in format YYYYMMDD
+ */
+ public readonly ?string $shipDate;
+
+ /**
+ * @var string|null Customer assigned part number – Optional based on
+ * agreements between Distributor and Supplier
+ */
+ public readonly ?string $customerPartNumber;
+
+ /**
+ * @var string|null Supplier assigned part number
+ */
+ public readonly ?string $supplierPartNumber;
+
+ /**
+ * @var int|null Quantity of product
+ */
+ public readonly ?int $quantity;
+
+ /**
+ * @var string|null Customer assigned purchase order number
+ */
+ public readonly ?string $customerPO;
+
+ /**
+ * @var string|null Line item number from PO. Required on Logistic Label when
+ * used on back of Packing Slip. See Section 4.9
+ */
+ public readonly ?string $customerPOLine;
+
+ /**
+ * 9D - YYWW (Year and Week of Manufacture). ) If no date code is used
+ * for a particular part, this field should be populated with N/T
+ * to indicate the product is Not Traceable by this data field.
+ * @var string|null
+ */
+ public readonly ?string $dateCode;
+
+ /**
+ * 10D - YYWW (Year and Week of Manufacture). ) If no date code is used
+ * for a particular part, this field should be populated with N/T
+ * to indicate the product is Not Traceable by this data field.
+ * @var string|null
+ */
+ public readonly ?string $alternativeDateCode;
+
+ /**
+ * Traceability number assigned to a batch or group of items. If
+ * no lot code is used for a particular part, this field should be
+ * populated with N/T to indicate the product is Not Traceable
+ * by this data field.
+ * @var string|null
+ */
+ public readonly ?string $lotCode;
+
+ /**
+ * Country where part was manufactured. Two-letter code from
+ * ISO 3166 country code list
+ * @var string|null
+ */
+ public readonly ?string $countryOfOrigin;
+
+ /**
+ * @var string|null Unique alphanumeric number assigned by supplier
+ * 3S - Package ID for Inner Pack when part of a mixed Logistic
+ * Carton. Always used in conjunction with a mixed logistic label
+ * with a 5S data identifier for Package ID.
+ */
+ public readonly ?string $packageId1;
+
+ /**
+ * @var string|null
+ * 4S - Package ID for Logistic Carton with like items
+ */
+ public readonly ?string $packageId2;
+
+ /**
+ * @var string|null
+ * 5S - Package ID for Logistic Carton with mixed items
+ */
+ public readonly ?string $packageId3;
+
+ /**
+ * @var string|null Unique alphanumeric number assigned by supplier.
+ */
+ public readonly ?string $packingListNumber;
+
+ /**
+ * @var string|null Ship date in format YYYYMMDD
+ */
+ public readonly ?string $serialNumber;
+
+ /**
+ * @var string|null Code for sorting and classifying LEDs. Use when applicable
+ */
+ public readonly ?string $binCode;
+
+ /**
+ * @var int|null Sequential carton count in format “#/#” or “# of #”
+ */
+ public readonly ?int $packageCount;
+
+ /**
+ * @var string|null Alphanumeric string assigned by the supplier to distinguish
+ * from one closely-related design variation to another. Use as
+ * required or when applicable
+ */
+ public readonly ?string $revisionNumber;
+
+ /**
+ * @var string|null Digikey Extension: This is not represented in the ECIA spec, but the field being used is found in the ANSI MH10.8.2-2016 spec on which the ECIA spec is based. In the ANSI spec it is called First Level (Supplier Assigned) Part Number.
+ */
+ public readonly ?string $digikeyPartNumber;
+
+ /**
+ * @var string|null Digikey Extension: This can be shared across multiple invoices and time periods and is generated as an order enters our system from any vector (web, API, phone order, etc.)
+ */
+ public readonly ?string $digikeySalesOrderNumber;
+
+ /**
+ * @var string|null Digikey extension: This is typically assigned per shipment as items are being released to be picked in the warehouse. A SO can have many Invoice numbers
+ */
+ public readonly ?string $digikeyInvoiceNumber;
+
+ /**
+ * @var string|null Digikey extension: This is for internal DigiKey purposes and defines the label type.
+ */
+ public readonly ?string $digikeyLabelType;
+
+ /**
+ * @var string|null You will also see this as the last part of a URL for a product detail page. Ex https://www.digikey.com/en/products/detail/w%C3%BCrth-elektronik/860010672008/5726907
+ */
+ public readonly ?string $digikeyPartID;
+
+ /**
+ * @var string|null Digikey Extension: For internal use of Digikey. Probably not needed
+ */
+ public readonly ?string $digikeyNA;
+
+ /**
+ * @var string|null Digikey Extension: This is a field of varying length used to keep the barcode approximately the same size between labels. It is safe to ignore.
+ */
+ public readonly ?string $digikeyPadding;
+
+ public readonly ?string $mouserPositionInOrder;
+
+ public readonly ?string $mouserManufacturer;
+
+
+
+ /**
+ *
+ * @param array $data The fields of the EIGP114 barcode, where the key is the field name and the value is the field content
+ */
+ public function __construct(public readonly array $data)
+ {
+ //IDs per EIGP 114.2018
+ $this->shipDate = $data['6D'] ?? null;
+ $this->customerPartNumber = $data['P'] ?? null;
+ $this->supplierPartNumber = $data['1P'] ?? null;
+ $this->quantity = isset($data['Q']) ? (int)$data['Q'] : null;
+ $this->customerPO = $data['K'] ?? null;
+ $this->customerPOLine = $data['4K'] ?? null;
+ $this->dateCode = $data['9D'] ?? null;
+ $this->alternativeDateCode = $data['10D'] ?? null;
+ $this->lotCode = $data['1T'] ?? null;
+ $this->countryOfOrigin = $data['4L'] ?? null;
+ $this->packageId1 = $data['3S'] ?? null;
+ $this->packageId2 = $data['4S'] ?? null;
+ $this->packageId3 = $data['5S'] ?? null;
+ $this->packingListNumber = $data['11K'] ?? null;
+ $this->serialNumber = $data['S'] ?? null;
+ $this->binCode = $data['33P'] ?? null;
+ $this->packageCount = isset($data['13Q']) ? (int)$data['13Q'] : null;
+ $this->revisionNumber = $data['2P'] ?? null;
+ //IDs used by Digikey
+ $this->digikeyPartNumber = $data['30P'] ?? null;
+ $this->digikeySalesOrderNumber = $data['1K'] ?? null;
+ $this->digikeyInvoiceNumber = $data['10K'] ?? null;
+ $this->digikeyLabelType = $data['11Z'] ?? null;
+ $this->digikeyPartID = $data['12Z'] ?? null;
+ $this->digikeyNA = $data['13Z'] ?? null;
+ $this->digikeyPadding = $data['20Z'] ?? null;
+ //IDs used by Mouser
+ $this->mouserPositionInOrder = $data['14K'] ?? null;
+ $this->mouserManufacturer = $data['1V'] ?? null;
+ }
+
+ /**
+ * Tries to guess the vendor of the barcode based on the supplied data field.
+ * This is experimental and should not be relied upon.
+ * @return string|null The guessed vendor as smallcase string (e.g. "digikey", "mouser", etc.), or null if the vendor could not be guessed
+ */
+ public function guessBarcodeVendor(): ?string
+ {
+ //If the barcode data contains the digikey extensions, we assume it is a digikey barcode
+ if (isset($this->data['13Z']) || isset($this->data['20Z']) || isset($this->data['12Z']) || isset($this->data['11Z'])) {
+ return 'digikey';
+ }
+
+ //If the barcode data contains the mouser extensions, we assume it is a mouser barcode
+ if (isset($this->data['14K']) || isset($this->data['1V'])) {
+ return 'mouser';
+ }
+
+ //According to this thread (https://github.com/inventree/InvenTree/issues/853), Newark/element14 codes contains a "3P" field
+ if (isset($this->data['3P'])) {
+ return 'element14';
+ }
+
+ return null;
+ }
+
+ /**
+ * Checks if the given input is a valid format06 formatted data.
+ * This just perform a simple check for the header, the content might be malformed still.
+ * @param string $input
+ * @return bool
+ */
+ public static function isFormat06Code(string $input): bool
+ {
+ //Code must begin with [)>06
+ if(!str_starts_with($input, "[)>\u{1E}06\u{1D}")){
+ return false;
+ }
+
+ //Digikey does not put a trailer onto the barcode, so we just check for the header
+
+ return true;
+ }
+
+ /**
+ * Parses a format06 code a returns a new instance of this class
+ * @param string $input
+ * @return self
+ */
+ public static function parseFormat06Code(string $input): self
+ {
+ //Ensure that the input is a valid format06 code
+ if (!self::isFormat06Code($input)) {
+ throw new \InvalidArgumentException("The given input is not a valid format06 code");
+ }
+
+ //Remove the trailer, if present
+ if (str_ends_with($input, "\u{1E}\u{04}")){
+ $input = substr($input, 5, -2);
+ }
+
+ //Split the input into the different fields (using the separator)
+ $parts = explode("\u{1D}", $input);
+
+ //The first field is the format identifier, which we do not need
+ array_shift($parts);
+
+ //Split the fields into key-value pairs
+ $results = [];
+
+ foreach($parts as $part) {
+ //^ 0* ([1-9]? \d* [A-Z])
+ //Start of the string Leading zeros are discarded Not a zero Any number of digits single uppercase Letter
+ // 00 1 4 K
+
+ if(!preg_match('/^0*([1-9]?\d*[A-Z])/', $part, $matches)) {
+ throw new \LogicException("Could not parse field: $part");
+ }
+ //Extract the key
+ $key = $matches[0];
+ //Extract the field value
+ $fieldValue = substr($part, strlen($matches[0]));
+
+ $results[$key] = $fieldValue;
+ }
+
+ return new self($results);
+ }
+
+ public function getDecodedForInfoMode(): array
+ {
+ $tmp = [
+ 'Barcode type' => 'EIGP114',
+ 'Guessed vendor from barcode' => $this->guessBarcodeVendor() ?? 'Unknown',
+ ];
+
+ //Iterate over all fields of this object and add them to the array if they are not null
+ foreach((array) $this as $key => $value) {
+ //Skip data key
+ if ($key === 'data') {
+ continue;
+ }
+ if($value !== null) {
+ $tmp[$key] = $value;
+ }
+ }
+
+ return $tmp;
+ }
+}
\ No newline at end of file
diff --git a/src/Services/LabelSystem/Barcodes/BarcodeScanResult.php b/src/Services/LabelSystem/BarcodeScanner/LocalBarcodeScanResult.php
similarity index 66%
rename from src/Services/LabelSystem/Barcodes/BarcodeScanResult.php
rename to src/Services/LabelSystem/BarcodeScanner/LocalBarcodeScanResult.php
index 7f1315b3..050aff6f 100644
--- a/src/Services/LabelSystem/Barcodes/BarcodeScanResult.php
+++ b/src/Services/LabelSystem/BarcodeScanner/LocalBarcodeScanResult.php
@@ -21,14 +21,15 @@
declare(strict_types=1);
-namespace App\Services\LabelSystem\Barcodes;
+namespace App\Services\LabelSystem\BarcodeScanner;
use App\Entity\LabelSystem\LabelSupportedElement;
/**
- * This class represents the result of a barcode scan, with the target type and the ID of the element
+ * This class represents the result of a barcode scan of a barcode that uniquely identifies a local entity,
+ * like an internally generated barcode or a barcode that was added manually to the system by a user
*/
-class BarcodeScanResult
+class LocalBarcodeScanResult implements BarcodeScanResultInterface
{
public function __construct(
public readonly LabelSupportedElement $target_type,
@@ -36,4 +37,13 @@ class BarcodeScanResult
public readonly BarcodeSourceType $source_type,
) {
}
+
+ public function getDecodedForInfoMode(): array
+ {
+ return [
+ 'Barcode type' => $this->source_type->name,
+ 'Target type' => $this->target_type->name,
+ 'Target ID' => $this->target_id,
+ ];
+ }
}
\ No newline at end of file
diff --git a/src/Services/LabelSystem/Barcodes/BarcodeRedirector.php b/src/Services/LabelSystem/Barcodes/BarcodeRedirector.php
deleted file mode 100644
index bc21b787..00000000
--- a/src/Services/LabelSystem/Barcodes/BarcodeRedirector.php
+++ /dev/null
@@ -1,89 +0,0 @@
-.
- */
-
-declare(strict_types=1);
-
-/**
- * This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
- *
- * Copyright (C) 2019 - 2022 Jan Böhmer (https://github.com/jbtronics)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
-
-namespace App\Services\LabelSystem\Barcodes;
-
-use App\Entity\LabelSystem\LabelSupportedElement;
-use App\Entity\Parts\PartLot;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\EntityNotFoundException;
-use InvalidArgumentException;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-
-/**
- * @see \App\Tests\Services\LabelSystem\Barcodes\BarcodeRedirectorTest
- */
-final class BarcodeRedirector
-{
- public function __construct(private readonly UrlGeneratorInterface $urlGenerator, private readonly EntityManagerInterface $em)
- {
- }
-
- /**
- * Determines the URL to which the user should be redirected, when scanning a QR code.
- *
- * @param BarcodeScanResult $barcodeScan The result of the barcode scan
- * @return string the URL to which should be redirected
- *
- * @throws EntityNotFoundException
- */
- public function getRedirectURL(BarcodeScanResult $barcodeScan): string
- {
- switch ($barcodeScan->target_type) {
- case LabelSupportedElement::PART:
- return $this->urlGenerator->generate('app_part_show', ['id' => $barcodeScan->target_id]);
- case LabelSupportedElement::PART_LOT:
- //Try to determine the part to the given lot
- $lot = $this->em->find(PartLot::class, $barcodeScan->target_id);
- if (!$lot instanceof PartLot) {
- throw new EntityNotFoundException();
- }
-
- return $this->urlGenerator->generate('app_part_show', ['id' => $lot->getPart()->getID()]);
-
- case LabelSupportedElement::STORELOCATION:
- return $this->urlGenerator->generate('part_list_store_location', ['id' => $barcodeScan->target_id]);
-
- default:
- throw new InvalidArgumentException('Unknown $type: '.$barcodeScan->target_type->name);
- }
- }
-}
diff --git a/src/Services/LabelSystem/LabelExampleElementsGenerator.php b/src/Services/LabelSystem/LabelExampleElementsGenerator.php
index 199d5f46..d344c929 100644
--- a/src/Services/LabelSystem/LabelExampleElementsGenerator.php
+++ b/src/Services/LabelSystem/LabelExampleElementsGenerator.php
@@ -146,11 +146,11 @@ final class LabelExampleElementsGenerator
throw new InvalidArgumentException('$class must be an child of AbstractStructuralDBElement');
}
- /** @var AbstractStructuralDBElement $parent */
+ /** @var T $parent */
$parent = new $class();
$parent->setName('Example');
- /** @var AbstractStructuralDBElement $child */
+ /** @var T $child */
$child = new $class();
$child->setName((new ReflectionClass($class))->getShortName());
$child->setParent($parent);
diff --git a/src/Services/LabelSystem/LabelGenerator.php b/src/Services/LabelSystem/LabelGenerator.php
index d2b20c92..bfb8d27b 100644
--- a/src/Services/LabelSystem/LabelGenerator.php
+++ b/src/Services/LabelSystem/LabelGenerator.php
@@ -62,10 +62,6 @@ final class LabelGenerator
*/
public function generateLabel(LabelOptions $options, object|array $elements): string
{
- if (!is_array($elements) && !is_object($elements)) {
- throw new InvalidArgumentException('$element must be an object or an array of objects!');
- }
-
if (!is_array($elements)) {
$elements = [$elements];
}
diff --git a/src/Services/LabelSystem/LabelProfileDropdownHelper.php b/src/Services/LabelSystem/LabelProfileDropdownHelper.php
index ac5020a2..773923ab 100644
--- a/src/Services/LabelSystem/LabelProfileDropdownHelper.php
+++ b/src/Services/LabelSystem/LabelProfileDropdownHelper.php
@@ -74,8 +74,7 @@ final class LabelProfileDropdownHelper
$secure_class_name = $this->tagGenerator->getElementTypeCacheTag(LabelProfile::class);
$key = 'profile_dropdown_'.$this->keyGenerator->generateKey().'_'.$secure_class_name.'_'.$type->value;
-
- /** @var LabelProfileRepository $repo */
+
$repo = $this->entityManager->getRepository(LabelProfile::class);
return $this->cache->get($key, function (ItemInterface $item) use ($repo, $type, $secure_class_name) {
diff --git a/src/Services/LabelSystem/PlaceholderProviders/BarcodeProvider.php b/src/Services/LabelSystem/PlaceholderProviders/BarcodeProvider.php
index dd70177f..400fef35 100644
--- a/src/Services/LabelSystem/PlaceholderProviders/BarcodeProvider.php
+++ b/src/Services/LabelSystem/PlaceholderProviders/BarcodeProvider.php
@@ -63,12 +63,24 @@ final class BarcodeProvider implements PlaceholderProviderInterface
return $this->barcodeGenerator->generateHTMLBarcode($label_options, $label_target);
}
+ if ('[[BARCODE_DATAMATRIX]]' === $placeholder) {
+ $label_options = new LabelOptions();
+ $label_options->setBarcodeType(BarcodeType::DATAMATRIX);
+ return $this->barcodeGenerator->generateHTMLBarcode($label_options, $label_target);
+ }
+
if ('[[BARCODE_C39]]' === $placeholder) {
$label_options = new LabelOptions();
$label_options->setBarcodeType(BarcodeType::CODE39);
return $this->barcodeGenerator->generateHTMLBarcode($label_options, $label_target);
}
+ if ('[[BARCODE_C93]]' === $placeholder) {
+ $label_options = new LabelOptions();
+ $label_options->setBarcodeType(BarcodeType::CODE93);
+ return $this->barcodeGenerator->generateHTMLBarcode($label_options, $label_target);
+ }
+
if ('[[BARCODE_C128]]' === $placeholder) {
$label_options = new LabelOptions();
$label_options->setBarcodeType(BarcodeType::CODE128);
diff --git a/src/Services/LabelSystem/SandboxedTwigFactory.php b/src/Services/LabelSystem/SandboxedTwigFactory.php
index cdf0594f..d6ea6968 100644
--- a/src/Services/LabelSystem/SandboxedTwigFactory.php
+++ b/src/Services/LabelSystem/SandboxedTwigFactory.php
@@ -122,8 +122,8 @@ final class SandboxedTwigFactory
'getFullPath', 'getPathArray', 'getSubelements', 'getChildren', 'isNotSelectable', ],
AbstractCompany::class => ['getAddress', 'getPhoneNumber', 'getFaxNumber', 'getEmailAddress', 'getWebsite', 'getAutoProductUrl'],
AttachmentContainingDBElement::class => ['getAttachments', 'getMasterPictureAttachment'],
- Attachment::class => ['isPicture', 'is3DModel', 'isExternal', 'isSecure', 'isBuiltIn', 'getExtension',
- 'getElement', 'getURL', 'getHost', 'getFilename', 'getAttachmentType', 'getShowInTable', ],
+ Attachment::class => ['isPicture', 'is3DModel', 'hasExternal', 'hasInternal', 'isSecure', 'isBuiltIn', 'getExtension',
+ 'getElement', 'getExternalPath', 'getHost', 'getFilename', 'getAttachmentType', 'getShowInTable'],
AbstractParameter::class => ['getFormattedValue', 'getGroup', 'getSymbol', 'getValueMin', 'getValueMax',
'getValueTypical', 'getUnit', 'getValueText', ],
MeasurementUnit::class => ['getUnit', 'isInteger', 'useSIPrefix'],
diff --git a/src/Services/Parts/PartsTableActionHandler.php b/src/Services/Parts/PartsTableActionHandler.php
index bcfb3a8a..616df229 100644
--- a/src/Services/Parts/PartsTableActionHandler.php
+++ b/src/Services/Parts/PartsTableActionHandler.php
@@ -22,6 +22,7 @@ declare(strict_types=1);
*/
namespace App\Services\Parts;
+use App\Entity\Parts\StorageLocation;
use Symfony\Bundle\SecurityBundle\Security;
use App\Entity\Parts\Category;
use App\Entity\Parts\Footprint;
@@ -35,6 +36,9 @@ use InvalidArgumentException;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
+use Symfony\Contracts\Translation\TranslatableInterface;
+
+use function Symfony\Component\Translation\t;
final class PartsTableActionHandler
{
@@ -53,7 +57,6 @@ final class PartsTableActionHandler
{
$id_array = explode(',', $ids);
- /** @var PartRepository $repo */
$repo = $this->entityManager->getRepository(Part::class);
return $repo->getElementsFromIDArray($id_array);
@@ -62,8 +65,9 @@ final class PartsTableActionHandler
/**
* @param Part[] $selected_parts
* @return RedirectResponse|null Returns a redirect response if the user should be redirected to another page, otherwise null
+ * //@param-out list|array $errors
*/
- public function handleAction(string $action, array $selected_parts, ?int $target_id, ?string $redirect_url = null): ?RedirectResponse
+ public function handleAction(string $action, array $selected_parts, ?int $target_id, ?string $redirect_url = null, array &$errors = []): ?RedirectResponse
{
if ($action === 'add_to_project') {
return new RedirectResponse(
@@ -162,6 +166,29 @@ implode(',', array_map(static fn (PartLot $lot) => $lot->getID(), $part->getPart
$this->denyAccessUnlessGranted('@measurement_units.read');
$part->setPartUnit(null === $target_id ? null : $this->entityManager->find(MeasurementUnit::class, $target_id));
break;
+ case 'change_location':
+ $this->denyAccessUnlessGranted('@storelocations.read');
+ //Retrieve the first part lot and set the location for it
+ $part_lots = $part->getPartLots();
+ if ($part_lots->count() > 0) {
+ if ($part_lots->count() > 1) {
+ $errors[] = [
+ 'part' => $part,
+ 'message' => t('parts.table.action_handler.error.part_lots_multiple'),
+ ];
+ break;
+ }
+
+ $part_lot = $part_lots->first();
+ $part_lot->setStorageLocation(null === $target_id ? null : $this->entityManager->find(StorageLocation::class, $target_id));
+ } else { //Create a new part lot if there are none
+ $part_lot = new PartLot();
+ $part_lot->setPart($part);
+ $part_lot->setInstockUnknown(true); //We do not know how many parts are in stock, so we set it to true
+ $part_lot->setStorageLocation(null === $target_id ? null : $this->entityManager->find(StorageLocation::class, $target_id));
+ $this->entityManager->persist($part_lot);
+ }
+ break;
default:
throw new InvalidArgumentException('The given action is unknown! ('.$action.')');
diff --git a/src/Services/System/BannerHelper.php b/src/Services/System/BannerHelper.php
index 1b6da52a..3d5daef9 100644
--- a/src/Services/System/BannerHelper.php
+++ b/src/Services/System/BannerHelper.php
@@ -40,9 +40,6 @@ class BannerHelper
public function getBanner(): string
{
$banner = $this->partdb_banner;
- if (!is_string($banner)) {
- throw new \RuntimeException('The parameter "partdb.banner" must be a string.');
- }
if ($banner === '') {
$banner_path = $this->project_dir
.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'banner.md';
diff --git a/src/Services/Tools/StatisticsHelper.php b/src/Services/Tools/StatisticsHelper.php
index c1cace21..00bb05c9 100644
--- a/src/Services/Tools/StatisticsHelper.php
+++ b/src/Services/Tools/StatisticsHelper.php
@@ -122,7 +122,6 @@ class StatisticsHelper
throw new InvalidArgumentException('No count for the given type available!');
}
- /** @var EntityRepository $repo */
$repo = $this->em->getRepository($arr[$type]);
return $repo->count([]);
diff --git a/src/Services/Tools/TagFinder.php b/src/Services/Tools/TagFinder.php
index bfc7c9db..80c89e0f 100644
--- a/src/Services/Tools/TagFinder.php
+++ b/src/Services/Tools/TagFinder.php
@@ -66,7 +66,7 @@ class TagFinder
$qb->select('p.tags')
->from(Part::class, 'p')
- ->where('p.tags LIKE ?1')
+ ->where('ILIKE(p.tags, ?1) = TRUE')
->setMaxResults($options['query_limit'])
//->orderBy('RAND()')
->setParameter(1, '%'.$keyword.'%');
diff --git a/src/Services/Trees/NodesListBuilder.php b/src/Services/Trees/NodesListBuilder.php
index 0f94d79d..e65fa37e 100644
--- a/src/Services/Trees/NodesListBuilder.php
+++ b/src/Services/Trees/NodesListBuilder.php
@@ -23,9 +23,11 @@ declare(strict_types=1);
namespace App\Services\Trees;
use App\Entity\Base\AbstractDBElement;
+use App\Entity\Base\AbstractNamedDBElement;
use App\Entity\Base\AbstractStructuralDBElement;
use App\Repository\AttachmentContainingDBElementRepository;
use App\Repository\DBElementRepository;
+use App\Repository\NamedDBElementRepository;
use App\Repository\StructuralDBElementRepository;
use App\Services\Cache\ElementCacheTagGenerator;
use App\Services\Cache\UserCacheKeyGenerator;
@@ -51,7 +53,7 @@ class NodesListBuilder
* Gets a flattened hierarchical tree. Useful for generating option lists.
* In difference to the Repository Function, the results here are cached.
*
- * @template T of AbstractDBElement
+ * @template T of AbstractNamedDBElement
*
* @param string $class_name the class name of the entity you want to retrieve
* @phpstan-param class-string $class_name
@@ -69,7 +71,7 @@ class NodesListBuilder
$ids = $this->getFlattenedIDs($class_name, $parent);
//Retrieve the elements from the IDs, the order is the same as in the $ids array
- /** @var DBElementRepository $repo */
+ /** @var NamedDBElementRepository $repo */
$repo = $this->em->getRepository($class_name);
if ($repo instanceof AttachmentContainingDBElementRepository) {
@@ -81,7 +83,9 @@ class NodesListBuilder
/**
* This functions returns the (cached) list of the IDs of the elements for the flattened tree.
+ * @template T of AbstractNamedDBElement
* @param string $class_name
+ * @phpstan-param class-string $class_name
* @param AbstractStructuralDBElement|null $parent
* @return int[]
*/
@@ -96,10 +100,12 @@ class NodesListBuilder
// Invalidate when groups, an element with the class or the user changes
$item->tag(['groups', 'tree_list', $this->keyGenerator->generateKey(), $secure_class_name]);
- /** @var StructuralDBElementRepository $repo */
+ /** @var NamedDBElementRepository $repo */
$repo = $this->em->getRepository($class_name);
- return array_map(static fn(AbstractDBElement $element) => $element->getID(), $repo->getFlatList($parent));
+ return array_map(static fn(AbstractDBElement $element) => $element->getID(),
+ //@phpstan-ignore-next-line For some reason phpstan does not understand that $repo is a StructuralDBElementRepository
+ $repo->getFlatList($parent));
});
}
diff --git a/src/Services/Trees/TreeViewGenerator.php b/src/Services/Trees/TreeViewGenerator.php
index 81b64840..23d6a406 100644
--- a/src/Services/Trees/TreeViewGenerator.php
+++ b/src/Services/Trees/TreeViewGenerator.php
@@ -33,6 +33,7 @@ use App\Entity\Parts\Supplier;
use App\Entity\ProjectSystem\Project;
use App\Helpers\Trees\TreeViewNode;
use App\Helpers\Trees\TreeViewNodeIterator;
+use App\Repository\NamedDBElementRepository;
use App\Repository\StructuralDBElementRepository;
use App\Services\Cache\ElementCacheTagGenerator;
use App\Services\Cache\UserCacheKeyGenerator;
@@ -219,6 +220,7 @@ class TreeViewGenerator
* The treeview is generic, that means the href are null and ID values are set.
*
* @param string $class The class for which the tree should be generated
+ * @phpstan-param class-string $class
* @param AbstractStructuralDBElement|null $parent the parent the root elements should have
*
* @return TreeViewNode[]
@@ -232,12 +234,12 @@ class TreeViewGenerator
throw new InvalidArgumentException('$parent must be of the type $class!');
}
- /** @var StructuralDBElementRepository $repo */
+ /** @var NamedDBElementRepository $repo */
$repo = $this->em->getRepository($class);
//If we just want a part of a tree, don't cache it
if ($parent instanceof AbstractStructuralDBElement) {
- return $repo->getGenericNodeTree($parent);
+ return $repo->getGenericNodeTree($parent); //@phpstan-ignore-line PHPstan does not seem to recognize, that we have a StructuralDBElementRepository here, which have 1 argument
}
$secure_class_name = $this->tagGenerator->getElementTypeCacheTag($class);
@@ -246,7 +248,7 @@ class TreeViewGenerator
return $this->cache->get($key, function (ItemInterface $item) use ($repo, $parent, $secure_class_name) {
// Invalidate when groups, an element with the class or the user changes
$item->tag(['groups', 'tree_treeview', $this->keyGenerator->generateKey(), $secure_class_name]);
- return $repo->getGenericNodeTree($parent);
+ return $repo->getGenericNodeTree($parent); //@phpstan-ignore-line
});
}
}
diff --git a/src/Validator/Constraints/UniqueObjectCollection.php b/src/Validator/Constraints/UniqueObjectCollection.php
index c71fcc5d..6548494e 100644
--- a/src/Validator/Constraints/UniqueObjectCollection.php
+++ b/src/Validator/Constraints/UniqueObjectCollection.php
@@ -43,12 +43,12 @@ class UniqueObjectCollection extends Constraint
* @param array|string $fields the combination of fields that must contain unique values or a set of options
*/
public function __construct(
- array $options = null,
- string $message = null,
- callable $normalizer = null,
- array $groups = null,
+ ?array $options = null,
+ ?string $message = null,
+ ?callable $normalizer = null,
+ ?array $groups = null,
mixed $payload = null,
- array|string $fields = null,
+ array|string|null $fields = null,
public bool $allowNull = true,
) {
parent::__construct($options, $groups, $payload);
diff --git a/src/Validator/Constraints/ValidGoogleAuthCode.php b/src/Validator/Constraints/ValidGoogleAuthCode.php
index 482af35c..180d346e 100644
--- a/src/Validator/Constraints/ValidGoogleAuthCode.php
+++ b/src/Validator/Constraints/ValidGoogleAuthCode.php
@@ -31,8 +31,8 @@ class ValidGoogleAuthCode extends Constraint
* @param TwoFactorInterface|null $user The user to use for the validation process, if null, the current user is used
*/
public function __construct(
- array $options = null,
- array $groups = null,
+ ?array $options = null,
+ ?array $groups = null,
mixed $payload = null,
public ?TwoFactorInterface $user = null)
{
diff --git a/symfony.lock b/symfony.lock
index 8f230496..c7471b73 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -139,9 +139,6 @@
"florianv/swap-bundle": {
"version": "5.0.x-dev"
},
- "friendsofphp/proxy-manager-lts": {
- "version": "v1.0.5"
- },
"gregwar/captcha": {
"version": "v1.1.7"
},
@@ -172,9 +169,6 @@
"./config/packages/knpu_oauth2_client.yaml"
]
},
- "laminas/laminas-code": {
- "version": "3.4.1"
- },
"league/html-to-markdown": {
"version": "4.8.2"
},
@@ -414,15 +408,15 @@
"version": "v4.2.3"
},
"symfony/console": {
- "version": "5.3",
+ "version": "6.4",
"recipe": {
"repo": "github.com/symfony/recipes",
- "branch": "master",
+ "branch": "main",
"version": "5.3",
- "ref": "da0c8be8157600ad34f10ff0c9cc91232522e047"
+ "ref": "1781ff40d8a17d87cf53f8d4cf0c8346ed2bb461"
},
"files": [
- "./bin/console"
+ "bin/console"
]
},
"symfony/css-selector": {
@@ -474,15 +468,16 @@
"version": "v4.2.3"
},
"symfony/flex": {
- "version": "1.19",
+ "version": "2.4",
"recipe": {
"repo": "github.com/symfony/recipes",
"branch": "main",
- "version": "1.0",
- "ref": "146251ae39e06a95be0fe3d13c807bcf3938b172"
+ "version": "2.4",
+ "ref": "52e9754527a15e2b79d9a610f98185a1fe46622a"
},
"files": [
- ".env"
+ ".env",
+ ".env.dev"
]
},
"symfony/form": {
@@ -612,9 +607,6 @@
"symfony/property-info": {
"version": "v4.2.3"
},
- "symfony/proxy-manager-bridge": {
- "version": "v5.2.1"
- },
"symfony/routing": {
"version": "6.2",
"recipe": {
diff --git a/templates/attachment_list.html.twig b/templates/attachment_list.html.twig
index abb6f4ad..3ff45700 100644
--- a/templates/attachment_list.html.twig
+++ b/templates/attachment_list.html.twig
@@ -34,6 +34,8 @@
{{ form_row(filterForm.attachmentType) }}
{{ form_row(filterForm.targetType) }}
{{ form_row(filterForm.showInTable) }}
+ {{ form_row(filterForm.originalFileName) }}
+ {{ form_row(filterForm.externalLink) }}
{{ form_row(filterForm.lastModified) }}
{{ form_row(filterForm.addedDate) }}
{{ form_row(filterForm.dbId) }}
diff --git a/templates/base.html.twig b/templates/base.html.twig
index 3b4cebba..e7c641c6 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -38,7 +38,7 @@
- {% if not app.user.theme is defined %}
+ {% if not app.user.theme is defined or app.user.theme is null %}
{% set theme = global_theme %}
{% else %}
{% set theme = app.user.theme %}
diff --git a/templates/components/datatables.macro.html.twig b/templates/components/datatables.macro.html.twig
index c32294ba..5ce0f23f 100644
--- a/templates/components/datatables.macro.html.twig
+++ b/templates/components/datatables.macro.html.twig
@@ -54,6 +54,7 @@
+