@q2devel/q2-core 1.0.43 → 1.0.45

package/dist/api/checkout/Checkout.service.d.ts

@@ -1,10 +1,9 @@
 import { AxiosRequestConfig } from 'axios';
 import { CoreContext } from '../../context';
 import { Cart } from '../cart/CartService.types';
-import { CheckoutRequest, CreatePaymentRequest, ShippingMethod, UserCheckoutRequest } from './CheckoutService.types';
+import { CheckoutRequest, ShippingMethod, UserCheckoutRequest } from './CheckoutService.types';
 export declare const checkout: (ctx: CoreContext, order: string, config?: AxiosRequestConfig) => Promise<Cart>;
 export declare const updateOrderForCheckout: (ctx: CoreContext, order: string, request: CheckoutRequest | UserCheckoutRequest, config?: AxiosRequestConfig) => Promise<Cart>;
 export declare const approvePayment: (ctx: CoreContext, order: string, config?: AxiosRequestConfig) => Promise<any>;
-export declare const createPayment: (ctx: CoreContext, order: string, request: CreatePaymentRequest, config?: AxiosRequestConfig) => Promise<any>;
 export declare const getShippingMethods: (ctx: CoreContext, config?: AxiosRequestConfig) => Promise<ShippingMethod>;
 //# sourceMappingURL=Checkout.service.d.ts.map

