瀏覽代碼

code fixes, display revoke if applicable

master
Dukai Károly 3 年之前
父節點
當前提交
f4a2e83308
共有 4 個文件被更改,包括 609 次插入616 次删除
  1. +603
    -603
      modules/custom/arlista/js/arlista.js
  2. +1
    -1
      modules/custom/arlista/src/Controller/ComponentController.php
  3. +1
    -3
      modules/custom/arlista/src/Factory/ProductFactory.php
  4. +4
    -9
      modules/custom/arlista/templates/arlista-product-uploaded-list.html.twig

+ 603
- 603
modules/custom/arlista/js/arlista.js
文件差異過大導致無法顯示
查看文件


+ 1
- 1
modules/custom/arlista/src/Controller/ComponentController.php 查看文件

@@ -45,7 +45,7 @@ class ComponentController extends AxicoIdController {
$manufacturer = $this->getManufacturerFactory()->find($component->getParentManufacturerId());
$result = $this->getAxicoIdResultContainer($product, $manufacturer);
$result = $this->getAxicoIdResultContainer($product, $manufacturer, $revokeAxicoId);
$result = $this->getProductFactory()->createOrFindAxicoIdForEachProduct($result);
}


+ 1
- 3
modules/custom/arlista/src/Factory/ProductFactory.php 查看文件

@@ -495,8 +495,6 @@ class ProductFactory extends AbstractFactory {
// This should never occure

$result['axicoIdMissing']++;
} else {
}

/*
@@ -588,7 +586,7 @@ class ProductFactory extends AbstractFactory {
$this->createNextForNewAxicoId($newAxicoIdEntity, $component, $product);
$result['axicoIdGenerated']++;
}
$optionValue = $product->isComponentBased() ? $product->getParentComponentId() : $product->getParentCategoryId();
$result['optionValues'][$product->getId()] = $product->getParentManufacturerId() . '-' . $optionValue;
}

+ 4
- 9
modules/custom/arlista/templates/arlista-product-uploaded-list.html.twig 查看文件

@@ -85,16 +85,11 @@
<select class="product-list-component-select" name="product-component">
<option value="0-x">Kérem válasszon</option>
{% for component in components %}
<option value="{{ component.parentManufacturerId }}-{{ component.id }}"
{% if product.parentComponentId is same as(component.id) %} selected {% endif %}
{% if product.correctStatus is same as('CORRECT_IMPORTED') %} disabled="true"
{% endif %}>{{ componentManufacturers[component.id] }} ({{ component.axicoIdName }}) {{ component.name }}</option>
<option value="{{ component.parentManufacturerId }}-{{ component.id }}" {% if product.parentComponentId is same as(component.id) %} selected {% endif %}>
{{ componentManufacturers[component.id] }} ({{ component.axicoIdName }}) {{ component.name }}
</option>
{% endfor %}
{% if product.axicoId|length is not same as(0) and product.correctStatus is not same as('CORRECT_IMPORTED') %}
<option data-field-attr-mid="-1"
value="0-0-revokeAxicoId"
{% if product.correctStatus is same as('CORRECT_IMPORTED') %} disabled="true"{% endif %}>Cikkszám visszavonása</option>
{% endif %}
<option data-field-attr-mid="-1" value="0-0-revokeAxicoId">Cikkszám visszavonása</option>
</select>
</td>
{% endif %}

Loading…
取消
儲存