@prodoctors/contracts 1.8.0 → 1.10.0

package/gen/reservation.ts

@@ -123,6 +123,23 @@ export interface WebOrder {
   expiresAt: Timestamp | undefined;
   updatedAt: Timestamp | undefined;
   items: WebOrderItem[];
+  /** Buyurtma bajariladigan dorixona (bitta order = bitta filial). */
+  branchId?: string | undefined;
+  pharmacyName?: string | undefined;
+}
+
+export interface GetWebOrderByNumberRequest {
+  orderNumber: string;
+}
+
+export interface FulfillWebOrderRequest {
+  orderId: string;
+  cashierId?:
+    | string
+    | undefined;
+  /** PaymentMethod (CASH/CARD/...) */
+  paymentMethod: string;
+  paidAmount?: string | undefined;
 }
 
 export interface CreateWebOrderItem {
@@ -218,9 +235,13 @@ export interface WebOrderServiceClient {
 
   getWebOrder(request: IdRequest): Observable<WebOrder>;
 
+  getWebOrderByNumber(request: GetWebOrderByNumberRequest): Observable<WebOrder>;
+
   listWebOrders(request: ListWebOrdersRequest): Observable<ListWebOrdersResponse>;
 
   updateWebOrderStatus(request: UpdateWebOrderStatusRequest): Observable<WebOrder>;
+
+  fulfillWebOrder(request: FulfillWebOrderRequest): Observable<WebOrder>;
 }
 
 export interface WebOrderServiceController {
@@ -228,16 +249,27 @@ export interface WebOrderServiceController {
 
   getWebOrder(request: IdRequest): Promise<WebOrder> | Observable<WebOrder> | WebOrder;
 
+  getWebOrderByNumber(request: GetWebOrderByNumberRequest): Promise<WebOrder> | Observable<WebOrder> | WebOrder;
+
   listWebOrders(
     request: ListWebOrdersRequest,
   ): Promise<ListWebOrdersResponse> | Observable<ListWebOrdersResponse> | ListWebOrdersResponse;
 
   updateWebOrderStatus(request: UpdateWebOrderStatusRequest): Promise<WebOrder> | Observable<WebOrder> | WebOrder;
+
+  fulfillWebOrder(request: FulfillWebOrderRequest): Promise<WebOrder> | Observable<WebOrder> | WebOrder;
 }
 
 export function WebOrderServiceControllerMethods() {
   return function (constructor: Function) {
-    const grpcMethods: string[] = ["createWebOrder", "getWebOrder", "listWebOrders", "updateWebOrderStatus"];
+    const grpcMethods: string[] = [
+      "createWebOrder",
+      "getWebOrder",
+      "getWebOrderByNumber",
+      "listWebOrders",
+      "updateWebOrderStatus",
+      "fulfillWebOrder",
+    ];
     for (const method of grpcMethods) {
       const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
       GrpcMethod("WebOrderService", method)(constructor.prototype[method], method, descriptor);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prodoctors/contracts",
-  "version": "1.8.0",
+  "version": "1.10.0",
   "description": "Protobuf definitions and generated Typescript types for ProDoctors",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/proto/reservation.proto

@@ -132,6 +132,21 @@ message WebOrder {
   google.protobuf.Timestamp updated_at = 13;
 
   repeated WebOrderItem items = 14;
+
+  // Buyurtma bajariladigan dorixona (bitta order = bitta filial).
+  optional string branch_id = 15;
+  optional string pharmacy_name = 16;
+}
+
+message GetWebOrderByNumberRequest {
+  string order_number = 1;
+}
+
+message FulfillWebOrderRequest {
+  string order_id = 1;
+  optional string cashier_id = 2;
+  string payment_method = 3; // PaymentMethod (CASH/CARD/...)
+  optional string paid_amount = 4;
 }
 
 message CreateWebOrderItem {
@@ -185,6 +200,8 @@ service WebReservationService {
 service WebOrderService {
   rpc CreateWebOrder(CreateWebOrderRequest) returns (WebOrder);
   rpc GetWebOrder(common.v1.IdRequest) returns (WebOrder);
+  rpc GetWebOrderByNumber(GetWebOrderByNumberRequest) returns (WebOrder);
   rpc ListWebOrders(ListWebOrdersRequest) returns (ListWebOrdersResponse);
   rpc UpdateWebOrderStatus(UpdateWebOrderStatusRequest) returns (WebOrder);
+  rpc FulfillWebOrder(FulfillWebOrderRequest) returns (WebOrder);
 }