@shophost/rest-api 2.0.65 → 2.0.68

package/src/features/order/order.route.d.ts

@@ -355,7 +355,7 @@ export declare const orderRoute: {
                                     zipCode: z.ZodOptional<z.ZodString>;
                                     city: z.ZodString;
                                     country: z.ZodString;
-                                    placeId: z.ZodString;
+                                    placeId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
                                     deliveryInstructions: z.ZodOptional<z.ZodNullable<z.ZodString>>;
                                 }, z.core.$strip>>>;
                                 fulfilmentMethod: z.ZodEnum<{
@@ -421,7 +421,7 @@ export declare const orderRoute: {
                                     shipping: z.ZodDefault<z.ZodNumber>;
                                     subtotal: z.ZodNumber;
                                     total: z.ZodNumber;
-                                    discount: z.ZodDefault<z.ZodNumber>;
+                                    discount: z.ZodPipe<z.ZodTransform<{}, unknown>, z.ZodDefault<z.ZodNumber>>;
                                     currency: z.ZodEnum<{
                                         USD: "USD";
                                         EUR: "EUR";
@@ -556,13 +556,13 @@ export declare const orderRoute: {
                                     addressLineOne: string;
                                     city: string;
                                     country: string;
-                                    placeId: string;
                                     firstname?: string | null | undefined;
                                     lastname?: string | null | undefined;
                                     phone?: string | null | undefined;
                                     doorNumber?: string | null | undefined;
                                     addressLineTwo?: string | null | undefined;
                                     zipCode?: string | undefined;
+                                    placeId?: string | null | undefined;
                                     deliveryInstructions?: string | null | undefined;
                                 } | null | undefined;
                             }, {
@@ -663,13 +663,13 @@ export declare const orderRoute: {
                                     addressLineOne: string;
                                     city: string;
                                     country: string;
-                                    placeId: string;
                                     firstname?: string | null | undefined;
                                     lastname?: string | null | undefined;
                                     phone?: string | null | undefined;
                                     doorNumber?: string | null | undefined;
                                     addressLineTwo?: string | null | undefined;
                                     zipCode?: string | undefined;
+                                    placeId?: string | null | undefined;
                                     deliveryInstructions?: string | null | undefined;
                                 } | null | undefined;
                             }>>>;
@@ -1070,7 +1070,7 @@ export declare const orderRoute: {
                                     zipCode: z.ZodOptional<z.ZodString>;
                                     city: z.ZodString;
                                     country: z.ZodString;
-                                    placeId: z.ZodString;
+                                    placeId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
                                     deliveryInstructions: z.ZodOptional<z.ZodNullable<z.ZodString>>;
                                 }, z.core.$strip>>>;
                                 fulfilmentMethod: z.ZodEnum<{
@@ -1136,7 +1136,7 @@ export declare const orderRoute: {
                                     shipping: z.ZodDefault<z.ZodNumber>;
                                     subtotal: z.ZodNumber;
                                     total: z.ZodNumber;
-                                    discount: z.ZodDefault<z.ZodNumber>;
+                                    discount: z.ZodPipe<z.ZodTransform<{}, unknown>, z.ZodDefault<z.ZodNumber>>;
                                     currency: z.ZodEnum<{
                                         USD: "USD";
                                         EUR: "EUR";
@@ -1271,13 +1271,13 @@ export declare const orderRoute: {
                                     addressLineOne: string;
                                     city: string;
                                     country: string;
-                                    placeId: string;
                                     firstname?: string | null | undefined;
                                     lastname?: string | null | undefined;
                                     phone?: string | null | undefined;
                                     doorNumber?: string | null | undefined;
                                     addressLineTwo?: string | null | undefined;
                                     zipCode?: string | undefined;
+                                    placeId?: string | null | undefined;
                                     deliveryInstructions?: string | null | undefined;
                                 } | null | undefined;
                             }, {
@@ -1378,13 +1378,13 @@ export declare const orderRoute: {
                                     addressLineOne: string;
                                     city: string;
                                     country: string;
-                                    placeId: string;
                                     firstname?: string | null | undefined;
                                     lastname?: string | null | undefined;
                                     phone?: string | null | undefined;
                                     doorNumber?: string | null | undefined;
                                     addressLineTwo?: string | null | undefined;
                                     zipCode?: string | undefined;
+                                    placeId?: string | null | undefined;
                                     deliveryInstructions?: string | null | undefined;
                                 } | null | undefined;
                             }>>>;
@@ -1485,7 +1485,125 @@ export declare const orderRoute: {
             params: z.ZodObject<{
                 organizationId: z.ZodString;
             }, z.core.$strip>;
-        } & Record<never, never>;
+        } & {
+            query: z.ZodObject<{
+                locale: z.ZodOptional<z.ZodEnum<{
+                    hr: "hr";
+                    th: "th";
+                    tr: "tr";
+                    id: "id";
+                    is: "is";
+                    mt: "mt";
+                    ml: "ml";
+                    af: "af";
+                    sq: "sq";
+                    ar_dz: "ar_dz";
+                    ar_bh: "ar_bh";
+                    ar_eg: "ar_eg";
+                    ar_iq: "ar_iq";
+                    ar_jo: "ar_jo";
+                    ar_kw: "ar_kw";
+                    ar_lb: "ar_lb";
+                    ar_ly: "ar_ly";
+                    ar_ma: "ar_ma";
+                    ar_om: "ar_om";
+                    ar_qa: "ar_qa";
+                    ar_sa: "ar_sa";
+                    ar_sy: "ar_sy";
+                    ar_tn: "ar_tn";
+                    ar_ae: "ar_ae";
+                    ar_ye: "ar_ye";
+                    eu: "eu";
+                    be: "be";
+                    bg: "bg";
+                    ca: "ca";
+                    zh_hk: "zh_hk";
+                    zh_cn: "zh_cn";
+                    zh_sg: "zh_sg";
+                    zh_tw: "zh_tw";
+                    cs: "cs";
+                    da: "da";
+                    nl_be: "nl_be";
+                    nl: "nl";
+                    en: "en";
+                    en_au: "en_au";
+                    en_bz: "en_bz";
+                    en_ca: "en_ca";
+                    en_ie: "en_ie";
+                    en_jm: "en_jm";
+                    en_nz: "en_nz";
+                    en_za: "en_za";
+                    en_tt: "en_tt";
+                    en_gb: "en_gb";
+                    en_us: "en_us";
+                    et: "et";
+                    fo: "fo";
+                    fa: "fa";
+                    fi: "fi";
+                    fr_be: "fr_be";
+                    fr_ca: "fr_ca";
+                    fr_lu: "fr_lu";
+                    fr: "fr";
+                    fr_ch: "fr_ch";
+                    gd: "gd";
+                    de_at: "de_at";
+                    de_li: "de_li";
+                    de_lu: "de_lu";
+                    de: "de";
+                    de_ch: "de_ch";
+                    el: "el";
+                    he: "he";
+                    hi: "hi";
+                    hu: "hu";
+                    ga: "ga";
+                    it: "it";
+                    it_ch: "it_ch";
+                    ja: "ja";
+                    ko: "ko";
+                    ku: "ku";
+                    lv: "lv";
+                    lt: "lt";
+                    mk: "mk";
+                    ms: "ms";
+                    no: "no";
+                    nb: "nb";
+                    nn: "nn";
+                    pl: "pl";
+                    pt_br: "pt_br";
+                    pt: "pt";
+                    pa: "pa";
+                    rm: "rm";
+                    ro: "ro";
+                    ro_md: "ro_md";
+                    ru: "ru";
+                    ru_md: "ru_md";
+                    sr: "sr";
+                    sk: "sk";
+                    sl: "sl";
+                    sb: "sb";
+                    es_ar: "es_ar";
+                    es_bo: "es_bo";
+                    es_cl: "es_cl";
+                    es_co: "es_co";
+                    es_cr: "es_cr";
+                    es_do: "es_do";
+                    es_ec: "es_ec";
+                    es_sv: "es_sv";
+                    es_gt: "es_gt";
+                    es_hn: "es_hn";
+                    es_mx: "es_mx";
+                    es: "es";
+                    sv: "sv";
+                    sv_fi: "sv_fi";
+                    uk: "uk";
+                    ur: "ur";
+                    vi: "vi";
+                    cy: "cy";
+                    ji: "ji";
+                    zu: "zu";
+                }>>;
+            }, z.core.$strip>;
+        };
         responses: {
             201: {
                 content: {
@@ -1704,7 +1822,7 @@ export declare const orderRoute: {
                                     zipCode: z.ZodOptional<z.ZodString>;
                                     city: z.ZodString;
                                     country: z.ZodString;
-                                    placeId: z.ZodString;
+                                    placeId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
                                     deliveryInstructions: z.ZodOptional<z.ZodNullable<z.ZodString>>;
                                 }, z.core.$strip>>>;
                                 fulfilmentMethod: z.ZodEnum<{
@@ -1770,7 +1888,7 @@ export declare const orderRoute: {
                                     shipping: z.ZodDefault<z.ZodNumber>;
                                     subtotal: z.ZodNumber;
                                     total: z.ZodNumber;
-                                    discount: z.ZodDefault<z.ZodNumber>;
+                                    discount: z.ZodPipe<z.ZodTransform<{}, unknown>, z.ZodDefault<z.ZodNumber>>;
                                     currency: z.ZodEnum<{
                                         USD: "USD";
                                         EUR: "EUR";
@@ -1905,13 +2023,13 @@ export declare const orderRoute: {
                                     addressLineOne: string;
                                     city: string;
                                     country: string;
-                                    placeId: string;
                                     firstname?: string | null | undefined;
                                     lastname?: string | null | undefined;
                                     phone?: string | null | undefined;
                                     doorNumber?: string | null | undefined;
                                     addressLineTwo?: string | null | undefined;
                                     zipCode?: string | undefined;
+                                    placeId?: string | null | undefined;
                                     deliveryInstructions?: string | null | undefined;
                                 } | null | undefined;
                             }, {
@@ -2012,13 +2130,13 @@ export declare const orderRoute: {
                                     addressLineOne: string;
                                     city: string;
                                     country: string;
-                                    placeId: string;
                                     firstname?: string | null | undefined;
                                     lastname?: string | null | undefined;
                                     phone?: string | null | undefined;
                                     doorNumber?: string | null | undefined;
                                     addressLineTwo?: string | null | undefined;
                                     zipCode?: string | undefined;
+                                    placeId?: string | null | undefined;
                                     deliveryInstructions?: string | null | undefined;
                                 } | null | undefined;
                             }>>;
@@ -2494,7 +2612,7 @@ export declare const orderRoute: {
                                 zipCode: z.ZodOptional<z.ZodString>;
                                 city: z.ZodString;
                                 country: z.ZodString;
-                                placeId: z.ZodString;
+                                placeId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
                                 deliveryInstructions: z.ZodOptional<z.ZodNullable<z.ZodString>>;
                             }, z.core.$strip>>>;
                             fulfilmentMethod: z.ZodEnum<{
@@ -2560,7 +2678,7 @@ export declare const orderRoute: {
                                 shipping: z.ZodDefault<z.ZodNumber>;
                                 subtotal: z.ZodNumber;
                                 total: z.ZodNumber;
-                                discount: z.ZodDefault<z.ZodNumber>;
+                                discount: z.ZodPipe<z.ZodTransform<{}, unknown>, z.ZodDefault<z.ZodNumber>>;
                                 currency: z.ZodEnum<{
                                     USD: "USD";
                                     EUR: "EUR";
@@ -2695,13 +2813,13 @@ export declare const orderRoute: {
                                 addressLineOne: string;
                                 city: string;
                                 country: string;
-                                placeId: string;
                                 firstname?: string | null | undefined;
                                 lastname?: string | null | undefined;
                                 phone?: string | null | undefined;
                                 doorNumber?: string | null | undefined;
                                 addressLineTwo?: string | null | undefined;
                                 zipCode?: string | undefined;
+                                placeId?: string | null | undefined;
                                 deliveryInstructions?: string | null | undefined;
                             } | null | undefined;
                         }, {
@@ -2802,13 +2920,13 @@ export declare const orderRoute: {
                                 addressLineOne: string;
                                 city: string;
                                 country: string;
-                                placeId: string;
                                 firstname?: string | null | undefined;
                                 lastname?: string | null | undefined;
                                 phone?: string | null | undefined;
                                 doorNumber?: string | null | undefined;
                                 addressLineTwo?: string | null | undefined;
                                 zipCode?: string | undefined;
+                                placeId?: string | null | undefined;
                                 deliveryInstructions?: string | null | undefined;
                             } | null | undefined;
                         }>>;
@@ -3086,7 +3204,7 @@ export declare const orderRoute: {
                                 zipCode: z.ZodOptional<z.ZodString>;
                                 city: z.ZodString;
                                 country: z.ZodString;
-                                placeId: z.ZodString;
+                                placeId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
                                 deliveryInstructions: z.ZodOptional<z.ZodNullable<z.ZodString>>;
                             }, z.core.$strip>>>;
                             fulfilmentMethod: z.ZodEnum<{
@@ -3152,7 +3270,7 @@ export declare const orderRoute: {
                                 shipping: z.ZodDefault<z.ZodNumber>;
                                 subtotal: z.ZodNumber;
                                 total: z.ZodNumber;
-                                discount: z.ZodDefault<z.ZodNumber>;
+                                discount: z.ZodPipe<z.ZodTransform<{}, unknown>, z.ZodDefault<z.ZodNumber>>;
                                 currency: z.ZodEnum<{
                                     USD: "USD";
                                     EUR: "EUR";
@@ -3287,13 +3405,13 @@ export declare const orderRoute: {
                                 addressLineOne: string;
                                 city: string;
                                 country: string;
-                                placeId: string;
                                 firstname?: string | null | undefined;
                                 lastname?: string | null | undefined;
                                 phone?: string | null | undefined;
                                 doorNumber?: string | null | undefined;
                                 addressLineTwo?: string | null | undefined;
                                 zipCode?: string | undefined;
+                                placeId?: string | null | undefined;
                                 deliveryInstructions?: string | null | undefined;
                             } | null | undefined;
                         }, {
@@ -3394,13 +3512,13 @@ export declare const orderRoute: {
                                 addressLineOne: string;
                                 city: string;
                                 country: string;
-                                placeId: string;
                                 firstname?: string | null | undefined;
                                 lastname?: string | null | undefined;
                                 phone?: string | null | undefined;
                                 doorNumber?: string | null | undefined;
                                 addressLineTwo?: string | null | undefined;
                                 zipCode?: string | undefined;
+                                placeId?: string | null | undefined;
                                 deliveryInstructions?: string | null | undefined;
                             } | null | undefined;
                         }>>;

package/src/features/order/order.route.js

@@ -1 +1 @@
-import{z as r}from"@hono/zod-openapi";import{createApiRoute as t}from"../../core/hono/hono";import{CartConflictSchema as p}from"../cart/cart.schema";import{CreateOrderSchema as m,ErrorSchema as e,HeaderSchema as a,OrderSchema as o,OrderStatusSchema as h,OrganizationParams as s,OrganizationWithIdParams as d,PaginationMetaSchema as n,PaginationQuerySchema as i}from"../../schemas";const c=t({description:"Fetches paginated list of orders",headers:a,method:"GET",operationId:"getOrders",path:"/:organizationId/orders",pathParams:s,query:i,responses:{200:r.object({list:r.array(o),meta:n}),400:e,401:e},summary:"Get Orders",tags:["Order"]}),g=t({description:"Fetches paginated list of orders for the authenticated user",headers:a,method:"GET",operationId:"getMyOrders",path:"/:organizationId/orders/me",pathParams:s,query:i,responses:{200:r.object({list:r.array(o),meta:n}),400:e,401:e},summary:"Get My Orders",tags:["Order"]}),O=t({body:m,description:"Creates a new order",headers:a,method:"POST",operationId:"createOrder",path:"/:organizationId/orders",pathParams:r.object({organizationId:r.string().cuid().min(1).openapi({description:"The organization ID",example:"ckel0e8qw00004n5p5w6fznym",param:{in:"path",name:"organizationId"}})}),responses:{201:r.object({order:o,redirectUrl:r.string().url().optional()}),409:p,400:e,401:e,404:e},summary:"Create Order",tags:["Order"]}),u=t({headers:a,method:"GET",operationId:"getOrder",path:"/:organizationId/orders/:id",pathParams:d,responses:{200:o,401:e,404:e},summary:"Get Order",tags:["Order"]}),l=t({description:"Changes the status of an existing order based on the operation",headers:a,method:"POST",operationId:"updateOrderStatus",path:"/:organizationId/orders/:id/status/:operation",pathParams:d.extend({operation:h}),responses:{200:o,400:e,401:e,404:e},summary:"Change Order Status",tags:["Order"]}),y=t({description:"Soft deletes order",headers:a,method:"DELETE",operationId:"deleteOrder",path:"/:organizationId/orders/:id",pathParams:d,responses:{204:null,400:e,401:e,404:e},summary:"Delete Order",tags:["Order"]});export const orderRoute={getOrders:c,getMyOrders:g,createOrder:O,getOrder:u,updateStatus:l,deleteOrder:y};
+import{z as r}from"@hono/zod-openapi";import{createApiRoute as t}from"../../core/hono/hono";import{CreateOrderSchema as p,ErrorSchema as e,HeaderSchema as a,locale as m,OrderSchema as o,OrderStatusSchema as h,OrganizationParams as s,OrganizationWithIdParams as d,PaginationMetaSchema as n,PaginationQuerySchema as i}from"../../schemas";import{CartConflictSchema as c}from"../cart/cart.schema";const g=t({description:"Fetches paginated list of orders",headers:a,method:"GET",operationId:"getOrders",path:"/:organizationId/orders",pathParams:s,query:i,responses:{200:r.object({list:r.array(o),meta:n}),400:e,401:e},summary:"Get Orders",tags:["Order"]}),O=t({description:"Fetches paginated list of orders for the authenticated user",headers:a,method:"GET",operationId:"getMyOrders",path:"/:organizationId/orders/me",pathParams:s,query:i,responses:{200:r.object({list:r.array(o),meta:n}),400:e,401:e},summary:"Get My Orders",tags:["Order"]}),u=t({body:p,description:"Creates a new order",headers:a,method:"POST",operationId:"createOrder",path:"/:organizationId/orders",pathParams:r.object({organizationId:r.string().cuid().min(1).openapi({description:"The organization ID",example:"ckel0e8qw00004n5p5w6fznym",param:{in:"path",name:"organizationId"}})}),query:r.object({locale:m.optional()}),responses:{201:r.object({order:o,redirectUrl:r.string().url().optional()}),409:c,400:e,401:e,404:e},summary:"Create Order",tags:["Order"]}),l=t({headers:a,method:"GET",operationId:"getOrder",path:"/:organizationId/orders/:id",pathParams:d,responses:{200:o,401:e,404:e},summary:"Get Order",tags:["Order"]}),y=t({description:"Changes the status of an existing order based on the operation",headers:a,method:"POST",operationId:"updateOrderStatus",path:"/:organizationId/orders/:id/status/:operation",pathParams:d.extend({operation:h}),responses:{200:o,400:e,401:e,404:e},summary:"Change Order Status",tags:["Order"]}),I=t({description:"Soft deletes order",headers:a,method:"DELETE",operationId:"deleteOrder",path:"/:organizationId/orders/:id",pathParams:d,responses:{204:null,400:e,401:e,404:e},summary:"Delete Order",tags:["Order"]});export const orderRoute={getOrders:g,getMyOrders:O,createOrder:u,getOrder:l,updateStatus:y,deleteOrder:I};

package/src/features/order/order.schema.d.ts

@@ -371,7 +371,7 @@ export declare const OrderSchema: z.ZodPipe<z.ZodObject<{
         zipCode: z.ZodOptional<z.ZodString>;
         city: z.ZodString;
         country: z.ZodString;
-        placeId: z.ZodString;
+        placeId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
         deliveryInstructions: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     }, z.core.$strip>>>;
     fulfilmentMethod: z.ZodEnum<{
@@ -437,7 +437,7 @@ export declare const OrderSchema: z.ZodPipe<z.ZodObject<{
         shipping: z.ZodDefault<z.ZodNumber>;
         subtotal: z.ZodNumber;
         total: z.ZodNumber;
-        discount: z.ZodDefault<z.ZodNumber>;
+        discount: z.ZodPipe<z.ZodTransform<{}, unknown>, z.ZodDefault<z.ZodNumber>>;
         currency: z.ZodEnum<{
             USD: "USD";
             EUR: "EUR";
@@ -572,13 +572,13 @@ export declare const OrderSchema: z.ZodPipe<z.ZodObject<{
         addressLineOne: string;
         city: string;
         country: string;
-        placeId: string;
         firstname?: string | null | undefined;
         lastname?: string | null | undefined;
         phone?: string | null | undefined;
         doorNumber?: string | null | undefined;
         addressLineTwo?: string | null | undefined;
         zipCode?: string | undefined;
+        placeId?: string | null | undefined;
         deliveryInstructions?: string | null | undefined;
     } | null | undefined;
 }, {
@@ -679,13 +679,13 @@ export declare const OrderSchema: z.ZodPipe<z.ZodObject<{
         addressLineOne: string;
         city: string;
         country: string;
-        placeId: string;
         firstname?: string | null | undefined;
         lastname?: string | null | undefined;
         phone?: string | null | undefined;
         doorNumber?: string | null | undefined;
         addressLineTwo?: string | null | undefined;
         zipCode?: string | undefined;
+        placeId?: string | null | undefined;
         deliveryInstructions?: string | null | undefined;
     } | null | undefined;
 }>>;

package/src/features/order/order.service.d.ts

@@ -2,7 +2,7 @@ import { z } from "@hono/zod-openapi";
 import { HttpException } from "../../core/exceptions/http-exception";
 import { PrismaClientType } from "../../core/lib/prisma";
 import { EmailService } from "../../core/notifications/email.service";
-import { CreateOrderSchema, OrderStatus, User } from "../../schemas";
+import { CreateOrderSchema, Locale, OrderStatus, User } from "../../schemas";
 import { CartData } from "../cart/cart.schema";
 import { CartService } from "../cart/cart.service";
 import { PaymentService } from "../payment/payment.service";
@@ -20,10 +20,16 @@ declare class OrderService {
     private readonly cartService;
     private readonly emailService;
     constructor(prisma: PrismaClientType, paymentService: PaymentService, cartService: CartService, emailService: EmailService);
+    private safelySendEmail;
+    private toLocaleCandidates;
+    private resolveCheckoutLocale;
     /**
      * Create a draft order
      */
-    createOrder(organizationId: string, user: User, body: z.infer<typeof CreateOrderSchema>): Promise<{
+    createOrder(organizationId: string, user: User, body: z.infer<typeof CreateOrderSchema>, options?: {
+        acceptLanguage?: string;
+        locale?: Locale;
+    }): Promise<{
         redirectUrl: string | undefined;
         order: {
             status: "pending" | "accepted" | "ready-for-dispatch" | "dispatched" | "completed" | "cancelled";
@@ -123,13 +129,13 @@ declare class OrderService {
                 addressLineOne: string;
                 city: string;
                 country: string;
-                placeId: string;
                 firstname?: string | null | undefined;
                 lastname?: string | null | undefined;
                 phone?: string | null | undefined;
                 doorNumber?: string | null | undefined;
                 addressLineTwo?: string | null | undefined;
                 zipCode?: string | undefined;
+                placeId?: string | null | undefined;
                 deliveryInstructions?: string | null | undefined;
             } | null | undefined;
         };
@@ -237,13 +243,13 @@ declare class OrderService {
             addressLineOne: string;
             city: string;
             country: string;
-            placeId: string;
             firstname?: string | null | undefined;
             lastname?: string | null | undefined;
             phone?: string | null | undefined;
             doorNumber?: string | null | undefined;
             addressLineTwo?: string | null | undefined;
             zipCode?: string | undefined;
+            placeId?: string | null | undefined;
             deliveryInstructions?: string | null | undefined;
         } | null | undefined;
     }>;
@@ -359,13 +365,13 @@ declare class OrderService {
                 addressLineOne: string;
                 city: string;
                 country: string;
-                placeId: string;
                 firstname?: string | null | undefined;
                 lastname?: string | null | undefined;
                 phone?: string | null | undefined;
                 doorNumber?: string | null | undefined;
                 addressLineTwo?: string | null | undefined;
                 zipCode?: string | undefined;
+                placeId?: string | null | undefined;
                 deliveryInstructions?: string | null | undefined;
             } | null | undefined;
         }[];
@@ -484,13 +490,13 @@ declare class OrderService {
                 addressLineOne: string;
                 city: string;
                 country: string;
-                placeId: string;
                 firstname?: string | null | undefined;
                 lastname?: string | null | undefined;
                 phone?: string | null | undefined;
                 doorNumber?: string | null | undefined;
                 addressLineTwo?: string | null | undefined;
                 zipCode?: string | undefined;
+                placeId?: string | null | undefined;
                 deliveryInstructions?: string | null | undefined;
             } | null | undefined;
         }[];
@@ -600,13 +606,13 @@ declare class OrderService {
             addressLineOne: string;
             city: string;
             country: string;
-            placeId: string;
             firstname?: string | null | undefined;
             lastname?: string | null | undefined;
             phone?: string | null | undefined;
             doorNumber?: string | null | undefined;
             addressLineTwo?: string | null | undefined;
             zipCode?: string | undefined;
+            placeId?: string | null | undefined;
             deliveryInstructions?: string | null | undefined;
         } | null | undefined;
     }>;

package/src/features/order/order.service.js

@@ -1 +1 @@
-import{__awaiter as u}from"tslib";import{z as y}from"@hono/zod-openapi";import{customAlphabet as Z}from"nanoid";import{HttpException as c}from"../../core/exceptions/http-exception";import{logger as m}from"../../core/logging/pino";import{OrderSchema as l,OrganizationSchema as k,PaginationMetaSchema as O,UserSchema as I}from"../../schemas";import{transformCartItemToOrderItem as F}from"../cart/cart.util";const z=Z("1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ",6);class A extends c{constructor(i){super(409,i.message),this.payload=i}}class P{constructor(i,t,e,n){this.prisma=i,this.paymentService=t,this.cartService=e,this.emailService=n}createOrder(i,t,e){return u(this,void 0,void 0,function*(){var n,r,s,d,o;const a=yield this.prisma.organization.findFirst({where:{id:i},include:{configuration:!0}});if(!a)throw new c(404,"Organization not found");const h=yield this.cartService.getCartData(i,e,{locale:a.configuration.defaultLocale});if(h.invalidProductIds.length>0||this.hasCartConflict(e.items,h.normalizedItems))throw new A(Object.assign(Object.assign({},h),{message:"Some items in your cart are no longer available in the requested quantity."}));const g=yield this.prisma.address.findFirst({where:{users:{some:{id:t.id}},isDefault:!0}});if(e.fulfilmentMethod==="delivery"&&!g)throw new c(400,"This user does not have a default shipping address");const v=yield Promise.all(h.normalizedItems.map(F(this.prisma))),p=yield this.prisma.shippingMethod.findFirst({where:{id:e.shippingMethodId},include:{shippingZones:!0}}),M=(r=(n=p?.shippingZones[0])===null||n===void 0?void 0:n.price)!==null&&r!==void 0?r:0,w=v.reduce((U,D)=>U+D.totalPrice,0),C=w+M,f=yield this.prisma.order.create({data:Object.assign(Object.assign({token:z(),referenceId:z(),organization:{connect:{id:i}},fulfilmentMethod:e.fulfilmentMethod,shippingMethod:e.shippingMethodId?{connect:{id:e.shippingMethodId}}:void 0,currency:a.configuration.defaultCurrency,sourceIp:"127.0.0.1",items:{create:v}},g?{shippingAddress:{create:Object.assign(Object.assign({},g),{id:void 0})}}:{}),{user:{connect:{id:t.id}},payment:{create:{method:e.payment.method,provider:e.payment.provider,shipping:(d=(s=p?.shippingZones[0])===null||s===void 0?void 0:s.price)!==null&&d!==void 0?d:0,subtotal:w,total:C,discount:0,currency:a.configuration.defaultCurrency}}}),include:{items:{include:{translations:!0,image:!0}},payment:!0,shippingMethod:{include:{shippingZones:!0}}}}),b=l.parse(f);return{redirectUrl:(o=(yield this.paymentService.createCheckoutSession(i,t,b,{locale:"en",successUrl:`${e.checkoutBaseUrl}/account/orders/${f.id}?clearCart=true`,cancelUrl:`${e.checkoutBaseUrl}/checkout/shipping-and-payment`})).redirectUrl)!==null&&o!==void 0?o:void 0,order:l.parse(f)}})}hasCartConflict(i,t){return JSON.stringify(i)!==JSON.stringify(t)}sendOrderNotifications(i,t){return u(this,void 0,void 0,function*(){const e=yield this.prisma.order.findFirst({where:{id:i},include:{items:{include:{translations:!0,image:!0}},payment:!0,organization:{include:{address:!0,configuration:!0,logoFile:!0,members:{include:{user:!0}}}},shippingAddress:!0,shippingMethod:{include:{shippingZones:!0}}}});if(!e)throw new c(404,"Order not found");const n=t??e.userId;if(!n)throw new Error(`Order ${i} is missing a customer user id`);const r=n?yield this.prisma.user.findFirst({where:{id:n}}):null;if(!r)throw new c(404,"Order customer not found");const s=I.parse(r),d=k.parse(e.organization),o=l.parse(e);m.info({memberCount:e.organization.members.length,orderId:e.id,organizationId:e.organizationId,userId:r.id},"Preparing order notification emails"),m.info({orderId:e.id,organizationId:e.organizationId,to:r.email},"Sending order confirmation email"),yield this.emailService.sendOrderConfirmationEmail(e.organizationId,s,d,o);for(const a of e.organization.members)m.info({memberId:a.user.id,orderId:e.id,organizationId:e.organizationId,to:a.user.email},"Sending order notification email"),yield this.emailService.sendOrderNotificationEmail(e.organizationId,s,I.parse(a.user),d,o);m.info({memberCount:e.organization.members.length,orderId:e.id,organizationId:e.organizationId},"Completed order notification emails")})}getOrder(i,t,e){return u(this,void 0,void 0,function*(){const n=yield this.prisma.order.findUnique({where:{id:e,organizationId:t,deletedAt:null,user:{id:i.id}},include:{items:{include:{translations:!0,image:!0}},shippingAddress:!0,shippingMethod:{include:{shippingZones:!0}},payment:!0}});if(!n)throw new c(404,"Order not found");return l.parse(n)})}getMyOrders(i,t,e){return u(this,void 0,void 0,function*(){const{page:n=1,limit:r=10,search:s}=e,[d,o]=yield this.prisma.order.paginate({where:Object.assign({organizationId:t,userId:i,deletedAt:null},s?{referenceId:{contains:s,mode:"insensitive"}}:{}),include:{items:{include:{translations:!0,image:!0}},shippingAddress:!0,shippingMethod:{include:{shippingZones:!0}},payment:!0},orderBy:{createdAt:"desc"}}).withPages({page:n,limit:r});return{meta:O.parse(o),list:y.array(l).parse(d)}})}getOrders(i,t){return u(this,void 0,void 0,function*(){const{page:e=1,limit:n=10}=t,[r,s]=yield this.prisma.order.paginate({where:{organizationId:i,deletedAt:null},include:{items:{include:{translations:!0,image:!0}},shippingAddress:!0,shippingMethod:{include:{shippingZones:!0}},payment:!0},orderBy:{createdAt:"desc"}}).withPages({page:e,limit:n});return{meta:O.parse(s),list:y.array(l).parse(r)}})}deleteOrder(i,t,e){return u(this,void 0,void 0,function*(){if(!(yield this.prisma.order.findUnique({where:{id:t,organizationId:i,deletedAt:null}})))throw new c(404,"Order not found");yield this.prisma.order.update({where:{id:t,organizationId:i,deletedAt:null},data:{deletedAt:new Date,deletedBy:e}})})}updateStatus(i,t,e){return u(this,void 0,void 0,function*(){if(!(yield this.prisma.order.findUnique({where:{id:t,organizationId:i,deletedAt:null},include:{items:!0,shippingMethod:{include:{shippingZones:!0}}}})))throw new c(404,"Order not found");let r={};switch(e){case"accepted":r={acceptedAt:new Date};break;case"ready-for-dispatch":r={readyForDispatchAt:new Date};break;case"dispatched":r={dispatchedAt:new Date};break;case"completed":r={completedAt:new Date};break;case"cancelled":r={cancelledAt:new Date};break}const s=yield this.prisma.order.update({where:{id:t},data:r,include:{items:{include:{translations:!0,image:!0}},shippingAddress:!0,shippingMethod:{include:{shippingZones:!0}},payment:!0}});return l.parse(s)})}}export{P as OrderService};export{A as OrderInventoryConflictError};
+import{__awaiter as l}from"tslib";import{z as O}from"@hono/zod-openapi";import{customAlphabet as U}from"nanoid";import{HttpException as m}from"../../core/exceptions/http-exception";import{logger as D}from"../../core/logging/pino";import{OrderSchema as p,OrganizationSchema as Z,PaginationMetaSchema as A,UserSchema as I,localeMap as F}from"../../schemas";import{transformCartItemToOrderItem as E}from"../cart/cart.util";const S=U("1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ",6);class z extends m{constructor(t){super(409,t.message),this.payload=t}}class _{constructor(t,i,e,r){this.prisma=t,this.paymentService=i,this.cartService=e,this.emailService=r}safelySendEmail(t,i){return l(this,void 0,void 0,function*(){try{yield i()}catch(e){D.error(Object.assign({err:e},t),"Email delivery failed")}})}toLocaleCandidates(t){const i=t.trim().toLowerCase().replace(/-/g,"_");if(!i)return[];const[e]=i.split("_");return!e||e===i?[i]:[i,e]}resolveCheckoutLocale(t,i,e,r){const n=new Set(e);if(t&&n.has(t))return t;if(!i)return r;const d=i.split(",").map((s,a)=>{const[o,...c]=s.trim().split(";"),g=c.find(f=>f.trim().startsWith("q=")),u=g?Number.parseFloat(g.trim().slice(2)):1;return{index:a,quality:Number.isFinite(u)?u:0,rawLocale:o}}).filter(s=>s.rawLocale).sort((s,a)=>a.quality!==s.quality?a.quality-s.quality:s.index-a.index);for(const s of d)for(const a of this.toLocaleCandidates(s.rawLocale))if(F.has(a)&&n.has(a))return a;return r}createOrder(t,i,e,r){return l(this,void 0,void 0,function*(){var n,d,s,a,o;const c=yield this.prisma.organization.findFirst({where:{id:t},include:{configuration:!0}});if(!c)throw new m(404,"Organization not found");const g=this.resolveCheckoutLocale(r?.locale,r?.acceptLanguage,c.configuration.supportedLocales,c.configuration.defaultLocale),u=yield this.cartService.getCartData(t,e,{locale:g});if(u.invalidProductIds.length>0||this.hasCartConflict(e.items,u.normalizedItems))throw new z(Object.assign(Object.assign({},u),{message:"Some items in your cart are no longer available in the requested quantity."}));const f=yield this.prisma.address.findFirst({where:{users:{some:{id:i.id}},isDefault:!0}});if(e.fulfilmentMethod==="delivery"&&!f)throw new m(400,"This user does not have a default shipping address");const y=yield Promise.all(u.normalizedItems.map(E(this.prisma))),h=yield this.prisma.shippingMethod.findFirst({where:{id:e.shippingMethodId},include:{shippingZones:!0}}),C=(d=(n=h?.shippingZones[0])===null||n===void 0?void 0:n.price)!==null&&d!==void 0?d:0,w=y.reduce((q,k)=>q+k.totalPrice,0),L=w+C,v=yield this.prisma.order.create({data:Object.assign(Object.assign({token:S(),referenceId:S(),organization:{connect:{id:t}},fulfilmentMethod:e.fulfilmentMethod,shippingMethod:e.shippingMethodId?{connect:{id:e.shippingMethodId}}:void 0,currency:c.configuration.defaultCurrency,sourceIp:"127.0.0.1",items:{create:y}},f?{shippingAddress:{create:Object.assign(Object.assign({},f),{id:void 0})}}:{}),{user:{connect:{id:i.id}},payment:{create:{method:e.payment.method,provider:e.payment.provider,shipping:(a=(s=h?.shippingZones[0])===null||s===void 0?void 0:s.price)!==null&&a!==void 0?a:0,subtotal:w,total:L,discount:0,currency:c.configuration.defaultCurrency}}}),include:{items:{include:{translations:!0,image:!0}},payment:!0,shippingMethod:{include:{shippingZones:!0}}}}),b=p.parse(v);return{redirectUrl:(o=(yield this.paymentService.createCheckoutSession(t,i,b,{locale:g,defaultLocale:c.configuration.defaultLocale,successUrl:`${e.checkoutBaseUrl}/account/orders/${v.id}?clearCart=true`,cancelUrl:`${e.checkoutBaseUrl}/checkout/shipping-and-payment`})).redirectUrl)!==null&&o!==void 0?o:void 0,order:p.parse(v)}})}hasCartConflict(t,i){return JSON.stringify(t)!==JSON.stringify(i)}sendOrderNotifications(t,i){return l(this,void 0,void 0,function*(){const e=yield this.prisma.order.findFirst({where:{id:t},include:{items:{include:{translations:!0,image:!0}},payment:!0,organization:{include:{address:!0,configuration:!0,logoFile:!0,members:{include:{user:!0}}}},shippingAddress:!0,shippingMethod:{include:{shippingZones:!0}}}}),r=i??e?.userId,n=r?yield this.prisma.user.findFirst({where:{id:r}}):null;if(!e||!n)return;const d=I.parse(n),s=Z.parse(e.organization),a=p.parse(e);yield this.safelySendEmail({emailType:"order-confirmation",orderId:e.id,organizationId:e.organizationId,userId:n.id},()=>this.emailService.sendOrderConfirmationEmail(e.organizationId,d,s,a));for(const o of e.organization.members)yield this.safelySendEmail({emailType:"order-notification",memberId:o.user.id,orderId:e.id,organizationId:e.organizationId,userId:n.id},()=>this.emailService.sendOrderNotificationEmail(e.organizationId,d,I.parse(o.user),s,a))})}getOrder(t,i,e){return l(this,void 0,void 0,function*(){const r=yield this.prisma.order.findUnique({where:{id:e,organizationId:i,deletedAt:null,user:{id:t.id}},include:{items:{include:{translations:!0,image:!0}},shippingAddress:!0,shippingMethod:{include:{shippingZones:!0}},payment:!0}});if(!r)throw new m(404,"Order not found");return p.parse(r)})}getMyOrders(t,i,e){return l(this,void 0,void 0,function*(){const{page:r=1,limit:n=10,search:d}=e,[s,a]=yield this.prisma.order.paginate({where:Object.assign({organizationId:i,userId:t,deletedAt:null},d?{referenceId:{contains:d,mode:"insensitive"}}:{}),include:{items:{include:{translations:!0,image:!0}},shippingAddress:!0,shippingMethod:{include:{shippingZones:!0}},payment:!0},orderBy:{createdAt:"desc"}}).withPages({page:r,limit:n});return{meta:A.parse(a),list:O.array(p).parse(s)}})}getOrders(t,i){return l(this,void 0,void 0,function*(){const{page:e=1,limit:r=10}=i,[n,d]=yield this.prisma.order.paginate({where:{organizationId:t,deletedAt:null},include:{items:{include:{translations:!0,image:!0}},shippingAddress:!0,shippingMethod:{include:{shippingZones:!0}},payment:!0},orderBy:{createdAt:"desc"}}).withPages({page:e,limit:r});return{meta:A.parse(d),list:O.array(p).parse(n)}})}deleteOrder(t,i,e){return l(this,void 0,void 0,function*(){if(!(yield this.prisma.order.findUnique({where:{id:i,organizationId:t,deletedAt:null}})))throw new m(404,"Order not found");yield this.prisma.order.update({where:{id:i,organizationId:t,deletedAt:null},data:{deletedAt:new Date,deletedBy:e}})})}updateStatus(t,i,e){return l(this,void 0,void 0,function*(){if(!(yield this.prisma.order.findUnique({where:{id:i,organizationId:t,deletedAt:null},include:{items:!0,shippingMethod:{include:{shippingZones:!0}}}})))throw new m(404,"Order not found");let n={};switch(e){case"accepted":n={acceptedAt:new Date};break;case"ready-for-dispatch":n={readyForDispatchAt:new Date};break;case"dispatched":n={dispatchedAt:new Date};break;case"completed":n={completedAt:new Date};break;case"cancelled":n={cancelledAt:new Date};break}const d=yield this.prisma.order.update({where:{id:i},data:n,include:{items:{include:{translations:!0,image:!0}},shippingAddress:!0,shippingMethod:{include:{shippingZones:!0}},payment:!0}});return p.parse(d)})}}export{_ as OrderService};export{z as OrderInventoryConflictError};

package/src/features/order/recipient.schema.d.ts

@@ -15,7 +15,7 @@ export declare const RecipientSchema: z.ZodObject<{
         zipCode: z.ZodOptional<z.ZodString>;
         city: z.ZodString;
         country: z.ZodString;
-        placeId: z.ZodString;
+        placeId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
         deliveryInstructions: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     }, z.core.$strip>>>;
     createdAt: z.ZodDate;

package/src/features/organization/legal-entity.schema.d.ts

@@ -17,7 +17,7 @@ export declare const LegalEntitySchema: z.ZodObject<{
         zipCode: z.ZodNonOptional<z.ZodOptional<z.ZodString>>;
         city: z.ZodNonOptional<z.ZodString>;
         country: z.ZodNonOptional<z.ZodString>;
-        placeId: z.ZodNonOptional<z.ZodString>;
+        placeId: z.ZodNonOptional<z.ZodOptional<z.ZodNullable<z.ZodString>>>;
         deliveryInstructions: z.ZodNonOptional<z.ZodOptional<z.ZodNullable<z.ZodString>>>;
     }, z.core.$strip>;
 }, z.core.$strip>;

package/src/features/organization/organization-configuration.schema.d.ts

@@ -307,7 +307,6 @@ export declare const OrganizationConfigurationSchema: z.ZodObject<{
     createdAt: z.ZodDate;
 }, z.core.$strip>;
 export declare const UpdateOrganizationConfigurationSchema: z.ZodObject<{
-    hostname: z.ZodOptional<z.ZodOptional<z.ZodCoercedString<unknown>>>;
     openingTimes: z.ZodOptional<z.ZodOptional<z.ZodObject<{
         monday: z.ZodNullable<z.ZodString>;
         tuesday: z.ZodNullable<z.ZodString>;
@@ -326,6 +325,7 @@ export declare const UpdateOrganizationConfigurationSchema: z.ZodObject<{
         saturday: z.ZodNullable<z.ZodString>;
         sunday: z.ZodNullable<z.ZodString>;
     }, z.core.$strip>>>;
+    hostname: z.ZodOptional<z.ZodOptional<z.ZodCoercedString<unknown>>>;
     defaultLocale: z.ZodOptional<z.ZodEnum<{
         hr: "hr";
         th: "th";