You should be able to add the software to the Portal not as a Service Item to then bundle but be able to add it as a Data Source to a form. That way you do not have the issue of having to hide an option the portal so that you do not have to bundle the Service Item and then manually hide an option on the portal and worry about people searching for it so you then have to hide the button for them to purchase with nothing selected.
Same for the Hardware. You should be able to have a hardware inventory where you can classify what the type is and the details of that item is able to be clicked on and selected to find out more details about it before selecting to purchase it.
You should be able to go into a section of the portal and add things to cart to purchase on one form. So able to search a catalogue and select various items to add so that all the fields are visible. Rather than a bundled form at the bottom.
