Merge pull request #20681 from eileenmcnaughton/order_easy

Make Order api easier to use for default price set

diff --cc CRM/Contribute/BAO/Contribution.php
Simple merge

diff --cc CRM/Financial/BAO/Order.php
Simple merge

diff --cc api/v3/Order.php
index 8a794af79772d3368d348322ce17caa8e6ec9b5b,7ec2ae93b1b52437d76eb4de3180df223cc22244..cf0e8ee50ebe9c6f7c22a9155ccd554437da0681
--- 1/api/v3/Order.php
--- 2/api/v3/Order.php
+++ b/api/v3/Order.php
@@@ -117,9 -114,11 +115,10 @@@ function civicrm_api3_order_create(arra
          if ($supportedEntity) {
            $entityParams['skipLineItem'] = TRUE;
            $entityResult = civicrm_api3($entity, 'create', $entityParams);
 -          $params['contribution_mode'] = $entity;
            $entityIds[] = $params[$entity . '_id'] = $entityResult['id'];
-           foreach ($lineItems['line_item'] as &$items) {
-             $items['entity_id'] = $entityResult['id'];
+           foreach ($lineItems['line_item'] as $innerIndex => $lineItem) {
+             $lineIndex = $index . '+' . $innerIndex;
+             $order->setLineItemValue('entity_id', $entityResult['id'], $lineIndex);
            }
          }
        }

diff --cc tests/phpunit/api/v3/ContributionTest.php
Simple merge