Merge remote-tracking branch 'origin/master'

* New translations validators.en.xlf (Chinese Simplified)

* New translations messages.en.xlf (English)

* New translations messages.en.xlf (German)

VERSION

@@ -1 +1 @@
-2.9.0
+2.9.1

src/Controller/ProjectController.php

@@ -240,7 +240,8 @@ class ProjectController extends AbstractController
         }
 
         // Detect fields and get suggestions
-        $detected_fields = $BOMImporter->detectFields($file_content);
+        $detected_delimiter = $BOMImporter->detectDelimiter($file_content);
+        $detected_fields = $BOMImporter->detectFields($file_content, $detected_delimiter);
         $suggested_mapping = $BOMImporter->getSuggestedFieldMapping($detected_fields);
 
         // Create mapping of original field names to sanitized field names for template
@@ -257,7 +258,7 @@ class ProjectController extends AbstractController
         $builder->add('delimiter', ChoiceType::class, [
             'label' => 'project.bom_import.delimiter',
             'required' => true,
-            'data' => ',',
+            'data' => $detected_delimiter,
             'choices' => [
                 'project.bom_import.delimiter.comma' => ',',
                 'project.bom_import.delimiter.semicolon' => ';',

src/Services/ImportExportSystem/BOMImporter.php

@@ -721,26 +721,36 @@ class BOMImporter
         return $mapped;
     }
 
+    /**
+     * Try to detect the separator used in the CSV data by analyzing the first line and counting occurrences of common delimiters.
+     * @param  string  $data
+     * @return string
+     */
+    public function detectDelimiter(string $data): string
+    {
+        $delimiters = [',', ';', "\t"];
+        $lines = explode("\n", $data, 2);
+        $header_line = $lines[0] ?? '';
+        $delimiter_counts = [];
+        foreach ($delimiters as $delim) {
+            $delimiter_counts[$delim] = substr_count($header_line, $delim);
+        }
+        // Choose the delimiter with the highest count, default to comma if all are zero
+        $max_count = max($delimiter_counts);
+        $delimiter = array_search($max_count, $delimiter_counts, true);
+        if ($max_count === 0 || $delimiter === false) {
+            $delimiter = ',';
+        }
+        return $delimiter;
+    }
+
     /**
      * Detect available fields in CSV data for field mapping UI
      */
     public function detectFields(string $data, ?string $delimiter = null): array
     {
         if ($delimiter === null) {
-            // Detect delimiter by counting occurrences in the first row (header)
-            $delimiters = [',', ';', "\t"];
-            $lines = explode("\n", $data, 2);
-            $header_line = $lines[0] ?? '';
-            $delimiter_counts = [];
-            foreach ($delimiters as $delim) {
-                $delimiter_counts[$delim] = substr_count($header_line, $delim);
-            }
-            // Choose the delimiter with the highest count, default to comma if all are zero
-            $max_count = max($delimiter_counts);
-            $delimiter = array_search($max_count, $delimiter_counts, true);
-            if ($max_count === 0 || $delimiter === false) {
-                $delimiter = ',';
-            }
+            $delimiter = $this->detectDelimiter($data);
         }
         // Handle potential BOM (Byte Order Mark) at the beginning
         $data = preg_replace('/^\xEF\xBB\xBF/', '', $data);

templates/parts/info/_order_infos.html.twig

@@ -47,17 +47,17 @@
                                     </td>
                                     <td>
                                         {{ detail.price | format_money(detail.currency) }} / {{ detail.PriceRelatedQuantity | format_amount(part.partUnit) }}
-                                        {% set tmp = pricedetail_helper.convertMoneyToCurrency(detail.price, detail.currency) %}
+                                        {% set tmp = pricedetail_helper.convertMoneyToCurrency(detail.price, detail.currency, app.user.currency ?? null) %}
                                         {% if detail.currency != (app.user.currency ?? null) and tmp is not null and tmp.GreaterThan(0) %}
-                                            <span class="text-muted">({{ pricedetail_helper.convertMoneyToCurrency(detail.price, detail.currency, app.user.currency ?? null) | format_money(app.user.currency ?? null) }})</span>
+                                            <span class="text-muted">({{ tmp | format_money(app.user.currency ?? null) }})</span>
                                         {% endif %}
                                         <small class="text-muted">{{- helper.vat_text(detail.includesVAT) -}}</small>
                                     </td>
                                     <td>
                                         {{ detail.PricePerUnit  | format_money(detail.currency) }}
-                                        {% set tmp = pricedetail_helper.convertMoneyToCurrency(detail.PricePerUnit, detail.currency) %}
+                                        {% set tmp = pricedetail_helper.convertMoneyToCurrency(detail.PricePerUnit, detail.currency, app.user.currency ?? null) %}
                                         {% if detail.currency != (app.user.currency ?? null) and tmp is not null and tmp.GreaterThan(0) %}
-                                            <span class="text-muted">({{ pricedetail_helper.convertMoneyToCurrency(detail.PricePerUnit, detail.currency, app.user.currency ?? null) | format_money(app.user.currency ?? null) }})</span>
+                                            <span class="text-muted">({{ tmp | format_money(app.user.currency ?? null) }})</span>
                                         {% endif %}
                                         <small class="text-muted">{{- helper.vat_text(detail.includesVAT) -}}</small>
                                     </td>

templates/projects/import_bom_map_fields.html.twig

@@ -48,51 +48,59 @@
             <div class="table-responsive">
                 <table class="table table-striped">
                     <thead>
-                        <tr>
-                            <th>{% trans %}project.bom_import.field_mapping.csv_field{% endtrans %}</th>
-                            <th>{% trans %}project.bom_import.field_mapping.maps_to{% endtrans %}</th>
-                            <th>{% trans %}project.bom_import.field_mapping.suggestion{% endtrans %}</th>
-                            <th>{% trans %}project.bom_import.field_mapping.priority{% endtrans %}</th>
-                        </tr>
+                    <tr>
+                        <th>{% trans %}project.bom_import.field_mapping.csv_field{% endtrans %}</th>
+                        <th>{% trans %}project.bom_import.field_mapping.maps_to{% endtrans %}</th>
+                        <th>{% trans %}project.bom_import.field_mapping.suggestion{% endtrans %}</th>
+                        <th>{% trans %}project.bom_import.field_mapping.priority{% endtrans %}</th>
+                    </tr>
                     </thead>
                     <tbody>
-                        {% for field in detected_fields %}
-                            <tr>
-                                <td>
-                                    <code>{{ field }}</code>
-                                </td>
-                                <td>
+                    {% for field in detected_fields %}
+                        <tr>
+                            <td>
+                                <code>{{ field }}</code>
+                            </td>
+                            <td>
+                                {# TODO: This is more a workaround than a proper fix. Ideally the controller should be fixed in a way, that we get the correct fields here #}
+                                {% if field_name_mapping[field] is defined %}
+                                    {% set field_name = field_name_mapping[field]  %}
                                     {{ form_widget(form['mapping_' ~ field_name_mapping[field]], {
                                         'attr': {
                                             'class': 'form-select field-mapping-select',
                                             'data-field': field
                                         }
                                     }) }}
-                                </td>
-                                <td>
-                                    {% if suggested_mapping[field] is defined %}
-                                        <span class="badge bg-success">
+                                {% else %}
+                                    <b class="text-danger">
+                                        {% trans %}project.bom_import.field_mapping.error.check_delimiter{% endtrans %}
+                                    </b>
+                                {% endif %}
+                            </td>
+                            <td>
+                                {% if suggested_mapping[field] is defined %}
+                                    <span class="badge bg-success">
                                             <i class="fa-solid fa-magic fa-fw"></i>
                                             {{ suggested_mapping[field] }}
                                         </span>
-                                    {% else %}
-                                        <span class="text-muted">
+                                {% else %}
+                                    <span class="text-muted">
                                             <i class="fa-solid fa-question fa-fw"></i>
                                             {% trans %}project.bom_import.field_mapping.no_suggestion{% endtrans %}
                                         </span>
-                                    {% endif %}
-                                </td>
-                                <td>
-                                    <input type="number"
-                                           class="form-control form-control-sm priority-input"
-                                           min="1"
-                                           value="10"
-                                           style="width: 80px;"
-                                           data-field="{{ field }}"
-                                           title="{% trans %}project.bom_import.field_mapping.priority_help{% endtrans %}">
-                                </td>
-                            </tr>
-                        {% endfor %}
+                                {% endif %}
+                            </td>
+                            <td>
+                                <input type="number"
+                                       class="form-control form-control-sm priority-input"
+                                       min="1"
+                                       value="10"
+                                       style="width: 80px;"
+                                       data-field="{{ field }}"
+                                       title="{% trans %}project.bom_import.field_mapping.priority_help{% endtrans %}">
+                            </td>
+                        </tr>
+                    {% endfor %}
                     </tbody>
                 </table>
             </div>

translations/messages.de.xlf

@@ -12945,5 +12945,11 @@ Buerklin-API-Authentication-Server:
         <target>[Part_lot] aus Barcode erstellt: Bitte überprüfen Sie, ob die Daten korrekt und gewünscht sind.</target>
       </segment>
     </unit>
+    <unit id="F8pQuL9" name="project.bom_import.field_mapping.error.check_delimiter">
+      <segment state="translated">
+        <source>project.bom_import.field_mapping.error.check_delimiter</source>
+        <target>Zuordnungsfehler: Bitte prüfen Sie, ob Sie das richtige Trennzeichen ausgewählt haben!</target>
+      </segment>
+    </unit>
   </file>
 </xliff>

translations/messages.en.xlf

@@ -12947,5 +12947,11 @@ Buerklin-API Authentication server:
         <target>[Part_lot] created from barcode: Please check if the data is correct and desired.</target>
       </segment>
     </unit>
+    <unit id="F8pQuL9" name="project.bom_import.field_mapping.error.check_delimiter">
+      <segment state="translated">
+        <source>project.bom_import.field_mapping.error.check_delimiter</source>
+        <target>Mapping error: Check if you have selected the right delimiter!</target>
+      </segment>
+    </unit>
   </file>
 </xliff>

translations/validators.zh.xlf

@@ -247,5 +247,11 @@
         <target>该类型在此语言下已存在翻译定义!</target>
       </segment>
     </unit>
+    <unit id="zT_j_oQ" name="validator.invalid_gtin">
+      <segment state="translated">
+        <source>validator.invalid_gtin</source>
+        <target>无效的GTIN / EAN 码。</target>
+      </segment>
+    </unit>
   </file>
-</xliff>
+</xliff>