create proposed shipments if is no shippment data
also make sure to set the cost provided after order update

Conflicts:
	core/lib/spree/core/importer/order.rb
	core/spec/lib/spree/core/importer/order_spec.rb