@prodoctors/contracts 1.14.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/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.14.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,84 +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;
-  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);
-}
+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);
+}

package/proto/inventory.proto

@@ -97,6 +97,11 @@ message Product {
   optional int32 offers_count = 30;
   // Barcha dorixonalar bo'yicha jami mavjud miqdor (remaining - reserved).
   optional int32 available_quantity = 31;
+
+  // Fiskal chek (OFD) uchun soliq atributlari.
+  optional int32 tax_units_code = 32;
+  optional int32 tax_lgota_id = 33;
+  optional string vat_percent = 34;
 }
 
 message ProductBarcode {
@@ -171,6 +176,9 @@ message CreateProductRequest {
   optional bool allow_fractional_sale = 20;
   optional string tax_mxik_code = 21;
   optional string tax_package_code = 22;
+  optional int32 tax_units_code = 23;
+  optional int32 tax_lgota_id = 24;
+  optional string vat_percent = 25;
 }
 
 message UpdateProductRequest {
@@ -197,6 +205,9 @@ message UpdateProductRequest {
   optional bool allow_fractional_sale = 21;
   optional string tax_mxik_code = 22;
   optional string tax_package_code = 23;
+  optional int32 tax_units_code = 24;
+  optional int32 tax_lgota_id = 25;
+  optional string vat_percent = 26;
 }
 
 message ListProductsRequest {

package/proto/payment.proto

@@ -0,0 +1,145 @@
+syntax = "proto3";
+
+package payment.v1;
+
+import "google/protobuf/timestamp.proto";
+import "common.proto";
+
+// Onlayn to'lov provayderi.
+enum PaymentProvider {
+  PAYMENT_PROVIDER_UNSPECIFIED = 0;
+  PAYMENT_PROVIDER_VIA = 1;
+}
+
+// To'lov oqimi.
+enum PaymentFlow {
+  PAYMENT_FLOW_UNSPECIFIED = 0;
+  // Hisob-faktura: mijoz provayder tomonida to'laydi (karta bizdan o'tmaydi).
+  PAYMENT_FLOW_INVOICE = 1;
+  // Karta tokeni bilan ushlab turish, olib ketishda yechish.
+  PAYMENT_FLOW_HOLD = 2;
+}
+
+// To'lov holati.
+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;
+}
+
+message Payment {
+  string id = 1;
+  string web_order_id = 2;
+
+  PaymentProvider provider = 3;
+  PaymentFlow flow = 4;
+  PaymentStatus status = 5;
+
+  string amount = 6;
+  string currency = 7;
+
+  // Bizning idempotentlik kalitimiz.
+  string external_id = 8;
+  // Provayder hisob-fakturasi (`inv_...`).
+  optional string invoice_id = 9;
+  // Provayder tranzaksiyasi (`trx_...`).
+  optional string transaction_id = 10;
+  // Mijozni yo'naltirish uchun to'lov sahifasi (bo'lsa).
+  optional string payment_url = 11;
+  // Karta niqobi (oxirgi raqamlar). To'liq PAN saqlanmaydi.
+  optional string card_mask = 12;
+
+  optional google.protobuf.Timestamp paid_at = 13;
+  optional string failure_reason = 14;
+
+  google.protobuf.Timestamp created_at = 15;
+  google.protobuf.Timestamp updated_at = 16;
+}
+
+message StartPaymentRequest {
+  string web_order_id = 1;
+  // Ko'rsatilmasa INVOICE ishlatiladi.
+  PaymentFlow flow = 2;
+
+  // HOLD oqimi uchun majburiy.
+  optional string card_token = 3;
+
+  optional string receiver_phone = 4;
+  optional string receiver_email = 5;
+}
+
+message GetPaymentByOrderRequest {
+  string web_order_id = 1;
+}
+
+// Provayder callback'i yoki UI polling — holatni provayderdan tortadi.
+message SyncPaymentRequest {
+  // Ikkalasidan biri: bizning to'lov id yoki provayder tranzaksiya/invoice id.
+  optional string payment_id = 1;
+  optional string external_id = 2;
+  optional string provider_reference = 3;
+}
+
+// HOLD → yechish (dori berilganda).
+message ConfirmPaymentRequest {
+  string payment_id = 1;
+}
+
+// HOLD → qaytarish (bron bekor/muddati o'tganda).
+message CancelPaymentRequest {
+  string payment_id = 1;
+  optional string reason = 2;
+}
+
+// --- Karta kiritish (karta SAQLANMAYDI) ---
+//
+// Oqim: RegisterCard (karta ma'lumoti) -> mijozga SMS -> ConfirmCard (kod)
+// -> olingan token DARHOL hold yaratishga ishlatiladi va tashlab yuboriladi.
+// PAN hech qayerda saqlanmaydi va loglanmaydi.
+
+message RegisterCardRequest {
+  string web_order_id = 1;
+  // Karta raqami — faqat provayderga uzatiladi, saqlanmaydi.
+  string pan = 2;
+  string exp_month = 3;
+  string exp_year = 4;
+  string phone = 5;
+}
+
+message RegisterCardResponse {
+  string payment_id = 1;
+  string verify_id = 2;
+  // SMS yuborilgan raqam niqobi (mijozga ko'rsatish uchun).
+  string phone_mask = 3;
+}
+
+message ConfirmCardRequest {
+  string payment_id = 1;
+  string verify_code = 2;
+}
+
+message ResendCardCodeRequest {
+  string payment_id = 1;
+}
+
+message ResendCardCodeResponse {
+  string verify_id = 1;
+  string phone_mask = 2;
+}
+
+service PaymentService {
+  rpc StartPayment(StartPaymentRequest) returns (Payment);
+  rpc GetPayment(common.v1.IdRequest) returns (Payment);
+  rpc GetPaymentByOrder(GetPaymentByOrderRequest) returns (Payment);
+  rpc SyncPayment(SyncPaymentRequest) returns (Payment);
+  rpc ConfirmPayment(ConfirmPaymentRequest) returns (Payment);
+  rpc CancelPayment(CancelPaymentRequest) returns (Payment);
+
+  rpc RegisterCard(RegisterCardRequest) returns (RegisterCardResponse);
+  rpc ConfirmCard(ConfirmCardRequest) returns (Payment);
+  rpc ResendCardCode(ResendCardCodeRequest) returns (ResendCardCodeResponse);
+}

package/proto/prescription.proto

@@ -17,6 +17,9 @@ message SearchPrescriptionRequest {
   optional string birth_date = 6; // YYYY-MM-DD
   optional bool is_confidant = 7;
   optional string qr = 8; // "prescription-{patient_id}-{safe_code}" — parse qilinadi
+  // Retseptni ochayotgan farmatsevt. DMED tokeni har bir shaxsga alohida
+  // bog'langani uchun (retsept berish DMED'da shaxsga yoziladi) majburiy.
+  string account_id = 9;
 }
 
 // Bizning katalogdagi mos mahsulot (filialda mavjud stock bilan).
@@ -73,6 +76,8 @@ message DispenseRequest {
   optional string marking_code = 5;
   int32 drug_amount = 6;
   int64 price = 7;
+  // Dorini beruvchi farmatsevt — DMED tokeni shu shaxsniki.
+  string account_id = 8;
 }
 
 message CheckIssueResponse {
@@ -86,7 +91,42 @@ message IssueResponse {
   string message = 3;
 }
 
+// --- DMED hisobini ulash (OAuth2 Authorization Code) ---
+// Token har bir farmatsevtga alohida saqlanadi.
+
+message DmedAccountRequest {
+  string account_id = 1;
+}
+
+message DmedAuthorizeUrlResponse {
+  // Farmatsevt shu manzilga yo'naltiriladi (DMED login sahifasi).
+  string authorize_url = 1;
+  // CSRF himoyasi uchun; callback'da qaytib keladi.
+  string state = 2;
+}
+
+message CompleteDmedConnectionRequest {
+  string account_id = 1;
+  string code = 2;
+}
+
+message DmedConnectionStatus {
+  bool connected = 1;
+  optional string dmed_email = 2;
+  // Access token qachon tugashi (ISO 8601).
+  optional string expires_at = 3;
+}
+
 service PrescriptionService {
+  // DMED hisobini ulash: login manzilini beradi.
+  rpc ConnectDmed(DmedAccountRequest) returns (DmedAuthorizeUrlResponse);
+  // Callback'dan kelgan `code` ni tokenga almashtirib saqlaydi.
+  rpc CompleteDmedConnection(CompleteDmedConnectionRequest) returns (DmedConnectionStatus);
+  // Ulanish holati (POS "ulangan/ulanmagan" ko'rsatishi uchun).
+  rpc GetDmedStatus(DmedAccountRequest) returns (DmedConnectionStatus);
+  // Ulanishni uzish.
+  rpc DisconnectDmed(DmedAccountRequest) returns (DmedConnectionStatus);
+
   // Retsept qidirish + bizdagi mos stockni topish.
   rpc SearchPrescription(SearchPrescriptionRequest) returns (SearchPrescriptionResponse);
   // Berishdan oldin DMED'da tekshirish.

package/proto/reservation.proto

@@ -136,6 +136,23 @@ message WebOrder {
   // Buyurtma bajariladigan dorixona (bitta order = bitta filial).
   optional string branch_id = 15;
   optional string pharmacy_name = 16;
+
+  // Onlayn to'lov. Bo'lmasa — dorixonada naqd/karta bilan to'lanadi.
+  optional WebOrderPayment payment = 17;
+}
+
+// Buyurtmaning onlayn to'lovi (bo'lsa). To'liq tafsilot payment.v1 da —
+// bu yerda ro'yxat/kartochkada ko'rsatish uchun zarur minimum.
+message WebOrderPayment {
+  string id = 1;
+  // PENDING | HELD | PAID | CANCELLED | FAILED | REFUNDED
+  string status = 2;
+  string amount = 3;
+  optional string card_mask = 4;
+  optional google.protobuf.Timestamp paid_at = 5;
+  // Fiskal chek yuborilganmi (yuborilmagan bo'lsa — sabab `receipt_error`).
+  optional google.protobuf.Timestamp receipt_sent_at = 6;
+  optional string receipt_error = 7;
 }
 
 message GetWebOrderByNumberRequest {

package/proto/shift.proto

@@ -1,144 +1,144 @@
-syntax = "proto3";
-
-package shift.v1;
-
-import "google/protobuf/timestamp.proto";
-import "common.proto";
-
-enum ShiftStatus {
-  SHIFT_STATUS_UNSPECIFIED = 0;
-  SHIFT_STATUS_OPEN = 1;
-  SHIFT_STATUS_CLOSED = 2;
-  SHIFT_STATUS_FAILED = 3;
-}
-
-enum ExternalTerminalStatus {
-  EXTERNAL_TERMINAL_STATUS_UNSPECIFIED = 0;
-  EXTERNAL_TERMINAL_STATUS_UNKNOWN = 1;
-  EXTERNAL_TERMINAL_STATUS_OPEN = 2;
-  EXTERNAL_TERMINAL_STATUS_CLOSED = 3;
-  EXTERNAL_TERMINAL_STATUS_ERROR = 4;
-}
-
-message PosTerminal {
-  string id = 1;
-  string branch_id = 2;
-  string name = 3;
-  string base_url = 4;
-  string token = 5;
-  string port = 6;
-  bool is_active = 7;
-  ExternalTerminalStatus last_known_status = 8;
-  optional google.protobuf.Timestamp last_status_checked_at = 9;
-  optional string last_status_message = 10;
-  google.protobuf.Timestamp created_at = 11;
-  google.protobuf.Timestamp updated_at = 12;
-}
-
-message CashierShift {
-  string id = 1;
-  string branch_id = 2;
-  string cashier_id = 3;
-  string terminal_id = 4;
-  ShiftStatus status = 5;
-  google.protobuf.Timestamp opened_at = 6;
-  optional google.protobuf.Timestamp closed_at = 7;
-  optional string open_message = 8;
-  optional string close_message = 9;
-  optional int32 left_zreport_count_at_open = 10;
-  optional int32 left_zreport_count_at_close = 11;
-  optional string external_error_message = 12;
-  google.protobuf.Timestamp created_at = 13;
-  google.protobuf.Timestamp updated_at = 14;
-  optional PosTerminal terminal = 15;
-}
-
-message CreateTerminalRequest {
-  string branch_id = 1;
-  string name = 2;
-  string base_url = 3;
-  string token = 4;
-  string port = 5;
-  optional bool is_active = 6;
-}
-
-message UpdateTerminalRequest {
-  string id = 1;
-  optional string name = 2;
-  optional string base_url = 3;
-  optional string token = 4;
-  optional string port = 5;
-  optional bool is_active = 6;
-}
-
-message ListTerminalsRequest {
-  common.v1.PaginationRequest pagination = 1;
-  optional string branch_id = 2;
-  optional bool is_active = 3;
-  optional string search = 4;
-}
-
-message ListTerminalsResponse {
-  repeated PosTerminal items = 1;
-  common.v1.PaginationMeta meta = 2;
-}
-
-message TerminalStatusResponse {
-  string terminal_id = 1;
-  bool is_open = 2;
-  ExternalTerminalStatus status = 3;
-  optional string message = 4;
-  optional int32 left_zreport_count = 5;
-  optional google.protobuf.Timestamp checked_at = 6;
-}
-
-message OpenShiftRequest {
-  string cashier_id = 1;
-  string terminal_id = 2;
-}
-
-message CloseShiftRequest {
-  string shift_id = 1;
-  string cashier_id = 2;
-  optional string note = 3;
-}
-
-message GetCurrentShiftRequest {
-  string cashier_id = 1;
-}
-
-message GetShiftByIdRequest {
-  string shift_id = 1;
-}
-
-message ListShiftsRequest {
-  common.v1.PaginationRequest pagination = 1;
-  optional string branch_id = 2;
-  optional string cashier_id = 3;
-  optional string terminal_id = 4;
-  optional ShiftStatus status = 5;
-  optional string date_from = 6;
-  optional string date_to = 7;
-}
-
-message ListShiftsResponse {
-  repeated CashierShift items = 1;
-  common.v1.PaginationMeta meta = 2;
-}
-
-service TerminalService {
-  rpc CreateTerminal(CreateTerminalRequest) returns (PosTerminal);
-  rpc UpdateTerminal(UpdateTerminalRequest) returns (PosTerminal);
-  rpc GetTerminalById(common.v1.IdRequest) returns (PosTerminal);
-  rpc ListTerminals(ListTerminalsRequest) returns (ListTerminalsResponse);
-  rpc DeleteTerminal(common.v1.IdRequest) returns (common.v1.BoolResponse);
-  rpc GetTerminalStatus(common.v1.IdRequest) returns (TerminalStatusResponse);
-}
-
-service ShiftService {
-  rpc OpenShift(OpenShiftRequest) returns (CashierShift);
-  rpc CloseShift(CloseShiftRequest) returns (CashierShift);
-  rpc GetCurrentShift(GetCurrentShiftRequest) returns (CashierShift);
-  rpc GetShiftById(GetShiftByIdRequest) returns (CashierShift);
-  rpc ListShifts(ListShiftsRequest) returns (ListShiftsResponse);
+syntax = "proto3";
+
+package shift.v1;
+
+import "google/protobuf/timestamp.proto";
+import "common.proto";
+
+enum ShiftStatus {
+  SHIFT_STATUS_UNSPECIFIED = 0;
+  SHIFT_STATUS_OPEN = 1;
+  SHIFT_STATUS_CLOSED = 2;
+  SHIFT_STATUS_FAILED = 3;
+}
+
+enum ExternalTerminalStatus {
+  EXTERNAL_TERMINAL_STATUS_UNSPECIFIED = 0;
+  EXTERNAL_TERMINAL_STATUS_UNKNOWN = 1;
+  EXTERNAL_TERMINAL_STATUS_OPEN = 2;
+  EXTERNAL_TERMINAL_STATUS_CLOSED = 3;
+  EXTERNAL_TERMINAL_STATUS_ERROR = 4;
+}
+
+message PosTerminal {
+  string id = 1;
+  string branch_id = 2;
+  string name = 3;
+  string base_url = 4;
+  string token = 5;
+  string port = 6;
+  bool is_active = 7;
+  ExternalTerminalStatus last_known_status = 8;
+  optional google.protobuf.Timestamp last_status_checked_at = 9;
+  optional string last_status_message = 10;
+  google.protobuf.Timestamp created_at = 11;
+  google.protobuf.Timestamp updated_at = 12;
+}
+
+message CashierShift {
+  string id = 1;
+  string branch_id = 2;
+  string cashier_id = 3;
+  string terminal_id = 4;
+  ShiftStatus status = 5;
+  google.protobuf.Timestamp opened_at = 6;
+  optional google.protobuf.Timestamp closed_at = 7;
+  optional string open_message = 8;
+  optional string close_message = 9;
+  optional int32 left_zreport_count_at_open = 10;
+  optional int32 left_zreport_count_at_close = 11;
+  optional string external_error_message = 12;
+  google.protobuf.Timestamp created_at = 13;
+  google.protobuf.Timestamp updated_at = 14;
+  optional PosTerminal terminal = 15;
+}
+
+message CreateTerminalRequest {
+  string branch_id = 1;
+  string name = 2;
+  string base_url = 3;
+  string token = 4;
+  string port = 5;
+  optional bool is_active = 6;
+}
+
+message UpdateTerminalRequest {
+  string id = 1;
+  optional string name = 2;
+  optional string base_url = 3;
+  optional string token = 4;
+  optional string port = 5;
+  optional bool is_active = 6;
+}
+
+message ListTerminalsRequest {
+  common.v1.PaginationRequest pagination = 1;
+  optional string branch_id = 2;
+  optional bool is_active = 3;
+  optional string search = 4;
+}
+
+message ListTerminalsResponse {
+  repeated PosTerminal items = 1;
+  common.v1.PaginationMeta meta = 2;
+}
+
+message TerminalStatusResponse {
+  string terminal_id = 1;
+  bool is_open = 2;
+  ExternalTerminalStatus status = 3;
+  optional string message = 4;
+  optional int32 left_zreport_count = 5;
+  optional google.protobuf.Timestamp checked_at = 6;
+}
+
+message OpenShiftRequest {
+  string cashier_id = 1;
+  string terminal_id = 2;
+}
+
+message CloseShiftRequest {
+  string shift_id = 1;
+  string cashier_id = 2;
+  optional string note = 3;
+}
+
+message GetCurrentShiftRequest {
+  string cashier_id = 1;
+}
+
+message GetShiftByIdRequest {
+  string shift_id = 1;
+}
+
+message ListShiftsRequest {
+  common.v1.PaginationRequest pagination = 1;
+  optional string branch_id = 2;
+  optional string cashier_id = 3;
+  optional string terminal_id = 4;
+  optional ShiftStatus status = 5;
+  optional string date_from = 6;
+  optional string date_to = 7;
+}
+
+message ListShiftsResponse {
+  repeated CashierShift items = 1;
+  common.v1.PaginationMeta meta = 2;
+}
+
+service TerminalService {
+  rpc CreateTerminal(CreateTerminalRequest) returns (PosTerminal);
+  rpc UpdateTerminal(UpdateTerminalRequest) returns (PosTerminal);
+  rpc GetTerminalById(common.v1.IdRequest) returns (PosTerminal);
+  rpc ListTerminals(ListTerminalsRequest) returns (ListTerminalsResponse);
+  rpc DeleteTerminal(common.v1.IdRequest) returns (common.v1.BoolResponse);
+  rpc GetTerminalStatus(common.v1.IdRequest) returns (TerminalStatusResponse);
+}
+
+service ShiftService {
+  rpc OpenShift(OpenShiftRequest) returns (CashierShift);
+  rpc CloseShift(CloseShiftRequest) returns (CashierShift);
+  rpc GetCurrentShift(GetCurrentShiftRequest) returns (CashierShift);
+  rpc GetShiftById(GetShiftByIdRequest) returns (CashierShift);
+  rpc ListShifts(ListShiftsRequest) returns (ListShiftsResponse);
 }