GX-Bug #54146 » CSVAdditionalFieldsFix1.patch
| src/system/classes/csv/CSVSource.php (revision ) | ||
|---|---|---|
| 1662 | 1662 |
return $t_properties_array; |
| 1663 | 1663 |
} |
| 1664 | 1664 | |
| 1665 |
public function get_additional_fields_array() |
|
| 1665 |
public function get_additional_fields_array($p_product_id)
|
|
| 1666 | 1666 |
{
|
| 1667 | 1667 |
if (!empty($this->v_additional_fields_array)) |
| 1668 | 1668 |
{
|
| ... | ... | |
| 1677 | 1677 |
FROM |
| 1678 | 1678 |
additional_field_values AS afv |
| 1679 | 1679 |
LEFT JOIN |
| 1680 |
additional_field_value_descriptions AS afvd USING (additional_field_value_id)"; |
|
| 1680 |
additional_field_value_descriptions AS afvd USING (additional_field_value_id) |
|
| 1681 |
WHERE item_id=".$p_product_id; |
|
| 1681 | 1682 | |
| 1682 | 1683 |
$t_result = xtc_db_query($t_select); |
| 1683 | 1684 | |
| src/system/classes/csv/CSVImportFunctionLibrary.inc.php (revision ) | ||
|---|---|---|
| 1142 | 1142 |
if (empty($this->v_additional_fields)) |
| 1143 | 1143 |
{
|
| 1144 | 1144 |
$this->v_csv_source = MainFactory::create_object('CSVSource', array(), true);
|
| 1145 |
$this->v_additional_fields = $this->v_csv_source->get_additional_fields_array(); |
|
| 1145 |
$this->v_additional_fields = $this->v_csv_source->get_additional_fields_array($this->v_import_data_array['products']['products_id']);
|
|
| 1146 | 1146 |
} |
| 1147 | 1147 |
|
| 1148 | 1148 |
$c_additional_field_id = $this->get_additional_field_id($p_field_params[0]['additional_field']); |