package/dist/api/checkout/Checkout.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Checkout.service.d.ts","sourceRoot":"","sources":["../../../api/checkout/Checkout.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EACL,IAAI,EACL,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,cAAc,EACd,mBAAmB,EACpB,MAAM,yBAAyB,CAAC;AAQjC,eAAO,MAAM,QAAQ,GACnB,KAAK,WAAW,EAChB,OAAO,MAAM,EACb,SAAQ,kBAAuB,KAC9B,OAAO,CAAC,IAAI,CAOd,CAAC;AAEF,eAAO,MAAM,sBAAsB,GACjC,KAAK,WAAW,EAChB,OAAO,MAAM,EACb,SAAS,eAAe,GAAG,mBAAmB,EAC9C,SAAQ,kBAAuB,KAC9B,OAAO,CAAC,IAAI,CAQd,CAAC;AAEF,eAAO,MAAM,cAAc,GACzB,KAAK,WAAW,EAChB,OAAO,MAAM,EACb,SAAQ,kBAAuB,KAC9B,OAAO,CAAC,GAAG,CAOb,CAAC;AAEF,eAAO,MAAM,aAAa,GACxB,KAAK,WAAW,EAChB,OAAO,MAAM,EACb,SAAS,oBAAoB,EAC7B,SAAQ,kBAAuB,KAC9B,OAAO,CAAC,GAAG,CAQb,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAC7B,KAAK,WAAW,EAChB,SAAQ,kBAAuB,KAC9B,OAAO,CAAC,cAAc,CAQxB,CAAC"}
+{"version":3,"file":"Checkout.service.d.ts","sourceRoot":"","sources":["../../../api/checkout/Checkout.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EACL,IAAI,EACL,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,eAAe,EACf,cAAc,EACd,mBAAmB,EACpB,MAAM,yBAAyB,CAAC;AAQjC,eAAO,MAAM,QAAQ,GACnB,KAAK,WAAW,EAChB,OAAO,MAAM,EACb,SAAQ,kBAAuB,KAC9B,OAAO,CAAC,IAAI,CAOd,CAAC;AAEF,eAAO,MAAM,sBAAsB,GACjC,KAAK,WAAW,EAChB,OAAO,MAAM,EACb,SAAS,eAAe,GAAG,mBAAmB,EAC9C,SAAQ,kBAAuB,KAC9B,OAAO,CAAC,IAAI,CAQd,CAAC;AAEF,eAAO,MAAM,cAAc,GACzB,KAAK,WAAW,EAChB,OAAO,MAAM,EACb,SAAQ,kBAAuB,KAC9B,OAAO,CAAC,GAAG,CAOb,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAC7B,KAAK,WAAW,EAChB,SAAQ,kBAAuB,KAC9B,OAAO,CAAC,cAAc,CAQxB,CAAC"}

package/dist/api/checkout/Checkout.service.js

@@ -18,11 +18,6 @@ export const approvePayment = async (ctx, order, config = {}) => {
     const { data } = await ctx.axios.get(url, { ...config, headers: getHeaders(ctx, config.headers) });
     return data;
 };
-export const createPayment = async (ctx, order, request, config = {}) => {
-    const url = `/jsonapi/checkout/${order}/payment`;
-    const { data } = await ctx.axios.post(url, request, { ...config, headers: getHeaders(ctx, config.headers) });
-    return data;
-};
 export const getShippingMethods = async (ctx, config = {}) => {
     const prefix = ctx.locale !== ctx.defaultLocale ? `/${ctx.locale}` : '';
     const url = `${prefix}/jsonapi/commerce_shipping_method/commerce_shipping_method`;

package/dist/api/checkout/CheckoutService.types.d.ts

@@ -22,13 +22,9 @@ type CheckoutRequestWithoutShippingAndContact = Omit<CheckoutRequest, 'shipping_
 export type UserCheckoutRequest = CheckoutRequestWithoutShippingAndContact & {
     user_id: string;
 };
-export type CreatePaymentRequest = {
+export type CardPaymentResponse = {
     data: {
-        type: string;
-        attributes: {
-            capture: boolean;
-            [key: string]: any;
-        };
+        payment_url: string;
     };
 };
 export type ShippingMethod = {

package/dist/api/checkout/CheckoutService.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CheckoutService.types.d.ts","sourceRoot":"","sources":["../../../api/checkout/CheckoutService.types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,eAAe,GAAG;IAC1B,IAAI,EAAE;QACF,IAAI,EAAE,yBAAyB,CAAA;QAC/B,UAAU,EAAE;YACR,KAAK,EAAE,WAAW,GAAG,UAAU,CAAA;SAClC,CAAA;KACJ,CAAC;IACF,gBAAgB,EAAE;QACd,YAAY,EAAE,MAAM,CAAA;QACpB,QAAQ,EAAE,MAAM,CAAA;QAChB,WAAW,EAAE,MAAM,CAAA;QACnB,aAAa,EAAE,MAAM,CAAA;QACrB,UAAU,EAAE,MAAM,CAAA;QAClB,WAAW,EAAE,MAAM,CAAA;KACtB,CAAC;IACF,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,eAAe,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,KAAK,wCAAwC,GAAG,IAAI,CAAC,eAAe,EAAE,kBAAkB,GAAG,OAAO,GAAG,OAAO,CAAC,CAAA;AAE7G,MAAM,MAAM,mBAAmB,GAAG,wCAAwC,GAAG;IAC3E,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IAC/B,IAAI,EAAE;QACF,IAAI,EAAE,MAAM,CAAA;QACZ,UAAU,EAAE;YACR,OAAO,EAAE,OAAO,CAAA;YAChB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;SACrB,CAAA;KACJ,CAAA;CACJ,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IACzB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE;QACR,IAAI,EAAE,MAAM,CAAA;QACZ,mCAAmC,EAAE,MAAM,CAAA;QAC3C,MAAM,EAAE;YACJ,gBAAgB,EAAE,MAAM,CAAA;YACxB,2BAA2B,EAAE;gBACzB,UAAU,EAAE,MAAM,CAAA;gBAClB,gBAAgB,EAAE,MAAM,CAAA;gBACxB,WAAW,EAAE;oBACT,MAAM,EAAE,MAAM,CAAA;oBACd,aAAa,EAAE,MAAM,CAAA;iBACxB,CAAA;gBACD,QAAQ,EAAE,MAAM,EAAE,CAAA;gBAClB,oBAAoB,EAAE,MAAM,CAAA;gBAC5B,QAAQ,EAAE,MAAM,CAAA;aACnB,CAAA;SACJ,CAAA;QACD,MAAM,EAAE,OAAO,CAAA;KAClB,CAAA;CACJ,CAAA"}
+{"version":3,"file":"CheckoutService.types.d.ts","sourceRoot":"","sources":["../../../api/checkout/CheckoutService.types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,eAAe,GAAG;IAC1B,IAAI,EAAE;QACF,IAAI,EAAE,yBAAyB,CAAA;QAC/B,UAAU,EAAE;YACR,KAAK,EAAE,WAAW,GAAG,UAAU,CAAA;SAClC,CAAA;KACJ,CAAC;IACF,gBAAgB,EAAE;QACd,YAAY,EAAE,MAAM,CAAA;QACpB,QAAQ,EAAE,MAAM,CAAA;QAChB,WAAW,EAAE,MAAM,CAAA;QACnB,aAAa,EAAE,MAAM,CAAA;QACrB,UAAU,EAAE,MAAM,CAAA;QAClB,WAAW,EAAE,MAAM,CAAA;KACtB,CAAC;IACF,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,eAAe,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,KAAK,wCAAwC,GAAG,IAAI,CAAC,eAAe,EAAE,kBAAkB,GAAG,OAAO,GAAG,OAAO,CAAC,CAAA;AAE7G,MAAM,MAAM,mBAAmB,GAAG,wCAAwC,GAAG;IAC3E,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG;IAC9B,IAAI,EAAE;QACF,WAAW,EAAE,MAAM,CAAA;KACtB,CAAA;CACJ,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IACzB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE;QACR,IAAI,EAAE,MAAM,CAAA;QACZ,mCAAmC,EAAE,MAAM,CAAA;QAC3C,MAAM,EAAE;YACJ,gBAAgB,EAAE,MAAM,CAAA;YACxB,2BAA2B,EAAE;gBACzB,UAAU,EAAE,MAAM,CAAA;gBAClB,gBAAgB,EAAE,MAAM,CAAA;gBACxB,WAAW,EAAE;oBACT,MAAM,EAAE,MAAM,CAAA;oBACd,aAAa,EAAE,MAAM,CAAA;iBACxB,CAAA;gBACD,QAAQ,EAAE,MAAM,EAAE,CAAA;gBAClB,oBAAoB,EAAE,MAAM,CAAA;gBAC5B,QAAQ,EAAE,MAAM,CAAA;aACnB,CAAA;SACJ,CAAA;QACD,MAAM,EAAE,OAAO,CAAA;KAClB,CAAA;CACJ,CAAA"}

package/dist/api/getTerms.d.ts

@@ -3,8 +3,9 @@ import { Term } from '../types/Term';
 type GetTermsInput = {
     categoryId?: string[];
     include?: string[];
+    sortField?: string;
     mapFn?: (base: Term, raw: any) => Term | Promise<Term>;
 };
-export declare const getTerms: (ctx: CoreContext, { categoryId, include, mapFn }: GetTermsInput) => Promise<Term[]>;
+export declare const getTerms: (ctx: CoreContext, { categoryId, include, sortField, mapFn, }: GetTermsInput) => Promise<Term[]>;
 export {};
 //# sourceMappingURL=getTerms.d.ts.map

package/dist/api/getTerms.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getTerms.d.ts","sourceRoot":"","sources":["../../api/getTerms.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAIrC,KAAK,aAAa,GAAG;IACnB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACxD,CAAC;AAEF,eAAO,MAAM,QAAQ,GACnB,KAAK,WAAW,EAChB,gCAA0I,aAAa,KACtJ,OAAO,CAAC,IAAI,EAAE,CAuEhB,CAAC"}
+{"version":3,"file":"getTerms.d.ts","sourceRoot":"","sources":["../../api/getTerms.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AAIpC,KAAK,aAAa,GAAG;IACjB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CACzD,CAAA;AAED,eAAO,MAAM,QAAQ,GACjB,KAAK,WAAW,EAChB,4CAWG,aAAa,KACjB,OAAO,CAAC,IAAI,EAAE,CA8EhB,CAAA"}

package/dist/api/getTerms.js

@@ -1,7 +1,14 @@
 // api/getTerms.ts
 import { DrupalJsonApiParams } from 'drupal-jsonapi-params';
 import mapIncludedResources from '../utils/mapIncludedResources';
-export const getTerms = async (ctx, { categoryId, include = ['parent', 'field_icon', 'field_icon.field_media_image', 'field_image', 'field_image.field_media_image'], mapFn }) => {
+export const getTerms = async (ctx, { categoryId, include = [
+    'parent',
+    'field_icon',
+    'field_icon.field_media_image',
+    'field_image',
+    'field_image.field_media_image',
+], sortField = 'name', // default fallback
+mapFn, }) => {
     const cacheKey = ['terms', ctx.locale, ...(categoryId ?? []), ...(include ?? [])].join(':');
     const cached = await ctx.getCache?.(cacheKey);
     if (cached)
@@ -12,8 +19,10 @@ export const getTerms = async (ctx, { categoryId, include = ['parent', 'field_ic
     const params = new DrupalJsonApiParams()
         .addInclude(include)
         .addFilter('langcode', ctx.locale)
-        .addPageLimit(50)
-        .addSort("weight");
+        .addPageLimit(50);
+    if (sortField) {
+        params.addSort(sortField);
+    }
     if (categoryId) {
         params.addFilter('drupal_internal__tid', categoryId, 'IN');
     }
@@ -50,8 +59,12 @@ export const getTerms = async (ctx, { categoryId, include = ['parent', 'field_ic
             name: item.name,
             description: item.description?.processed ?? '',
             parent: item.parent?.[0],
-            icon: item?.field_icon?.field_media_image.uri?.url ? ctx.makeAbsoluteUrl(item.field_icon.field_media_image.uri.url) : undefined,
-            image: item?.field_image?.field_media_image.uri?.url ? ctx.makeAbsoluteUrl(item.field_image.field_media_image.uri.url) : undefined,
+            icon: item?.field_icon?.field_media_image.uri?.url
+                ? ctx.makeAbsoluteUrl(item.field_icon.field_media_image.uri.url)
+                : undefined,
+            image: item?.field_image?.field_media_image.uri?.url
+                ? ctx.makeAbsoluteUrl(item.field_image.field_media_image.uri.url)
+                : undefined,
         };
         return mapFn ? await mapFn(base, item) : base;
     }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@q2devel/q2-core",
-  "version": "1.0.43",
+  "version": "1.0.45",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {