@passly-nl/data 1.0.0-rc.1 → 1.0.0-rc.10

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@passly-nl/data",
     "description": "API implementation for Passly.",
-    "version": "1.0.0-rc.1",
+    "version": "1.0.0-rc.10",
     "type": "module",
     "license": "MIT",
     "funding": "https://github.com/sponsors/basmilius",
@@ -50,15 +50,19 @@
         "./*": "./*"
     },
     "dependencies": {
-        "@basmilius/http-client": "^3.8.0",
+        "@basmilius/http-client": "^3.10.0",
         "@flux-ui/types": "^3.0.0-next.28",
         "@fortawesome/fontawesome-common-types": "^7.2.0",
-        "apexcharts": "^5.6.0",
+        "apexcharts": "^5.10.1",
         "luxon": "^3.7.2"
     },
     "devDependencies": {
         "@types/luxon": "^3.7.1",
-        "@typescript/native-preview": "^7.0.0-dev.20260227.1",
-        "tsdown": "^0.21.0-beta.2"
+        "@typescript/native-preview": "^7.0.0-dev.20260305.1",
+        "tsdown": "^0.21.0-beta.5"
+    },
+    "overrides": {
+        "@disabled-basmilius/http-client": "link:@basmilius/http-client",
+        "@disabled-flux-ui/types": "link:@flux-ui/types"
     }
 }

package/src/adapter/EventAdapter.ts

@@ -61,6 +61,7 @@ export class EventAdapter {
             optional(data.starts_on, DateTimeAdapter.parseDateTime),
             optional(data.ends_on, DateTimeAdapter.parseDateTime),
             data.field_address,
+            data.field_address_mode,
             data.field_birthdate,
             data.field_gender,
             data.field_phone_number,

package/src/adapter/MerchantDashboardAdapter.ts

@@ -1,6 +1,7 @@
 import { adapter, ForeignData } from '@basmilius/http-client';
 import { DateTimeAdapter, FileSystemAdapter } from '#data/adapter';
 import { MerchantDashboardKeyMetricsDto, MerchantDashboardUpcomingEventDto } from '#data/dto';
+import { optional } from '#data/util';
 
 @adapter
 export class MerchantDashboardAdapter {
@@ -18,7 +19,7 @@ export class MerchantDashboardAdapter {
             data.id,
             data.name,
             data.description,
-            FileSystemAdapter.parsePicture(data.header_file),
+            optional(data.header_file, FileSystemAdapter.parsePicture),
             data.status,
             DateTimeAdapter.parseDateTime(data.starts_on),
             data.tickets_sold,

package/src/adapter/PublicShopAdapter.ts

@@ -12,6 +12,7 @@ export class PublicShopAdapter {
             DateTimeAdapter.parseDateTime(data.starts_on),
             DateTimeAdapter.parseDateTime(data.ends_on),
             data.field_address,
+            data.field_address_mode,
             data.field_birthdate,
             data.field_gender,
             data.field_phone_number,

package/src/adapter/ServiceAdapter.ts

@@ -0,0 +1,13 @@
+import { adapter, type ForeignData } from '@basmilius/http-client';
+import { ServiceInfoDto } from '#data/dto';
+
+@adapter
+export class ServiceAdapter {
+    static parseInfo(data: ForeignData): ServiceInfoDto {
+        return new ServiceInfoDto(
+            data.connecting_ip,
+            data.country,
+            data.ray
+        );
+    }
+}

package/src/adapter/ShortlinkAdapter.ts

@@ -0,0 +1,17 @@
+import { adapter, type ForeignData } from '@basmilius/http-client';
+import { DateTimeAdapter } from '#data/adapter';
+import { ShortlinkDto } from '#data/dto';
+
+@adapter
+export class ShortlinkAdapter {
+    static parse(data: ForeignData): ShortlinkDto {
+        return new ShortlinkDto(
+            data.id,
+            data.identifier,
+            data.hits,
+            data.link,
+            data.target,
+            DateTimeAdapter.parseDateTime(data.createdOn)
+        );
+    }
+}

package/src/adapter/index.ts

@@ -15,6 +15,8 @@ export * from './ProductAdapter';
 export * from './PublicPayAdapter';
 export * from './PublicShopAdapter';
 export * from './ReservationAdapter';
+export * from './ServiceAdapter';
+export * from './ShortlinkAdapter';
 export * from './StatisticsAdapter';
 export * from './StatisticsBuyersAdapter';
 export * from './StatisticsEventsAdapter';

package/src/dto/event/ShopDto.ts

@@ -1,7 +1,7 @@
 import { dto } from '@basmilius/http-client';
 import type { DateTime } from 'luxon';
 import type { EventDto, MerchantDto, ShopDesignDto } from '#data/dto';
-import type { ShopFieldRequirement, ShopStatus } from '#data/types';
+import type { ShopAddressMode, ShopFieldRequirement, ShopStatus } from '#data/types';
 
 @dto
 export class ShopDto {
@@ -61,6 +61,14 @@ export class ShopDto {
         this.#fieldAddress = value;
     }
 
+    get fieldAddressMode(): ShopAddressMode {
+        return this.#fieldAddressMode;
+    }
+
+    set fieldAddressMode(value: ShopAddressMode) {
+        this.#fieldAddressMode = value;
+    }
+
     get fieldBirthdate(): ShopFieldRequirement {
         return this.#fieldBirthdate;
     }
@@ -124,6 +132,7 @@ export class ShopDto {
     #startsOn: DateTime | null;
     #endsOn: DateTime | null;
     #fieldAddress: ShopFieldRequirement;
+    #fieldAddressMode: ShopAddressMode;
     #fieldBirthdate: ShopFieldRequirement;
     #fieldGender: ShopFieldRequirement;
     #fieldPhoneNumber: ShopFieldRequirement;
@@ -132,7 +141,7 @@ export class ShopDto {
     #event: EventDto;
     #merchant: MerchantDto;
 
-    constructor(id: string, name: string, isPublished: boolean, password: string, startsOn: DateTime | null, endsOn: DateTime | null, fieldAddress: ShopFieldRequirement, fieldBirthdate: ShopFieldRequirement, fieldGender: ShopFieldRequirement, fieldPhoneNumber: ShopFieldRequirement, status: ShopStatus, design: ShopDesignDto, event: EventDto, merchant: MerchantDto) {
+    constructor(id: string, name: string, isPublished: boolean, password: string, startsOn: DateTime | null, endsOn: DateTime | null, fieldAddress: ShopFieldRequirement, fieldAddressMode: ShopAddressMode, fieldBirthdate: ShopFieldRequirement, fieldGender: ShopFieldRequirement, fieldPhoneNumber: ShopFieldRequirement, status: ShopStatus, design: ShopDesignDto, event: EventDto, merchant: MerchantDto) {
         this.#id = id;
         this.#name = name;
         this.#isPublished = isPublished;
@@ -140,6 +149,7 @@ export class ShopDto {
         this.#startsOn = startsOn;
         this.#endsOn = endsOn;
         this.#fieldAddress = fieldAddress;
+        this.#fieldAddressMode = fieldAddressMode;
         this.#fieldBirthdate = fieldBirthdate;
         this.#fieldGender = fieldGender;
         this.#fieldPhoneNumber = fieldPhoneNumber;

package/src/dto/index.ts

@@ -11,5 +11,7 @@ export * from './product';
 export * from './publicPay';
 export * from './publicShop';
 export * from './reservation';
+export * from './service';
+export * from './shortlink';
 export * from './statistics';
 export * from './ticket';

package/src/dto/publicShop/PublicShopDto.ts

@@ -1,7 +1,7 @@
 import { dto } from '@basmilius/http-client';
 import type { DateTime } from 'luxon';
 import type { PublicShopDesignDto, PublicShopElementDto, PublicShopEventDto, PublicShopMerchantDto } from '#data/dto';
-import type { ShopFieldRequirement } from '#data/types';
+import type { ShopAddressMode, ShopFieldRequirement } from '#data/types';
 
 @dto
 export class PublicShopDto {
@@ -45,6 +45,14 @@ export class PublicShopDto {
         this.#fieldAddress = value;
     }
 
+    get fieldAddressMode(): ShopAddressMode {
+        return this.#fieldAddressMode;
+    }
+
+    set fieldAddressMode(value: ShopAddressMode) {
+        this.#fieldAddressMode = value;
+    }
+
     get fieldBirthdate(): ShopFieldRequirement {
         return this.#fieldBirthdate;
     }
@@ -106,6 +114,7 @@ export class PublicShopDto {
     #startsOn: DateTime;
     #endsOn: DateTime;
     #fieldAddress: ShopFieldRequirement;
+    #fieldAddressMode: ShopAddressMode;
     #fieldBirthdate: ShopFieldRequirement;
     #fieldGender: ShopFieldRequirement;
     #fieldPhoneNumber: ShopFieldRequirement;
@@ -114,12 +123,13 @@ export class PublicShopDto {
     #event: PublicShopEventDto;
     #merchant: PublicShopMerchantDto;
 
-    constructor(id: string, name: string, startsOn: DateTime, endsOn: DateTime, fieldAddress: ShopFieldRequirement, fieldBirthdate: ShopFieldRequirement, fieldGender: ShopFieldRequirement, fieldPhoneNumber: ShopFieldRequirement, design: PublicShopDesignDto, elements: PublicShopElementDto[] | null, event: PublicShopEventDto, merchant: PublicShopMerchantDto) {
+    constructor(id: string, name: string, startsOn: DateTime, endsOn: DateTime, fieldAddress: ShopFieldRequirement, fieldAddressMode: ShopAddressMode, fieldBirthdate: ShopFieldRequirement, fieldGender: ShopFieldRequirement, fieldPhoneNumber: ShopFieldRequirement, design: PublicShopDesignDto, elements: PublicShopElementDto[] | null, event: PublicShopEventDto, merchant: PublicShopMerchantDto) {
         this.#id = id;
         this.#name = name;
         this.#startsOn = startsOn;
         this.#endsOn = endsOn;
         this.#fieldAddress = fieldAddress;
+        this.#fieldAddressMode = fieldAddressMode;
         this.#fieldBirthdate = fieldBirthdate;
         this.#fieldGender = fieldGender;
         this.#fieldPhoneNumber = fieldPhoneNumber;

package/src/dto/service/ServiceInfoDto.ts

@@ -0,0 +1,38 @@
+import { dto } from '@basmilius/http-client';
+
+@dto
+export class ServiceInfoDto {
+    get connectingIp(): string {
+        return this.#connectingIp;
+    }
+
+    set connectingIp(value: string) {
+        this.#connectingIp = value;
+    }
+
+    get country(): string | null {
+        return this.#country;
+    }
+
+    set country(value: string | null) {
+        this.#country = value;
+    }
+
+    get ray(): string | null {
+        return this.#ray;
+    }
+
+    set ray(value: string | null) {
+        this.#ray = value;
+    }
+
+    #connectingIp: string;
+    #country: string | null;
+    #ray: string | null;
+
+    constructor(connectingIp: string, country: string | null, ray: string | null) {
+        this.#connectingIp = connectingIp;
+        this.#country = country;
+        this.#ray = ray;
+    }
+}

package/src/dto/service/index.ts

@@ -0,0 +1 @@
+export * from './ServiceInfoDto';

package/src/dto/shortlink/ShortlinkDto.ts

@@ -0,0 +1,69 @@
+import { dto } from '@basmilius/http-client';
+import type { DateTime } from 'luxon';
+
+@dto
+export class ShortlinkDto {
+    get id(): string {
+        return this.#id;
+    }
+
+    set id(value: string) {
+        this.#id = value;
+    }
+
+    get identifier(): string {
+        return this.#identifier;
+    }
+
+    set identifier(value: string) {
+        this.#identifier = value;
+    }
+
+    get hits(): number {
+        return this.#hits;
+    }
+
+    set hits(value: number) {
+        this.#hits = value;
+    }
+
+    get link(): string {
+        return this.#link;
+    }
+
+    set link(value: string) {
+        this.#link = value;
+    }
+
+    get target(): string {
+        return this.#target;
+    }
+
+    set target(value: string) {
+        this.#target = value;
+    }
+
+    get createdOn(): DateTime {
+        return this.#createdOn;
+    }
+
+    set createdOn(value: DateTime) {
+        this.#createdOn = value;
+    }
+
+    #id: string;
+    #identifier: string;
+    #hits: number;
+    #link: string;
+    #target: string;
+    #createdOn: DateTime;
+
+    constructor(id: string, identifier: string, hits: number, link: string, target: string, createdOn: DateTime) {
+        this.#id = id;
+        this.#identifier = identifier;
+        this.#hits = hits;
+        this.#link = link;
+        this.#target = target;
+        this.#createdOn = createdOn;
+    }
+}

package/src/dto/shortlink/index.ts

@@ -0,0 +1 @@
+export * from './ShortlinkDto';

package/src/service/MerchantEventShopService.ts

@@ -1,6 +1,6 @@
 import { BaseResponse, BaseService, QueryString } from '@basmilius/http-client';
-import { EventAdapter } from '#data/adapter';
-import type { ShopDesignDto, ShopDto, ShopElementDto } from '#data/dto';
+import { EventAdapter, ShortlinkAdapter } from '#data/adapter';
+import type { ShopDesignDto, ShopDto, ShopElementDto, ShortlinkDto } from '#data/dto';
 
 export class MerchantEventShopService extends BaseService {
     async get(merchantId: string, eventId: string, shopId: string): Promise<BaseResponse<ShopDto>> {
@@ -23,6 +23,16 @@ export class MerchantEventShopService extends BaseService {
             .runArrayAdapter(EventAdapter.parseShopElement);
     }
 
+    async getShortlink(merchantId: string, eventId: string, shopId: string): Promise<BaseResponse<ShortlinkDto>> {
+        return await this
+            .request(`/merchants/${merchantId}/events/${eventId}/shops/${shopId}/shortlink`)
+            .method('get')
+            .queryString(QueryString.builder()
+                .append('language', 'nl'))
+            .bearerToken()
+            .runAdapter(ShortlinkAdapter.parse);
+    }
+
     async patch(merchantId: string, eventId: string, shop: ShopDto): Promise<BaseResponse<ShopDto>> {
         return await this
             .request(`/merchants/${merchantId}/events/${eventId}/shops/${shop.id}`)
@@ -44,6 +54,8 @@ export class MerchantEventShopService extends BaseService {
         return await this
             .request(`/merchants/${merchantId}/events/${eventId}/shops/${shopId}/design`)
             .method('patch')
+            .queryString(QueryString.builder()
+                .append('language', 'nl'))
             .bearerToken()
             .body({
                 background_color: design.backgroundColor,
@@ -57,10 +69,22 @@ export class MerchantEventShopService extends BaseService {
         return await this
             .request(`/merchants/${merchantId}/events/${eventId}/shops/${shopId}/elements`)
             .method('patch')
+            .queryString(QueryString.builder()
+                .append('language', 'nl'))
             .bearerToken()
             .body({
                 elements
             })
             .runArrayAdapter(EventAdapter.parseShopElement);
     }
+
+    async postShortlink(merchantId: string, eventId: string, shopId: string): Promise<BaseResponse<ShortlinkDto>> {
+        return await this
+            .request(`/merchants/${merchantId}/events/${eventId}/shops/${shopId}/shortlink`)
+            .method('post')
+            .queryString(QueryString.builder()
+                .append('language', 'nl'))
+            .bearerToken()
+            .runAdapter(ShortlinkAdapter.parse);
+    }
 }

package/src/service/MerchantService.ts

@@ -15,14 +15,14 @@ export class MerchantService extends BaseService {
             .runAdapter(MerchantAdapter.parseMerchant);
     }
 
-    async getAccountManager(merchantId: string): Promise<BaseResponse<UserDto | null>> {
+    async getAccountManagers(merchantId: string): Promise<BaseResponse<UserDto[]>> {
         return await this
-            .request(`/merchants/${merchantId}/account-manager`)
+            .request(`/merchants/${merchantId}/account-managers`)
             .method('get')
             .queryString(QueryString.builder()
                 .append('language', 'nl'))
             .bearerToken()
-            .runAdapter(AuthAdapter.parseUser);
+            .runArrayAdapter(AuthAdapter.parseUser);
     }
 
     async getClaims(merchantId: string): Promise<BaseResponse<Claim[]>> {

package/src/service/MerchantShopService.ts

@@ -0,0 +1,35 @@
+import { BaseResponse, BaseService, QueryString } from '@basmilius/http-client';
+import { EventAdapter, PublicShopAdapter } from '#data/adapter';
+import type { PublicShopDto, ShopDto, ShopElementDto } from '#data/dto';
+
+export class MerchantShopService extends BaseService {
+    async get(merchantId: string, shopId: string): Promise<BaseResponse<ShopDto>> {
+        return await this
+            .request(`/merchants/${merchantId}/shops/${shopId}`)
+            .method('get')
+            .queryString(QueryString.builder()
+                .append('language', 'nl'))
+            .bearerToken()
+            .runAdapter(EventAdapter.parseShop);
+    }
+
+    async getElements(merchantId: string, shopId: string): Promise<BaseResponse<ShopElementDto[]>> {
+        return await this
+            .request(`/merchants/${merchantId}/shops/${shopId}/elements`)
+            .method('get')
+            .queryString(QueryString.builder()
+                .append('language', 'nl'))
+            .bearerToken()
+            .runArrayAdapter(EventAdapter.parseShopElement);
+    }
+
+    async getPreview(merchantId: string, shopId: string): Promise<BaseResponse<PublicShopDto>> {
+        return await this
+            .request(`/merchants/${merchantId}/shops/${shopId}/preview`)
+            .method('get')
+            .queryString(QueryString.builder()
+                .append('language', 'nl'))
+            .bearerToken()
+            .runAdapter(PublicShopAdapter.parsePublicShop);
+    }
+}

package/src/service/MerchantShopsService.ts

@@ -0,0 +1,17 @@
+import { BaseResponse, BaseService, Paginated, QueryString } from '@basmilius/http-client';
+import { EventAdapter } from '#data/adapter';
+import type { ShopDto } from '#data/dto';
+
+export class MerchantShopsService extends BaseService {
+    async get(merchantId: string, offset: number, limit: number): Promise<BaseResponse<Paginated<ShopDto>>> {
+        return await this
+            .request(`/merchants/${merchantId}/shops`)
+            .method('get')
+            .queryString(QueryString.builder()
+                .append('language', 'nl')
+                .append('offset', offset)
+                .append('limit', limit))
+            .bearerToken()
+            .runPaginatedAdapter(EventAdapter.parseShop);
+    }
+}

package/src/service/MerchantStatisticsService.ts

@@ -3,7 +3,7 @@ import type { ApexOptions } from 'apexcharts';
 
 export class MerchantStatisticsService extends BaseService {
     async getRevenueTrend(merchantId: string): Promise<BaseResponse<ApexOptions>> {
-        return this
+        return await this
             .request(`/merchants/${merchantId}/statistics/revenue-trend`)
             .method('get')
             .queryString(QueryString.builder()
@@ -11,4 +11,14 @@ export class MerchantStatisticsService extends BaseService {
             .bearerToken()
             .run();
     }
+
+    async getStatus(merchantId: string): Promise<BaseResponse<boolean>> {
+        return await this
+            .request(`/merchants/${merchantId}/statistics/status`)
+            .method('get')
+            .queryString(QueryString.builder()
+                .append('language', 'nl'))
+            .bearerToken()
+            .run();
+    }
 }

package/src/service/PublicOrderService.ts

@@ -21,6 +21,15 @@ export class PublicOrderService extends BaseService {
             .runArrayAdapter(PublicPayAdapter.parsePublicPaymentMethod);
     }
 
+    async postCancel(orderId: string): Promise<BaseResponse<OrderDto>> {
+        return await this
+            .request(`/orders/${orderId}/cancel`)
+            .method('post')
+            .queryString(QueryString.builder()
+                .append('language', 'nl'))
+            .runAdapter(OrderAdapter.parseOrder);
+    }
+
     async postPay(orderId: string, paymentMethodId: string): Promise<BaseResponse<TransactionDto>> {
         return await this
             .request(`/orders/${orderId}/pay`)

package/src/service/PublicShopService.ts

@@ -3,6 +3,7 @@ import type { DateTime } from 'luxon';
 import { OrderAdapter, PublicShopAdapter } from '#data/adapter';
 import type { OrderDto, PublicShopCartProductDto, PublicShopDto, PublicShopReservationDto } from '#data/dto';
 import type { Gender } from '#data/types';
+import { emptyNull } from '#data/util';
 
 export class PublicShopService extends BaseService {
     async get(shopId: string): Promise<BaseResponse<PublicShopDto>> {
@@ -14,7 +15,25 @@ export class PublicShopService extends BaseService {
             .runAdapter(PublicShopAdapter.parsePublicShop);
     }
 
-    async buy(shopId: string, reservationId: string, firstName: string, lastName: string, email: string, phoneNumber: string, dateOfBirth: DateTime | null, gender: Gender | null): Promise<BaseResponse<OrderDto>> {
+    async buy(shopId: string, reservationId: string, firstName: string, lastName: string, email: string, phoneNumber: string, dateOfBirth: DateTime | null, gender: Gender | null, addressCity: string | null, addressCountry: string | null, addressNumber: string | null, addressPostalCode: string | null, addressStreet: string | null): Promise<BaseResponse<OrderDto>> {
+        let address: Record<string, string | null> = null;
+
+        addressCity = emptyNull(addressCity);
+        addressCountry = emptyNull(addressCountry);
+        addressNumber = emptyNull(addressNumber);
+        addressPostalCode = emptyNull(addressPostalCode);
+        addressStreet = emptyNull(addressStreet);
+
+        if (addressCity || addressCountry || addressNumber || addressPostalCode || addressStreet) {
+            address = {
+                city: addressCity,
+                country_code: addressCountry,
+                number: addressNumber,
+                postal_code: addressPostalCode,
+                street: addressStreet
+            }
+        }
+
         return await this
             .request(`/shops/${shopId}/buy/${reservationId}`)
             .method('post')
@@ -26,7 +45,8 @@ export class PublicShopService extends BaseService {
                 email: email,
                 phone_number: phoneNumber.trim() === '' ? null : phoneNumber.trim(),
                 date_of_birth: dateOfBirth?.toISODate(),
-                gender: gender
+                gender: gender,
+                address
             })
             .runAdapter(OrderAdapter.parseOrder);
     }

package/src/service/ServicesService.ts

@@ -1,4 +1,5 @@
 import { type BaseResponse, BaseService, QueryString } from '@basmilius/http-client';
+import { ServiceInfoDto } from '#data/dto';
 
 export class ServicesService extends BaseService {
     async checkEmail(email: string): Promise<BaseResponse<CheckEmailResponse>> {
@@ -10,6 +11,15 @@ export class ServicesService extends BaseService {
                 .append('language', 'nl'))
             .run();
     }
+
+    async getInfo(): Promise<BaseResponse<ServiceInfoDto>> {
+        return await this
+            .request('/service/info')
+            .method('get')
+            .queryString(QueryString.builder()
+                .append('language', 'nl'))
+            .run();
+    }
 }
 
 type CheckEmailResponse = {

package/src/service/index.ts

@@ -22,6 +22,8 @@ export * from './MerchantFinanceInvoicesService';
 export * from './MerchantFinanceService';
 export * from './MerchantOrderService';
 export * from './MerchantOrdersService';
+export * from './MerchantShopService';
+export * from './MerchantShopsService';
 export * from './MerchantStatisticsService';
 export * from './MerchantStatisticsBuyersService';
 export * from './MerchantStatisticsEventsService';

package/src/types/event.ts

@@ -18,6 +18,11 @@ export type ShopElementType =
     | 'product'
     | 'text';
 
+export type ShopAddressMode =
+    | 'full'
+    | 'city'
+    | 'postal_code_number';
+
 export type ShopFieldRequirement =
     | 'disabled'
     | 'enabled'