chore: Merge cleanup

packages/admin-ui/src/lib/core/src/common/introspection-result.ts

@@ -52,7 +52,6 @@ const result: PossibleTypesResultData = {
         ],
         SettleRefundResult: ['Refund', 'RefundStateTransitionError'],
         TransitionFulfillmentToStateResult: ['Fulfillment', 'FulfillmentStateTransitionError'],
-        ModifyOrderResult: ['Order'],
         RemoveOptionGroupFromProductResult: ['Product', 'ProductOptionInUseError'],
         CreatePromotionResult: ['Promotion', 'MissingConditionsError'],
         UpdatePromotionResult: ['Promotion', 'MissingConditionsError'],
@@ -82,10 +81,10 @@ const result: PossibleTypesResultData = {
             'Collection',
             'Customer',
             'Facet',
+            'Fulfillment',
             'HistoryEntry',
             'Job',
             'Order',
-            'Fulfillment',
             'PaymentMethod',
             'Product',
             'ProductVariant',

packages/core/src/api/schema/admin-api/order.api.graphql

@@ -217,5 +217,3 @@ union RefundOrderResult =
     | RefundStateTransitionError
 union SettleRefundResult = Refund | RefundStateTransitionError
 union TransitionFulfillmentToStateResult = Fulfillment | FulfillmentStateTransitionError
-union ModifyOrderResult =
-      Order

packages/core/src/service/helpers/order-calculator/order-calculator.spec.ts

@@ -285,7 +285,7 @@ describe('OrderCalculator', () => {
             await orderCalculator.applyPriceAdjustments(ctx, order, [promotion], order.lines[0]);
 
             expect(order.subTotal).toBe(5000);
-            expect(order.lines[0].adjustments.length).toBe(2);
+            expect(order.lines[0].adjustments.length).toBe(1);
             expect(order.lines[0].adjustments[0].description).toBe('50% off each item');
             expect(order.total).toBe(5000);
         });