Custom Fields missing

-- HikaShop version -- : 4.0.1
-- Joomla version -- : 3.9.1
-- PHP version -- : 7.1

Hello,

We have custom fields showing in the product page people fill them out add product to cart great. All shows in the cart and on the order confirmation page, on confirming order all but two of the fields are lost. All fields are identical setting wise, we cannot see where it's loosing them.

Currently debugging the code, but struggling to see where you fetch the values and input them into the product order class.

Many thanks
Tony

We have been able to implement a workaround fix for now,

In:

/administrator/components/com_hikashop/classes/order.php

line: 660 change:
$orderProduct->$namekey = $product->$namekey;
to
$cartProduct = $cart->cart_products[$product->cart_product_id];
$orderProduct->$namekey = $cartProduct->$namekey;

This then gets the values correctly from the cart, I'm not sure where else you may be getting them from as at this point two are set in product but the rest are not.

See images attached