@prodoctors/contracts 1.13.0 → 1.15.0

package/dist/proto/paths.d.ts

@@ -11,4 +11,5 @@ export declare const PROTO_PATHS: {
     readonly RESERVATION: string;
     readonly ANALYTICS: string;
     readonly PRESCRIPTION: string;
+    readonly PAYMENT: string;
 };

package/dist/proto/paths.js

@@ -15,4 +15,5 @@ exports.PROTO_PATHS = {
     RESERVATION: (0, path_1.join)(__dirname, "../../proto/reservation.proto"),
     ANALYTICS: (0, path_1.join)(__dirname, "../../proto/analytics.proto"),
     PRESCRIPTION: (0, path_1.join)(__dirname, "../../proto/prescription.proto"),
+    PAYMENT: (0, path_1.join)(__dirname, "../../proto/payment.proto"),
 };

package/gen/branch.ts

@@ -38,6 +38,7 @@ export interface Branch {
   updatedAt: Timestamp | undefined;
   regionId?: string | undefined;
   bankDetails?: BranchBankDetails | undefined;
+  coverImageUrl?: string | undefined;
 }
 
 export interface CreateBranchRequest {
@@ -52,6 +53,7 @@ export interface CreateBranchRequest {
   parentBranchId?: string | undefined;
   regionId?: string | undefined;
   bankDetails?: BranchBankDetails | undefined;
+  coverImageUrl?: string | undefined;
 }
 
 export interface UpdateBranchRequest {
@@ -67,6 +69,7 @@ export interface UpdateBranchRequest {
   parentBranchId?: string | undefined;
   regionId?: string | undefined;
   bankDetails?: BranchBankDetails | undefined;
+  coverImageUrl?: string | undefined;
 }
 
 export interface ListBranchesRequest {

package/gen/inventory.ts

@@ -113,7 +113,13 @@ export interface Product {
     | number
     | undefined;
   /** Barcha dorixonalar bo'yicha jami mavjud miqdor (remaining - reserved). */
-  availableQuantity?: number | undefined;
+  availableQuantity?:
+    | number
+    | undefined;
+  /** Fiskal chek (OFD) uchun soliq atributlari. */
+  taxUnitsCode?: number | undefined;
+  taxLgotaId?: number | undefined;
+  vatPercent?: string | undefined;
 }
 
 export interface ProductBarcode {
@@ -188,6 +194,9 @@ export interface CreateProductRequest {
   allowFractionalSale?: boolean | undefined;
   taxMxikCode?: string | undefined;
   taxPackageCode?: string | undefined;
+  taxUnitsCode?: number | undefined;
+  taxLgotaId?: number | undefined;
+  vatPercent?: string | undefined;
 }
 
 export interface UpdateProductRequest {
@@ -214,6 +223,9 @@ export interface UpdateProductRequest {
   allowFractionalSale?: boolean | undefined;
   taxMxikCode?: string | undefined;
   taxPackageCode?: string | undefined;
+  taxUnitsCode?: number | undefined;
+  taxLgotaId?: number | undefined;
+  vatPercent?: string | undefined;
 }
 
 export interface ListProductsRequest {

package/gen/payment.ts

@@ -0,0 +1,208 @@
+// Code generated by protoc-gen-ts_proto. DO NOT EDIT.
+// versions:
+//   protoc-gen-ts_proto  v2.11.5
+//   protoc               v7.34.0
+// source: payment.proto
+
+/* eslint-disable */
+import { GrpcMethod, GrpcStreamMethod } from "@nestjs/microservices";
+import { Observable } from "rxjs";
+import { IdRequest } from "./common";
+import { Timestamp } from "./google/protobuf/timestamp";
+
+export const protobufPackage = "payment.v1";
+
+/** Onlayn to'lov provayderi. */
+export enum PaymentProvider {
+  PAYMENT_PROVIDER_UNSPECIFIED = 0,
+  PAYMENT_PROVIDER_VIA = 1,
+  UNRECOGNIZED = -1,
+}
+
+/** To'lov oqimi. */
+export enum PaymentFlow {
+  PAYMENT_FLOW_UNSPECIFIED = 0,
+  /** PAYMENT_FLOW_INVOICE - Hisob-faktura: mijoz provayder tomonida to'laydi (karta bizdan o'tmaydi). */
+  PAYMENT_FLOW_INVOICE = 1,
+  /** PAYMENT_FLOW_HOLD - Karta tokeni bilan ushlab turish, olib ketishda yechish. */
+  PAYMENT_FLOW_HOLD = 2,
+  UNRECOGNIZED = -1,
+}
+
+/** To'lov holati. */
+export enum PaymentStatus {
+  PAYMENT_STATUS_UNSPECIFIED = 0,
+  PAYMENT_STATUS_PENDING = 1,
+  PAYMENT_STATUS_HELD = 2,
+  PAYMENT_STATUS_PAID = 3,
+  PAYMENT_STATUS_CANCELLED = 4,
+  PAYMENT_STATUS_FAILED = 5,
+  PAYMENT_STATUS_REFUNDED = 6,
+  UNRECOGNIZED = -1,
+}
+
+export interface Payment {
+  id: string;
+  webOrderId: string;
+  provider: PaymentProvider;
+  flow: PaymentFlow;
+  status: PaymentStatus;
+  amount: string;
+  currency: string;
+  /** Bizning idempotentlik kalitimiz. */
+  externalId: string;
+  /** Provayder hisob-fakturasi (`inv_...`). */
+  invoiceId?:
+    | string
+    | undefined;
+  /** Provayder tranzaksiyasi (`trx_...`). */
+  transactionId?:
+    | string
+    | undefined;
+  /** Mijozni yo'naltirish uchun to'lov sahifasi (bo'lsa). */
+  paymentUrl?:
+    | string
+    | undefined;
+  /** Karta niqobi (oxirgi raqamlar). To'liq PAN saqlanmaydi. */
+  cardMask?: string | undefined;
+  paidAt?: Timestamp | undefined;
+  failureReason?: string | undefined;
+  createdAt: Timestamp | undefined;
+  updatedAt: Timestamp | undefined;
+}
+
+export interface StartPaymentRequest {
+  webOrderId: string;
+  /** Ko'rsatilmasa INVOICE ishlatiladi. */
+  flow: PaymentFlow;
+  /** HOLD oqimi uchun majburiy. */
+  cardToken?: string | undefined;
+  receiverPhone?: string | undefined;
+  receiverEmail?: string | undefined;
+}
+
+export interface GetPaymentByOrderRequest {
+  webOrderId: string;
+}
+
+/** Provayder callback'i yoki UI polling — holatni provayderdan tortadi. */
+export interface SyncPaymentRequest {
+  /** Ikkalasidan biri: bizning to'lov id yoki provayder tranzaksiya/invoice id. */
+  paymentId?: string | undefined;
+  externalId?: string | undefined;
+  providerReference?: string | undefined;
+}
+
+/** HOLD → yechish (dori berilganda). */
+export interface ConfirmPaymentRequest {
+  paymentId: string;
+}
+
+/** HOLD → qaytarish (bron bekor/muddati o'tganda). */
+export interface CancelPaymentRequest {
+  paymentId: string;
+  reason?: string | undefined;
+}
+
+export interface RegisterCardRequest {
+  webOrderId: string;
+  /** Karta raqami — faqat provayderga uzatiladi, saqlanmaydi. */
+  pan: string;
+  expMonth: string;
+  expYear: string;
+  phone: string;
+}
+
+export interface RegisterCardResponse {
+  paymentId: string;
+  verifyId: string;
+  /** SMS yuborilgan raqam niqobi (mijozga ko'rsatish uchun). */
+  phoneMask: string;
+}
+
+export interface ConfirmCardRequest {
+  paymentId: string;
+  verifyCode: string;
+}
+
+export interface ResendCardCodeRequest {
+  paymentId: string;
+}
+
+export interface ResendCardCodeResponse {
+  verifyId: string;
+  phoneMask: string;
+}
+
+export const PAYMENT_V1_PACKAGE_NAME = "payment.v1";
+
+export interface PaymentServiceClient {
+  startPayment(request: StartPaymentRequest): Observable<Payment>;
+
+  getPayment(request: IdRequest): Observable<Payment>;
+
+  getPaymentByOrder(request: GetPaymentByOrderRequest): Observable<Payment>;
+
+  syncPayment(request: SyncPaymentRequest): Observable<Payment>;
+
+  confirmPayment(request: ConfirmPaymentRequest): Observable<Payment>;
+
+  cancelPayment(request: CancelPaymentRequest): Observable<Payment>;
+
+  registerCard(request: RegisterCardRequest): Observable<RegisterCardResponse>;
+
+  confirmCard(request: ConfirmCardRequest): Observable<Payment>;
+
+  resendCardCode(request: ResendCardCodeRequest): Observable<ResendCardCodeResponse>;
+}
+
+export interface PaymentServiceController {
+  startPayment(request: StartPaymentRequest): Promise<Payment> | Observable<Payment> | Payment;
+
+  getPayment(request: IdRequest): Promise<Payment> | Observable<Payment> | Payment;
+
+  getPaymentByOrder(request: GetPaymentByOrderRequest): Promise<Payment> | Observable<Payment> | Payment;
+
+  syncPayment(request: SyncPaymentRequest): Promise<Payment> | Observable<Payment> | Payment;
+
+  confirmPayment(request: ConfirmPaymentRequest): Promise<Payment> | Observable<Payment> | Payment;
+
+  cancelPayment(request: CancelPaymentRequest): Promise<Payment> | Observable<Payment> | Payment;
+
+  registerCard(
+    request: RegisterCardRequest,
+  ): Promise<RegisterCardResponse> | Observable<RegisterCardResponse> | RegisterCardResponse;
+
+  confirmCard(request: ConfirmCardRequest): Promise<Payment> | Observable<Payment> | Payment;
+
+  resendCardCode(
+    request: ResendCardCodeRequest,
+  ): Promise<ResendCardCodeResponse> | Observable<ResendCardCodeResponse> | ResendCardCodeResponse;
+}
+
+export function PaymentServiceControllerMethods() {
+  return function (constructor: Function) {
+    const grpcMethods: string[] = [
+      "startPayment",
+      "getPayment",
+      "getPaymentByOrder",
+      "syncPayment",
+      "confirmPayment",
+      "cancelPayment",
+      "registerCard",
+      "confirmCard",
+      "resendCardCode",
+    ];
+    for (const method of grpcMethods) {
+      const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
+      GrpcMethod("PaymentService", method)(constructor.prototype[method], method, descriptor);
+    }
+    const grpcStreamMethods: string[] = [];
+    for (const method of grpcStreamMethods) {
+      const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
+      GrpcStreamMethod("PaymentService", method)(constructor.prototype[method], method, descriptor);
+    }
+  };
+}
+
+export const PAYMENT_SERVICE_NAME = "PaymentService";

package/gen/prescription.ts

@@ -28,7 +28,14 @@ export interface SearchPrescriptionRequest {
     | boolean
     | undefined;
   /** "prescription-{patient_id}-{safe_code}" — parse qilinadi */
-  qr?: string | undefined;
+  qr?:
+    | string
+    | undefined;
+  /**
+   * Retseptni ochayotgan farmatsevt. DMED tokeni har bir shaxsga alohida
+   * bog'langani uchun (retsept berish DMED'da shaxsga yoziladi) majburiy.
+   */
+  accountId: string;
 }
 
 /** Bizning katalogdagi mos mahsulot (filialda mavjud stock bilan). */
@@ -85,6 +92,8 @@ export interface DispenseRequest {
   markingCode?: string | undefined;
   drugAmount: number;
   price: number;
+  /** Dorini beruvchi farmatsevt — DMED tokeni shu shaxsniki. */
+  accountId: string;
 }
 
 export interface CheckIssueResponse {
@@ -98,9 +107,50 @@ export interface IssueResponse {
   message: string;
 }
 
+export interface DmedAccountRequest {
+  accountId: string;
+}
+
+export interface DmedAuthorizeUrlResponse {
+  /** Farmatsevt shu manzilga yo'naltiriladi (DMED login sahifasi). */
+  authorizeUrl: string;
+  /** CSRF himoyasi uchun; callback'da qaytib keladi. */
+  state: string;
+}
+
+export interface CompleteDmedConnectionRequest {
+  accountId: string;
+  code: string;
+}
+
+export interface DmedConnectionStatus {
+  connected: boolean;
+  dmedEmail?:
+    | string
+    | undefined;
+  /** Access token qachon tugashi (ISO 8601). */
+  expiresAt?: string | undefined;
+}
+
 export const PRESCRIPTION_V1_PACKAGE_NAME = "prescription.v1";
 
 export interface PrescriptionServiceClient {
+  /** DMED hisobini ulash: login manzilini beradi. */
+
+  connectDmed(request: DmedAccountRequest): Observable<DmedAuthorizeUrlResponse>;
+
+  /** Callback'dan kelgan `code` ni tokenga almashtirib saqlaydi. */
+
+  completeDmedConnection(request: CompleteDmedConnectionRequest): Observable<DmedConnectionStatus>;
+
+  /** Ulanish holati (POS "ulangan/ulanmagan" ko'rsatishi uchun). */
+
+  getDmedStatus(request: DmedAccountRequest): Observable<DmedConnectionStatus>;
+
+  /** Ulanishni uzish. */
+
+  disconnectDmed(request: DmedAccountRequest): Observable<DmedConnectionStatus>;
+
   /** Retsept qidirish + bizdagi mos stockni topish. */
 
   searchPrescription(request: SearchPrescriptionRequest): Observable<SearchPrescriptionResponse>;
@@ -115,6 +165,30 @@ export interface PrescriptionServiceClient {
 }
 
 export interface PrescriptionServiceController {
+  /** DMED hisobini ulash: login manzilini beradi. */
+
+  connectDmed(
+    request: DmedAccountRequest,
+  ): Promise<DmedAuthorizeUrlResponse> | Observable<DmedAuthorizeUrlResponse> | DmedAuthorizeUrlResponse;
+
+  /** Callback'dan kelgan `code` ni tokenga almashtirib saqlaydi. */
+
+  completeDmedConnection(
+    request: CompleteDmedConnectionRequest,
+  ): Promise<DmedConnectionStatus> | Observable<DmedConnectionStatus> | DmedConnectionStatus;
+
+  /** Ulanish holati (POS "ulangan/ulanmagan" ko'rsatishi uchun). */
+
+  getDmedStatus(
+    request: DmedAccountRequest,
+  ): Promise<DmedConnectionStatus> | Observable<DmedConnectionStatus> | DmedConnectionStatus;
+
+  /** Ulanishni uzish. */
+
+  disconnectDmed(
+    request: DmedAccountRequest,
+  ): Promise<DmedConnectionStatus> | Observable<DmedConnectionStatus> | DmedConnectionStatus;
+
   /** Retsept qidirish + bizdagi mos stockni topish. */
 
   searchPrescription(
@@ -134,7 +208,15 @@ export interface PrescriptionServiceController {
 
 export function PrescriptionServiceControllerMethods() {
   return function (constructor: Function) {
-    const grpcMethods: string[] = ["searchPrescription", "checkPrescriptionIssue", "issuePrescription"];
+    const grpcMethods: string[] = [
+      "connectDmed",
+      "completeDmedConnection",
+      "getDmedStatus",
+      "disconnectDmed",
+      "searchPrescription",
+      "checkPrescriptionIssue",
+      "issuePrescription",
+    ];
     for (const method of grpcMethods) {
       const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
       GrpcMethod("PrescriptionService", method)(constructor.prototype[method], method, descriptor);

package/gen/reservation.ts

@@ -125,7 +125,29 @@ export interface WebOrder {
   items: WebOrderItem[];
   /** Buyurtma bajariladigan dorixona (bitta order = bitta filial). */
   branchId?: string | undefined;
-  pharmacyName?: string | undefined;
+  pharmacyName?:
+    | string
+    | undefined;
+  /** Onlayn to'lov. Bo'lmasa — dorixonada naqd/karta bilan to'lanadi. */
+  payment?: WebOrderPayment | undefined;
+}
+
+/**
+ * Buyurtmaning onlayn to'lovi (bo'lsa). To'liq tafsilot payment.v1 da —
+ * bu yerda ro'yxat/kartochkada ko'rsatish uchun zarur minimum.
+ */
+export interface WebOrderPayment {
+  id: string;
+  /** PENDING | HELD | PAID | CANCELLED | FAILED | REFUNDED */
+  status: string;
+  amount: string;
+  cardMask?: string | undefined;
+  paidAt?:
+    | Timestamp
+    | undefined;
+  /** Fiskal chek yuborilganmi (yuborilmagan bo'lsa — sabab `receipt_error`). */
+  receiptSentAt?: Timestamp | undefined;
+  receiptError?: string | undefined;
 }
 
 export interface GetWebOrderByNumberRequest {

package/package.json

@@ -1,28 +1,28 @@
-{
-  "name": "@prodoctors/contracts",
-  "version": "1.13.0",
-  "description": "Protobuf definitions and generated Typescript types for ProDoctors",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "scripts": {
-    "build": "tsc -p tsconfig.build.json",
-    "generate": "protoc -I ./proto ./proto/*.proto --ts_proto_out=./gen --ts_proto_opt=nestJs=true,package=omit"
-  },
-  "files": [
-    "proto",
-    "gen",
-    "dist"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "dependencies": {
-    "@nestjs/microservices": "^11.1.15",
-    "rxjs": "^7.8.2",
-    "ts-proto": "^2.11.4"
-  },
-  "devDependencies": {
-    "@types/node": "^25.3.5",
-    "typescript": "^5.9.3"
-  }
-}
+{
+  "name": "@prodoctors/contracts",
+  "version": "1.15.0",
+  "description": "Protobuf definitions and generated Typescript types for ProDoctors",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "scripts": {
+    "build": "tsc -p tsconfig.build.json",
+    "generate": "protoc -I ./proto ./proto/*.proto --ts_proto_out=./gen --ts_proto_opt=nestJs=true,package=omit"
+  },
+  "files": [
+    "proto",
+    "gen",
+    "dist"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "dependencies": {
+    "@nestjs/microservices": "^11.1.15",
+    "rxjs": "^7.8.2",
+    "ts-proto": "^2.11.4"
+  },
+  "devDependencies": {
+    "@types/node": "^25.3.5",
+    "typescript": "^5.9.3"
+  }
+}

package/proto/branch.proto

@@ -1,81 +1,84 @@
-syntax = "proto3";
-
-package branch.v1;
-
-import "google/protobuf/timestamp.proto";
-import "common.proto";
-
-message BranchBankDetails {
-  optional string legal_name = 1;
-  optional string legal_address = 2;
-  optional string account_number = 3;
-  optional string bank_name = 4;
-  optional string bank_branch = 5;
-  optional string mfo = 6;
-  optional string inn = 7;
-  optional string okonx = 8;
-}
-
-message Branch {
-  string id = 1;
-  string name = 2;
-  optional string code = 3;
-  optional string address = 4;
-  optional string phone = 5;
-  bool is_active = 6;
-  optional string work_time = 7;
-  optional string lat = 8;
-  optional string lng = 9;
-  optional string parent_branch_id = 10;
-  google.protobuf.Timestamp created_at = 11;
-  google.protobuf.Timestamp updated_at = 12;
-  optional string region_id = 13;
-  optional BranchBankDetails bank_details = 14;
-}
-
-message CreateBranchRequest {
-  string name = 1;
-  optional string code = 2;
-  optional string address = 3;
-  optional string phone = 4;
-  optional bool is_active = 5;
-  optional string work_time = 6;
-  optional string lat = 7;
-  optional string lng = 8;
-  optional string parent_branch_id = 9;
-  optional string region_id = 10;
-  optional BranchBankDetails bank_details = 11;
-}
-
-message UpdateBranchRequest {
-  string id = 1;
-  optional string name = 2;
-  optional string code = 3;
-  optional string address = 4;
-  optional string phone = 5;
-  optional bool is_active = 6;
-  optional string work_time = 7;
-  optional string lat = 8;
-  optional string lng = 9;
-  optional string parent_branch_id = 10;
-  optional string region_id = 11;
-  optional BranchBankDetails bank_details = 12;
-}
-
-message ListBranchesRequest {
-  optional bool is_active = 1;
-  optional string parent_branch_id = 2;
-  optional string search = 3;
-}
-
-message ListBranchesResponse {
-  repeated Branch items = 1;
-}
-
-service BranchService {
-  rpc CreateBranch(CreateBranchRequest) returns (Branch);
-  rpc UpdateBranch(UpdateBranchRequest) returns (Branch);
-  rpc GetBranch(common.v1.IdRequest) returns (Branch);
-  rpc ListBranches(ListBranchesRequest) returns (ListBranchesResponse);
-  rpc DeleteBranch(common.v1.IdRequest) returns (common.v1.BoolResponse);
-}
+syntax = "proto3";
+
+package branch.v1;
+
+import "google/protobuf/timestamp.proto";
+import "common.proto";
+
+message BranchBankDetails {
+  optional string legal_name = 1;
+  optional string legal_address = 2;
+  optional string account_number = 3;
+  optional string bank_name = 4;
+  optional string bank_branch = 5;
+  optional string mfo = 6;
+  optional string inn = 7;
+  optional string okonx = 8;
+}
+
+message Branch {
+  string id = 1;
+  string name = 2;
+  optional string code = 3;
+  optional string address = 4;
+  optional string phone = 5;
+  bool is_active = 6;
+  optional string work_time = 7;
+  optional string lat = 8;
+  optional string lng = 9;
+  optional string parent_branch_id = 10;
+  google.protobuf.Timestamp created_at = 11;
+  google.protobuf.Timestamp updated_at = 12;
+  optional string region_id = 13;
+  optional BranchBankDetails bank_details = 14;
+  optional string cover_image_url = 15;
+}
+
+message CreateBranchRequest {
+  string name = 1;
+  optional string code = 2;
+  optional string address = 3;
+  optional string phone = 4;
+  optional bool is_active = 5;
+  optional string work_time = 6;
+  optional string lat = 7;
+  optional string lng = 8;
+  optional string parent_branch_id = 9;
+  optional string region_id = 10;
+  optional BranchBankDetails bank_details = 11;
+  optional string cover_image_url = 12;
+}
+
+message UpdateBranchRequest {
+  string id = 1;
+  optional string name = 2;
+  optional string code = 3;
+  optional string address = 4;
+  optional string phone = 5;
+  optional bool is_active = 6;
+  optional string work_time = 7;
+  optional string lat = 8;
+  optional string lng = 9;
+  optional string parent_branch_id = 10;
+  optional string region_id = 11;
+  optional BranchBankDetails bank_details = 12;
+  optional string cover_image_url = 13;
+}
+
+message ListBranchesRequest {
+  optional bool is_active = 1;
+  optional string parent_branch_id = 2;
+  optional string search = 3;
+}
+
+message ListBranchesResponse {
+  repeated Branch items = 1;
+}
+
+service BranchService {
+  rpc CreateBranch(CreateBranchRequest) returns (Branch);
+  rpc UpdateBranch(UpdateBranchRequest) returns (Branch);
+  rpc GetBranch(common.v1.IdRequest) returns (Branch);
+  rpc ListBranches(ListBranchesRequest) returns (ListBranchesResponse);
+  rpc DeleteBranch(common.v1.IdRequest) returns (common.v1.BoolResponse);
+}