@unchainedshop/api 4.0.0-rc.14 → 4.0.0-rc.15

package/lib/schema/types/payment.js

@@ -7,11 +7,6 @@ export default [
     }
 
     enum PaymentProviderType {
-      """
-      Card
-      """
-      CARD
-
       """
       Invoice
       """

package/lib/schema/types/payment.js.map

@@ -1 +1 @@
-{"version":3,"file":"payment.js","sourceRoot":"","sources":["../../../src/schema/types/payment.ts"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0Db;CACF,CAAC"}
+{"version":3,"file":"payment.js","sourceRoot":"","sources":["../../../src/schema/types/payment.ts"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqDb;CACF,CAAC"}

package/lib/schema/types/product/bundle-product.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bundle-product.d.ts","sourceRoot":"","sources":["../../../../src/schema/types/product/bundle-product.ts"],"names":[],"mappings":";AAAA,wBAuCE"}
+{"version":3,"file":"bundle-product.d.ts","sourceRoot":"","sources":["../../../../src/schema/types/product/bundle-product.ts"],"names":[],"mappings":";AAAA,wBAkDE"}

package/lib/schema/types/product/bundle-product.js

@@ -13,14 +13,18 @@ export default [
       published: DateTime
       media(limit: Int = 10, offset: Int = 0, tags: [LowerCaseString!]): [ProductMedia!]!
       texts(forceLocale: Locale): ProductTexts
+      catalogPrice(quantity: Int = 1, currencyCode: String): Price
+      leveledCatalogPrices(currencyCode: String): [PriceLevel!]!
+      simulatedPrice(
+        currencyCode: String
+        useNetPrice: Boolean = false
+        quantity: Int = 1
+        configuration: [ProductConfigurationParameterInput!]
+      ): Price @cacheControl(scope: PRIVATE, maxAge: 10)
+      salesUnit: String
+      salesQuantityPerUnit: String
+      defaultOrderQuantity: Int
       bundleItems: [ProductBundleItem!]
-      reviews(
-        limit: Int = 10
-        offset: Int = 0
-        sort: [SortOptionInput!]
-        queryString: String
-      ): [ProductReview!]!
-      reviewsCount(queryString: String): Int!
       assortmentPaths: [ProductAssortmentPath!]!
       proxies: [ConfigurableOrBundleProduct!]!
       siblings(
@@ -29,6 +33,13 @@ export default [
         offset: Int = 0
         includeInactive: Boolean = false
       ): [Product!]!
+      reviews(
+        limit: Int = 10
+        offset: Int = 0
+        sort: [SortOptionInput!]
+        queryString: String
+      ): [ProductReview!]!
+      reviewsCount(queryString: String): Int!
     }
 
     type ProductBundleItem @cacheControl(maxAge: 180) {

package/lib/schema/types/product/bundle-product.js.map

@@ -1 +1 @@
-{"version":3,"file":"bundle-product.js","sourceRoot":"","sources":["../../../../src/schema/types/product/bundle-product.ts"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCb;CACF,CAAC"}
+{"version":3,"file":"bundle-product.js","sourceRoot":"","sources":["../../../../src/schema/types/product/bundle-product.ts"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDb;CACF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/api",
-  "version": "4.0.0-rc.14",
+  "version": "4.0.0-rc.15",
   "main": "lib/api-index.js",
   "types": "lib/api-index.d.ts",
   "type": "module",
@@ -87,11 +87,11 @@
     }
   },
   "dependencies": {
-    "@unchainedshop/core": "^4.0.0-rc.14",
-    "@unchainedshop/events": "^4.0.0-rc.14",
-    "@unchainedshop/logger": "^4.0.0-rc.14",
-    "@unchainedshop/roles": "^4.0.0-rc.14",
-    "@unchainedshop/utils": "^4.0.0-rc.14",
+    "@unchainedshop/core": "^4.0.0-rc.15",
+    "@unchainedshop/events": "^4.0.0-rc.15",
+    "@unchainedshop/logger": "^4.0.0-rc.15",
+    "@unchainedshop/roles": "^4.0.0-rc.15",
+    "@unchainedshop/utils": "^4.0.0-rc.15",
     "accounting": "0.4.1",
     "dataloader": "^2.2.3",
     "expiry-map": "^2.0.0",

package/src/express/createERCMetadataMiddleware.ts

@@ -1,4 +1,3 @@
-import path from 'node:path';
 import { createLogger } from '@unchainedshop/logger';
 import { Context } from '../context.js';
 import { Request, RequestHandler } from 'express';
@@ -25,16 +24,20 @@ const ercMetadataMiddleware: RequestHandler = async (
 
     const { services, modules, loaders, locale } = req.unchainedContext;
     const url = new URL(req.url, ROOT_URL);
-    const parsedPath = path.parse(url.pathname);
 
-    if (parsedPath.ext !== '.json') throw new Error('Invalid ERC Metadata URI');
+    // Replace path.parse with URL/string methods
+    const pathname = url.pathname;
+    if (!pathname.toLowerCase().endsWith('.json')) throw new Error('Invalid ERC Metadata URI');
+
+    const fileName = pathname.split('/').pop();
+    const chainTokenId = fileName.slice(0, fileName.lastIndexOf('.'));
 
     const [, productId, localeOrTokenFilename, tokenFileName] = url.pathname.split('/');
 
     const product = await loaders.productLoader.load({ productId });
 
     const [token] = await modules.warehousing.findTokens({
-      chainTokenId: parsedPath.name,
+      chainTokenId,
       contractAddress: product?.tokenization?.contractAddress,
     });
 
@@ -49,11 +52,10 @@ const ercMetadataMiddleware: RequestHandler = async (
     }
 
     const body = JSON.stringify(ercMetadata);
-    res.writeHead(200, {
-      'Content-Length': Buffer.byteLength(body),
-      'Content-Type': 'text/plain',
-    });
-    res.end(body);
+    res.status(200);
+    res.setHeader('Content-Type', 'application/json');
+    res.setHeader('Content-Length', new TextEncoder().encode(body).length);
+    return res.send(body);
   } catch (e) {
     logger.error(e.message);
     res.writeHead(503);

package/src/fastify/bulkImportHandler.ts

@@ -46,7 +46,7 @@ const bulkImportHandler: RouteHandlerMethod = async (
 
     const body = JSON.stringify(work);
     res.status(200);
-    res.header('Content-Length', Buffer.byteLength(body));
+    res.header('Content-Length', new TextEncoder().encode(body).length);
     res.header('Content-Type', 'application/json');
     return res.send(body);
   } catch (e) {

package/src/fastify/ercMetadataHandler.ts

@@ -41,7 +41,7 @@ const ercMetadataHandler: RouteHandlerMethod = async (
 
     const body = JSON.stringify(ercMetadata);
     res.status(200);
-    res.header('Content-Length', Buffer.byteLength(body));
+    res.header('Content-Length', new TextEncoder().encode(body).length);
     res.header('Content-Type', 'application/json');
     return res.send(body);
   } catch (e) {

package/src/fastify/tempUploadHandler.ts

@@ -39,7 +39,7 @@ const tempUploadHandler: RouteHandlerMethod = async (
     const url = context.modules.files.normalizeUrl(rawUrl, {});
     const body = JSON.stringify({ fileId: file._id, url, expires: expires.toISOString() });
     res.status(200);
-    res.header('Content-Length', Buffer.byteLength(body));
+    res.header('Content-Length', new TextEncoder().encode(body).length);
     res.header('Content-Type', 'application/json');
     return res.send(body);
   } catch (e) {

package/src/resolvers/mutations/index.ts

@@ -138,7 +138,6 @@ import removePaymentCredentials from './payment/removePaymentCredentials.js';
 import updateOrderDeliveryShipping from './orders/updateOrderDeliveryShipping.js';
 import updateOrderDeliveryPickUp from './orders/updateOrderDeliveryPickUp.js';
 import updateOrderPaymentGeneric from './orders/updateOrderPaymentGeneric.js';
-import updateOrderPaymentCard from './orders/updateOrderPaymentCard.js';
 import updateOrderPaymentInvoice from './orders/updateOrderPaymentInvoice.js';
 import signPaymentProviderForCredentialRegistration from './payment/signPaymentProviderForCredentialRegistration.js';
 import signPaymentProviderForCheckout from './orders/signPaymentProviderForCheckout.js';
@@ -153,6 +152,10 @@ import rejectOrder from './orders/rejectOrder.js';
 import removePushSubscription from './users/removePushSubscription.js';
 import addPushSubscription from './users/addPushSubscription.js';
 import removeUserProductReviews from './users/removeUserProductReviews.js';
+import updateCartDeliveryPickUp from './orders/updateCartDeliveryPickUp.js';
+import updateCartDeliveryShipping from './orders/updateCartDeliveryShipping.js';
+import updateCartPaymentGeneric from './orders/updateCartPaymentGeneric.js';
+import updateCartPaymentInvoice from './orders/updateCartPaymentInvoice.js';
 
 export default {
   logout: acl(actions.logout)(logout),
@@ -244,12 +247,15 @@ export default {
   updateCartItem: acl(actions.updateOrderItem)(updateCartItem),
   removeCartItem: acl(actions.updateOrderItem)(removeCartItem),
   removeCartDiscount: acl(actions.updateOrderDiscount)(removeCartDiscount),
+  updateCartDeliveryPickUp: acl(actions.updateCart)(updateCartDeliveryPickUp),
+  updateCartDeliveryShipping: acl(actions.updateCart)(updateCartDeliveryShipping),
+  updateCartPaymentGeneric: acl(actions.updateCart)(updateCartPaymentGeneric),
+  updateCartPaymentInvoice: acl(actions.updateCart)(updateCartPaymentInvoice),
   setOrderPaymentProvider: acl(actions.updateOrder)(setOrderPaymentProvider),
   setOrderDeliveryProvider: acl(actions.updateOrder)(setOrderDeliveryProvider),
   updateOrderDeliveryShipping: acl(actions.updateOrderDelivery)(updateOrderDeliveryShipping),
   updateOrderDeliveryPickUp: acl(actions.updateOrderDelivery)(updateOrderDeliveryPickUp),
   updateOrderPaymentGeneric: acl(actions.updateOrderPayment)(updateOrderPaymentGeneric),
-  updateOrderPaymentCard: acl(actions.updateOrderPayment)(updateOrderPaymentCard),
   updateOrderPaymentInvoice: acl(actions.updateOrderPayment)(updateOrderPaymentInvoice),
   removeOrder: acl(actions.updateOrder)(removeOrder),
   confirmOrder: acl(actions.markOrderConfirmed)(confirmOrder),

package/src/resolvers/mutations/orders/updateCart.ts

@@ -19,7 +19,7 @@ export default async function updateCart(root: never, params: UpdateCartParams,
 
   log('mutation updateCart', { userId });
 
-  let order = await services.orders.findOrInitCart({
+  const order = await services.orders.findOrInitCart({
     orderId,
     user,
     countryCode: context.countryCode,
@@ -28,23 +28,23 @@ export default async function updateCart(root: never, params: UpdateCartParams,
   if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
 
   if (meta) {
-    order = await modules.orders.updateContext(order._id, meta);
+    await modules.orders.updateContext(order._id, meta);
   }
 
   if (billingAddress) {
-    order = await modules.orders.updateBillingAddress(order._id, billingAddress);
+    await modules.orders.updateBillingAddress(order._id, billingAddress);
   }
 
   if (contact) {
-    order = await modules.orders.updateContact(order._id, contact);
+    await modules.orders.updateContact(order._id, contact);
   }
 
   if (paymentProviderId) {
-    order = await modules.orders.setPaymentProvider(order._id, paymentProviderId);
+    await modules.orders.setPaymentProvider(order._id, paymentProviderId);
   }
 
   if (deliveryProviderId) {
-    order = await modules.orders.setDeliveryProvider(order._id, deliveryProviderId);
+    await modules.orders.setDeliveryProvider(order._id, deliveryProviderId);
   }
 
   // Recalculate, then return

package/src/resolvers/mutations/orders/updateCartDeliveryPickUp.ts

@@ -0,0 +1,51 @@
+import { Context } from '../../../context.js';
+import { DeliveryProviderType } from '@unchainedshop/core-delivery';
+import { log } from '@unchainedshop/logger';
+import {
+  InvalidIdError,
+  OrderDeliveryTypeError,
+  OrderNotFoundError,
+  OrderWrongStatusError,
+} from '../../../errors.js';
+
+export default async function updateCartDeliveryPickUp(
+  root: never,
+  params: { orderId: string; deliveryProviderId: string; orderPickUpLocationId: string; meta: any },
+  context: Context,
+) {
+  const { modules, services, userId, user } = context;
+  const { orderId, deliveryProviderId, orderPickUpLocationId, meta } = params;
+  log(`mutation updateCartDeliveryPickUp provider ${deliveryProviderId}`, {
+    userId,
+  });
+
+  if (!deliveryProviderId) throw new InvalidIdError({ deliveryProviderId });
+
+  let order = await services.orders.findOrInitCart({
+    orderId,
+    user,
+    countryCode: context.countryCode,
+  });
+  if (!order) throw new OrderNotFoundError({ orderId });
+  if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
+
+  const provider = await modules.delivery.findProvider({
+    deliveryProviderId,
+  });
+  const deliveryProviderType = provider?.type;
+
+  if (deliveryProviderType !== DeliveryProviderType.PICKUP)
+    throw new OrderDeliveryTypeError({
+      orderId: order._id,
+      received: deliveryProviderType,
+      required: DeliveryProviderType.PICKUP,
+    });
+
+  order = (await modules.orders.setDeliveryProvider(order._id, deliveryProviderId)) || order;
+
+  await modules.orders.deliveries.updateContext(order.deliveryId, {
+    orderPickUpLocationId,
+    meta,
+  });
+  return services.orders.updateCalculation(order._id);
+}

package/src/resolvers/mutations/orders/updateCartDeliveryShipping.ts

@@ -0,0 +1,51 @@
+import { Context } from '../../../context.js';
+import { DeliveryProviderType } from '@unchainedshop/core-delivery';
+import { log } from '@unchainedshop/logger';
+import {
+  InvalidIdError,
+  OrderDeliveryTypeError,
+  OrderNotFoundError,
+  OrderWrongStatusError,
+} from '../../../errors.js';
+
+export default async function updateCartDeliveryShipping(
+  root: never,
+  params: { orderId: string; deliveryProviderId: string; address: any; meta: any },
+  context: Context,
+) {
+  const { modules, services, userId, user } = context;
+  const { orderId, deliveryProviderId, address, meta } = params;
+  log(`mutation updateCartDeliveryShipping provider ${deliveryProviderId}`, {
+    userId,
+  });
+
+  if (!deliveryProviderId) throw new InvalidIdError({ deliveryProviderId });
+
+  let order = await services.orders.findOrInitCart({
+    orderId,
+    user,
+    countryCode: context.countryCode,
+  });
+  if (!order) throw new OrderNotFoundError({ orderId });
+  if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
+
+  const provider = await modules.delivery.findProvider({
+    deliveryProviderId,
+  });
+  const deliveryProviderType = provider?.type;
+
+  if (deliveryProviderType !== DeliveryProviderType.SHIPPING)
+    throw new OrderDeliveryTypeError({
+      orderId: order._id,
+      received: deliveryProviderType,
+      required: DeliveryProviderType.SHIPPING,
+    });
+
+  order = (await modules.orders.setDeliveryProvider(order._id, deliveryProviderId)) || order;
+
+  await modules.orders.deliveries.updateContext(order.deliveryId, {
+    address,
+    meta,
+  });
+  return services.orders.updateCalculation(order._id);
+}

package/src/resolvers/mutations/orders/updateCartPaymentGeneric.ts

@@ -0,0 +1,50 @@
+import { Context } from '../../../context.js';
+import { PaymentProviderType } from '@unchainedshop/core-payment';
+import { log } from '@unchainedshop/logger';
+import {
+  InvalidIdError,
+  OrderNotFoundError,
+  OrderPaymentTypeError,
+  OrderWrongStatusError,
+} from '../../../errors.js';
+
+export default async function updateCartPaymentGeneric(
+  root: never,
+  params: { orderId: string; paymentProviderId: string; meta?: any },
+  context: Context,
+) {
+  const { modules, services, userId, user } = context;
+  const { orderId, paymentProviderId, meta } = params;
+  log(`mutation updateCartPaymentGeneric provider ${paymentProviderId}`, {
+    userId,
+  });
+
+  if (!paymentProviderId) throw new InvalidIdError({ paymentProviderId });
+
+  let order = await services.orders.findOrInitCart({
+    orderId,
+    user,
+    countryCode: context.countryCode,
+  });
+  if (!order) throw new OrderNotFoundError({ orderId });
+  if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
+
+  const provider = await modules.payment.paymentProviders.findProvider({
+    paymentProviderId,
+  });
+  const paymentProviderType = provider?.type;
+
+  if (paymentProviderType !== PaymentProviderType.GENERIC)
+    throw new OrderPaymentTypeError({
+      orderId: order._id,
+      received: paymentProviderType,
+      required: PaymentProviderType.GENERIC,
+    });
+
+  order = (await modules.orders.setPaymentProvider(order._id, paymentProviderId)) || order;
+
+  await modules.orders.payments.updateContext(order.paymentId, {
+    meta,
+  });
+  return services.orders.updateCalculation(order._id);
+}

package/src/resolvers/mutations/orders/updateCartPaymentInvoice.ts

@@ -0,0 +1,50 @@
+import { Context } from '../../../context.js';
+import { PaymentProviderType } from '@unchainedshop/core-payment';
+import { log } from '@unchainedshop/logger';
+import {
+  InvalidIdError,
+  OrderNotFoundError,
+  OrderPaymentTypeError,
+  OrderWrongStatusError,
+} from '../../../errors.js';
+
+export default async function updateCartPaymentInvoice(
+  root: never,
+  params: { orderId: string; paymentProviderId: string; meta?: any },
+  context: Context,
+) {
+  const { modules, services, userId, user } = context;
+  const { orderId, paymentProviderId, meta } = params;
+  log(`mutation updateCartPaymentInvoice provider ${paymentProviderId}`, {
+    userId,
+  });
+
+  if (!paymentProviderId) throw new InvalidIdError({ paymentProviderId });
+
+  let order = await services.orders.findOrInitCart({
+    orderId,
+    user,
+    countryCode: context.countryCode,
+  });
+  if (!order) throw new OrderNotFoundError({ orderId });
+  if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
+
+  const provider = await modules.payment.paymentProviders.findProvider({
+    paymentProviderId,
+  });
+  const paymentProviderType = provider?.type;
+
+  if (paymentProviderType !== PaymentProviderType.INVOICE)
+    throw new OrderPaymentTypeError({
+      orderId: order._id,
+      received: paymentProviderType,
+      required: PaymentProviderType.INVOICE,
+    });
+
+  order = (await modules.orders.setPaymentProvider(order._id, paymentProviderId)) || order;
+
+  await modules.orders.payments.updateContext(order.paymentId, {
+    meta,
+  });
+  return services.orders.updateCalculation(order._id);
+}

package/src/resolvers/mutations/products/updateProductCommerce.ts

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
-import { ProductCommerce } from '@unchainedshop/core-products';
-import { ProductNotFoundError, InvalidIdError } from '../../../errors.js';
+import { ProductCommerce, ProductTypes } from '@unchainedshop/core-products';
+import { ProductNotFoundError, InvalidIdError, ProductWrongTypeError } from '../../../errors.js';
 import { Context } from '../../../context.js';
 
 export default async function updateProductCommerce(
@@ -12,8 +12,16 @@ export default async function updateProductCommerce(
 
   if (!productId) throw new InvalidIdError({ productId });
 
-  if (!(await modules.products.productExists({ productId })))
-    throw new ProductNotFoundError({ productId });
+  const product = await modules.products.findProduct({ productId });
+  if (!product) throw new ProductNotFoundError({ productId });
+
+  if (product.type === ProductTypes.ConfigurableProduct) {
+    throw new ProductWrongTypeError({
+      productId: productId,
+      received: product.type,
+      required: { not: ProductTypes.ConfigurableProduct },
+    });
+  }
 
   await modules.products.update(productId, { commerce });
 

package/src/resolvers/type/order/order-payment-types.ts

@@ -5,7 +5,6 @@ import { objectInvert } from '@unchainedshop/utils';
 
 const OrderPaymentMap = {
   OrderPaymentGeneric: PaymentProviderType.GENERIC,
-  OrderPaymentCard: PaymentProviderType.CARD,
   OrderPaymentInvoice: PaymentProviderType.INVOICE,
 };
 

package/src/resolvers/type/product/product-bundle-types.ts

@@ -1,8 +1,8 @@
 import { ProductBundleItem } from '@unchainedshop/core-products';
-import { Product } from './product-types.js';
+import { PlanProduct } from './product-plan-types.js';
 
 export const BundleProduct = {
-  ...Product,
+  ...PlanProduct,
 
   bundleItems(product): ProductBundleItem[] {
     return product.bundleItems ? product.bundleItems : [];

package/src/schema/mutation.ts

@@ -226,12 +226,44 @@ export default [
       doesn’t exists new delivery provider will be created with the provided ID.
       """
       setOrderDeliveryProvider(orderId: ID!, deliveryProviderId: ID!): Order!
+        @deprecated(reason: "Use updateCart or updateCartDelivery* mutations instead")
 
       """
       Change the payment method/provider to an order. If the payment provider
       doesn’t exists new payment provider will be created with the provided ID.
       """
       setOrderPaymentProvider(orderId: ID!, paymentProviderId: ID!): Order!
+        @deprecated(reason: "Use updateCart or updateCartPayment* mutations instead")
+
+      """
+      Update the cart by changing the delivery provider and using a shipping specific configuration
+      """
+      updateCartDeliveryShipping(
+        orderId: ID
+        deliveryProviderId: ID!
+        address: AddressInput
+        meta: JSON
+      ): Order!
+
+      """
+      Update the cart by changing the delivery provider and using a pick up specific configuration
+      """
+      updateCartDeliveryPickUp(
+        orderId: ID
+        deliveryProviderId: ID!
+        orderPickUpLocationId: ID!
+        meta: JSON
+      ): Order!
+
+      """
+      Update the cart by changing the payment provider and using an invoice-type specific configuration
+      """
+      updateCartPaymentInvoice(orderId: ID, paymentProviderId: ID!, meta: JSON): Order!
+
+      """
+      Update the cart by changing the payment provider and using a generic specific configuration
+      """
+      updateCartPaymentGeneric(orderId: ID, paymentProviderId: ID!, meta: JSON): Order!
 
       """
       Update a Shipping Delivery Provider's specific configuration
@@ -240,7 +272,7 @@ export default [
         orderDeliveryId: ID!
         address: AddressInput
         meta: JSON
-      ): OrderDeliveryShipping!
+      ): OrderDeliveryShipping! @deprecated(reason: "Use updateCartDeliveryShipping instead")
 
       """
       Update a Pick Up Delivery Provider's specific configuration
@@ -249,22 +281,19 @@ export default [
         orderDeliveryId: ID!
         orderPickUpLocationId: ID!
         meta: JSON
-      ): OrderDeliveryPickUp!
-
-      """
-      Update a Card Payment Provider's specific configuration
-      """
-      updateOrderPaymentCard(orderPaymentId: ID!, meta: JSON): OrderPaymentCard!
+      ): OrderDeliveryPickUp! @deprecated(reason: "Use updateCartDeliveryPickUp instead")
 
       """
       Update an Invoice Payment Provider's specific configuration
       """
       updateOrderPaymentInvoice(orderPaymentId: ID!, meta: JSON): OrderPaymentInvoice!
+        @deprecated(reason: "Use updateCartPaymentInvoice instead")
 
       """
       Update a Generic Payment Provider's specific configuration
       """
       updateOrderPaymentGeneric(orderPaymentId: ID!, meta: JSON): OrderPaymentGeneric!
+        @deprecated(reason: "Use updateCartPaymentGeneric instead")
 
       """
       Remove an order while it's still open

package/src/schema/types/payment.ts

@@ -7,11 +7,6 @@ export default [
     }
 
     enum PaymentProviderType {
-      """
-      Card
-      """
-      CARD
-
       """
       Invoice
       """

package/src/schema/types/product/bundle-product.ts

@@ -13,14 +13,18 @@ export default [
       published: DateTime
       media(limit: Int = 10, offset: Int = 0, tags: [LowerCaseString!]): [ProductMedia!]!
       texts(forceLocale: Locale): ProductTexts
+      catalogPrice(quantity: Int = 1, currencyCode: String): Price
+      leveledCatalogPrices(currencyCode: String): [PriceLevel!]!
+      simulatedPrice(
+        currencyCode: String
+        useNetPrice: Boolean = false
+        quantity: Int = 1
+        configuration: [ProductConfigurationParameterInput!]
+      ): Price @cacheControl(scope: PRIVATE, maxAge: 10)
+      salesUnit: String
+      salesQuantityPerUnit: String
+      defaultOrderQuantity: Int
       bundleItems: [ProductBundleItem!]
-      reviews(
-        limit: Int = 10
-        offset: Int = 0
-        sort: [SortOptionInput!]
-        queryString: String
-      ): [ProductReview!]!
-      reviewsCount(queryString: String): Int!
       assortmentPaths: [ProductAssortmentPath!]!
       proxies: [ConfigurableOrBundleProduct!]!
       siblings(
@@ -29,6 +33,13 @@ export default [
         offset: Int = 0
         includeInactive: Boolean = false
       ): [Product!]!
+      reviews(
+        limit: Int = 10
+        offset: Int = 0
+        sort: [SortOptionInput!]
+        queryString: String
+      ): [ProductReview!]!
+      reviewsCount(queryString: String): Int!
     }
 
     type ProductBundleItem @cacheControl(maxAge: 180) {