@mamindom/contracts 1.0.152 → 1.0.155

package/dist/events/orders/index.d.ts

@@ -1,3 +1,4 @@
 export * from './order-cancelled.interface';
 export * from './order-created.interface';
 export * from './order-status-changed.interface';
+export * from './order-crm.interface';

package/dist/events/orders/index.js

@@ -17,3 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./order-cancelled.interface"), exports);
 __exportStar(require("./order-created.interface"), exports);
 __exportStar(require("./order-status-changed.interface"), exports);
+__exportStar(require("./order-crm.interface"), exports);

package/dist/events/orders/order-cancelled.interface.d.ts

@@ -2,6 +2,7 @@ export interface OrderCancelledEvent {
     orderId: string;
     orderNumber: string;
     reason: string;
+    cancelledBy?: string;
     actorId?: string;
     actorName?: string;
     wasPaid: boolean;

package/dist/events/orders/order-created.interface.d.ts

@@ -5,16 +5,16 @@ export interface OrderCreatedEvent {
     guestId?: string;
     source: string;
     totals: {
-        grandTotal: number;
-        shippingCost: number;
-        bonusesEarned: number;
+        grandTotal: string;
+        shippingCost: string;
+        bonusesEarned: string;
     };
     items: Array<{
         productId: string;
         variantId?: string;
         sku: string;
         quantity: number;
-        price: number;
+        price: string;
     }>;
     delivery: {
         method: string;
@@ -24,7 +24,7 @@ export interface OrderCreatedEvent {
     };
     payment: {
         provider: string;
-        amount: number;
+        amount: string;
         idempotencyKey: string;
     };
     customer: {

package/dist/events/orders/order-crm.interface.d.ts

@@ -0,0 +1,24 @@
+export interface OrderCrmPlacedEvent {
+    orderId: string;
+    orderNumber: string;
+    userId?: string;
+    cartSessionId?: string;
+    placedAt: number;
+    grandTotal: string;
+    bonusesUsed: string;
+    items: Array<{
+        productId: string;
+        variantId?: string;
+        quantity: number;
+        price: string;
+        lineTotal: string;
+    }>;
+}
+export interface OrderSaleRecordedEvent {
+    orderId: string;
+    invoiceId: string;
+    pickupPointId?: string;
+    totalAmount: string;
+    saleDate: string;
+    recordedAt: number;
+}

package/dist/events/orders/order-crm.interface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/events/orders/order-status-changed.interface.d.ts

@@ -4,6 +4,7 @@ export interface OrderStatusChangedEvent {
     fromStatus: string;
     toStatus: string;
     reason?: string;
+    cancelledBy?: string;
     actorId?: string;
     actorName?: string;
     changedAt: number;

package/dist/events/payments/payment-cancelled.interface.d.ts

@@ -3,7 +3,7 @@ export interface PaymentCancelledEvent {
     orderId: string;
     provider: string;
     providerInvoiceId: string;
-    amount: number;
+    amount: string;
     reason?: string;
     cancelledAt: number;
 }

package/dist/events/payments/payment-captured.interface.d.ts

@@ -3,8 +3,8 @@ export interface PaymentCapturedEvent {
     orderId: string;
     provider: string;
     providerInvoiceId: string;
-    amount: number;
-    capturedAmount: number;
+    amount: string;
+    capturedAmount: string;
     currency: string;
     capturedAt: number;
 }

package/dist/events/payments/payment-failed.interface.d.ts

@@ -3,7 +3,7 @@ export interface PaymentFailedEvent {
     orderId: string;
     provider: string;
     providerInvoiceId?: string;
-    amount: number;
+    amount: string;
     failureReason: string;
     failedAt: number;
 }

package/dist/events/payments/payment-held.interface.d.ts

@@ -3,7 +3,7 @@ export interface PaymentHeldEvent {
     orderId: string;
     provider: string;
     providerInvoiceId: string;
-    amount: number;
+    amount: string;
     currency: string;
     heldAt: number;
 }

package/dist/events/payments/payment-refunded.interface.d.ts

@@ -3,9 +3,9 @@ export interface PaymentRefundedEvent {
     orderId: string;
     provider: string;
     providerInvoiceId: string;
-    refundAmount: number;
-    totalRefunded: number;
-    originalAmount: number;
+    refundAmount: string;
+    totalRefunded: string;
+    originalAmount: string;
     isPartial: boolean;
     reason?: string;
     refundedAt: number;

package/dist/gen/cart.d.ts

@@ -1,4 +1,5 @@
 import { Observable } from "rxjs";
+import { CalculateCartResponse } from "./crm_calculation";
 export declare const protobufPackage = "cart.v1";
 export interface CartItem {
     productId: string;
@@ -113,6 +114,10 @@ export interface CartOwner {
 export interface GetCartRequest {
     owner: CartOwner | undefined;
 }
+export interface CalculateCrmRequest {
+    owner: CartOwner | undefined;
+    calculationDate: string;
+}
 export interface ClearCartRequest {
     owner: CartOwner | undefined;
 }
@@ -224,6 +229,7 @@ export interface CartServiceClient {
     setComment(request: SetCommentRequest): Observable<CartResponse>;
     setCheckoutDraft(request: SetCheckoutDraftRequest): Observable<CartResponse>;
     recalculate(request: RecalculateRequest): Observable<CartResponse>;
+    calculateCrm(request: CalculateCrmRequest): Observable<CalculateCartResponse>;
     mergeGuestToUser(request: MergeGuestToUserRequest): Observable<CartResponse>;
     addToWishlist(request: WishlistItemRequest): Observable<WishlistResponse>;
     removeFromWishlist(request: WishlistItemRequest): Observable<WishlistResponse>;
@@ -247,6 +253,7 @@ export interface CartServiceController {
     setComment(request: SetCommentRequest): Promise<CartResponse> | Observable<CartResponse> | CartResponse;
     setCheckoutDraft(request: SetCheckoutDraftRequest): Promise<CartResponse> | Observable<CartResponse> | CartResponse;
     recalculate(request: RecalculateRequest): Promise<CartResponse> | Observable<CartResponse> | CartResponse;
+    calculateCrm(request: CalculateCrmRequest): Promise<CalculateCartResponse> | Observable<CalculateCartResponse> | CalculateCartResponse;
     mergeGuestToUser(request: MergeGuestToUserRequest): Promise<CartResponse> | Observable<CartResponse> | CartResponse;
     addToWishlist(request: WishlistItemRequest): Promise<WishlistResponse> | Observable<WishlistResponse> | WishlistResponse;
     removeFromWishlist(request: WishlistItemRequest): Promise<WishlistResponse> | Observable<WishlistResponse> | WishlistResponse;

package/dist/gen/cart.js

@@ -31,6 +31,7 @@ function CartServiceControllerMethods() {
             "setComment",
             "setCheckoutDraft",
             "recalculate",
+            "calculateCrm",
             "mergeGuestToUser",
             "addToWishlist",
             "removeFromWishlist",

package/dist/gen/crm_calculation.d.ts

@@ -0,0 +1,98 @@
+import { Observable } from "rxjs";
+export declare const protobufPackage = "crm.v1";
+export interface CrmCalculationItem {
+    productId: string;
+    variantId: string;
+    categoryId: string;
+    brandId: string;
+    quantity: number;
+    unitPrice: number;
+    subtotal: number;
+}
+export interface CalculateCartRequest {
+    cartSessionId: string;
+    userId: string;
+    items: CrmCalculationItem[];
+    bonusToSpend: number;
+    totalAmount: number;
+    calculationDate: string;
+    orderId: string;
+    couponCodes: string[];
+    businessUnitEntryId: string;
+}
+export interface CrmCalculatedItem {
+    productId: string;
+    variantId: string;
+    quantity: number;
+    unitPrice: number;
+    lineTotal: number;
+    discountAmount: number;
+    promotionName: string;
+}
+export interface CrmAppliedPromotion {
+    id: string;
+    name: string;
+    discountAmount: number;
+}
+export interface CrmPromoError {
+    code: string;
+    message: string;
+}
+export interface CalculateCartResponse {
+    source: string;
+    degraded: boolean;
+    parsed: boolean;
+    subtotal: number;
+    discountTotal: number;
+    total: number;
+    bonusToDeduct: number;
+    bonusMaxSpend: number;
+    cashbackToEarn: number;
+    items: CrmCalculatedItem[];
+    promotions: CrmAppliedPromotion[];
+    promoErrors: CrmPromoError[];
+    crmTaskId: string;
+    crmCommentId: string;
+    rawResult: string;
+    durationMs: number;
+}
+export interface ReserveBonusesRequest {
+    userId: string;
+    cartSessionId: string;
+    amount: number;
+}
+export interface ReserveBonusesResponse {
+    success: boolean;
+    reserveId: string;
+    expiresAt: number;
+    available: number;
+    error: string;
+}
+export interface ReleaseBonusReserveRequest {
+    reserveId: string;
+    cartSessionId: string;
+}
+export interface ReleaseBonusReserveResponse {
+    success: boolean;
+}
+export interface InvalidateCartSessionRequest {
+    cartSessionId: string;
+}
+export interface InvalidateCartSessionResponse {
+    success: boolean;
+}
+export declare const CRM_V1_PACKAGE_NAME = "crm.v1";
+export interface CrmCalculationServiceClient {
+    calculateCart(request: CalculateCartRequest): Observable<CalculateCartResponse>;
+    invalidateCartSession(request: InvalidateCartSessionRequest): Observable<InvalidateCartSessionResponse>;
+    reserveBonuses(request: ReserveBonusesRequest): Observable<ReserveBonusesResponse>;
+    releaseBonusReserve(request: ReleaseBonusReserveRequest): Observable<ReleaseBonusReserveResponse>;
+}
+export interface CrmCalculationServiceController {
+    calculateCart(request: CalculateCartRequest): Promise<CalculateCartResponse> | Observable<CalculateCartResponse> | CalculateCartResponse;
+    invalidateCartSession(request: InvalidateCartSessionRequest): Promise<InvalidateCartSessionResponse> | Observable<InvalidateCartSessionResponse> | InvalidateCartSessionResponse;
+    reserveBonuses(request: ReserveBonusesRequest): Promise<ReserveBonusesResponse> | Observable<ReserveBonusesResponse> | ReserveBonusesResponse;
+    releaseBonusReserve(request: ReleaseBonusReserveRequest): Promise<ReleaseBonusReserveResponse> | Observable<ReleaseBonusReserveResponse> | ReleaseBonusReserveResponse;
+}
+export declare function CrmCalculationServiceControllerMethods(): (constructor: Function) => void;
+export declare const CRM_CALCULATION_SERVICE_NAME = "CrmCalculationService";

package/dist/gen/crm_calculation.js

@@ -0,0 +1,28 @@
+"use strict";
+// Code generated by protoc-gen-ts_proto. DO NOT EDIT.
+// versions:
+//   protoc-gen-ts_proto  v2.11.4
+//   protoc               v3.21.12
+// source: crm_calculation.proto
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CRM_CALCULATION_SERVICE_NAME = exports.CRM_V1_PACKAGE_NAME = exports.protobufPackage = void 0;
+exports.CrmCalculationServiceControllerMethods = CrmCalculationServiceControllerMethods;
+/* eslint-disable */
+const microservices_1 = require("@nestjs/microservices");
+exports.protobufPackage = "crm.v1";
+exports.CRM_V1_PACKAGE_NAME = "crm.v1";
+function CrmCalculationServiceControllerMethods() {
+    return function (constructor) {
+        const grpcMethods = ["calculateCart", "invalidateCartSession", "reserveBonuses", "releaseBonusReserve"];
+        for (const method of grpcMethods) {
+            const descriptor = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
+            (0, microservices_1.GrpcMethod)("CrmCalculationService", method)(constructor.prototype[method], method, descriptor);
+        }
+        const grpcStreamMethods = [];
+        for (const method of grpcStreamMethods) {
+            const descriptor = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
+            (0, microservices_1.GrpcStreamMethod)("CrmCalculationService", method)(constructor.prototype[method], method, descriptor);
+        }
+    };
+}
+exports.CRM_CALCULATION_SERVICE_NAME = "CrmCalculationService";

package/dist/gen/order.d.ts

@@ -124,6 +124,9 @@ export interface Order {
     updatedAt: number;
     notes: OrderNote[];
     archivedAt: number;
+    cancelledBy: string;
+    crmOrderId: string;
+    saleRecordedAt: number;
 }
 export interface CreateOrderRequest {
     idempotencyKey: string;
@@ -193,12 +196,23 @@ export interface UpdateStatusRequest {
     reason: string;
     actorId: string;
     actorName: string;
+    cancelledBy: string;
 }
 export interface CancelOrderRequest {
     id: string;
     reason: string;
     actorId: string;
     actorName: string;
+    cancelledBy: string;
+}
+export interface SetCrmOrderIdRequest {
+    id: string;
+    crmOrderId: string;
+}
+export interface ConfirmPickupRequest {
+    id: string;
+    actorId: string;
+    actorName: string;
 }
 export interface ArchiveOrderRequest {
     id: string;
@@ -281,6 +295,8 @@ export interface OrderServiceClient {
     removeTag(request: RemoveTagRequest): Observable<OrderResponse>;
     editItems(request: EditItemsRequest): Observable<OrderResponse>;
     setTrackingNumber(request: SetTrackingNumberRequest): Observable<OrderResponse>;
+    setCrmOrderId(request: SetCrmOrderIdRequest): Observable<OrderResponse>;
+    confirmPickup(request: ConfirmPickupRequest): Observable<OrderResponse>;
     reorderOrder(request: ReorderOrderRequest): Observable<ReorderResponse>;
     listHistory(request: ListHistoryRequest): Observable<ListHistoryResponse>;
     aggregateByCustomers(request: AggregateByCustomersRequest): Observable<AggregateByCustomersResponse>;
@@ -302,6 +318,8 @@ export interface OrderServiceController {
     removeTag(request: RemoveTagRequest): Promise<OrderResponse> | Observable<OrderResponse> | OrderResponse;
     editItems(request: EditItemsRequest): Promise<OrderResponse> | Observable<OrderResponse> | OrderResponse;
     setTrackingNumber(request: SetTrackingNumberRequest): Promise<OrderResponse> | Observable<OrderResponse> | OrderResponse;
+    setCrmOrderId(request: SetCrmOrderIdRequest): Promise<OrderResponse> | Observable<OrderResponse> | OrderResponse;
+    confirmPickup(request: ConfirmPickupRequest): Promise<OrderResponse> | Observable<OrderResponse> | OrderResponse;
     reorderOrder(request: ReorderOrderRequest): Promise<ReorderResponse> | Observable<ReorderResponse> | ReorderResponse;
     listHistory(request: ListHistoryRequest): Promise<ListHistoryResponse> | Observable<ListHistoryResponse> | ListHistoryResponse;
     aggregateByCustomers(request: AggregateByCustomersRequest): Promise<AggregateByCustomersResponse> | Observable<AggregateByCustomersResponse> | AggregateByCustomersResponse;

package/dist/gen/order.js

@@ -30,6 +30,8 @@ function OrderServiceControllerMethods() {
             "removeTag",
             "editItems",
             "setTrackingNumber",
+            "setCrmOrderId",
+            "confirmPickup",
             "reorderOrder",
             "listHistory",
             "aggregateByCustomers",

package/dist/gen/users.d.ts

@@ -45,6 +45,7 @@ export interface User {
     email?: string | undefined;
     phone?: string | undefined;
     internalNote?: string | undefined;
+    planfixContactId?: string | undefined;
 }
 export interface AdminUpdateCustomerRequest {
     id: string;

package/dist/proto/cart.proto

@@ -2,6 +2,8 @@ syntax = "proto3";
 
 package cart.v1;
 
+import "crm_calculation.proto";
+
 service CartService {
   rpc GetCart(GetCartRequest) returns (CartResponse);
 
@@ -29,6 +31,9 @@ service CartService {
 
   rpc Recalculate(RecalculateRequest) returns (CartResponse);
 
+  
+  rpc CalculateCrm(CalculateCrmRequest) returns (crm.v1.CalculateCartResponse);
+
   rpc MergeGuestToUser(MergeGuestToUserRequest) returns (CartResponse);
 
   rpc AddToWishlist(WishlistItemRequest) returns (WishlistResponse);
@@ -167,6 +172,12 @@ message GetCartRequest {
   CartOwner owner = 1;
 }
 
+message CalculateCrmRequest {
+  CartOwner owner = 1;
+
+  string calculation_date = 2;
+}
+
 message ClearCartRequest {
   CartOwner owner = 1;
 }

package/dist/proto/crm_calculation.proto

@@ -0,0 +1,122 @@
+syntax = "proto3";
+
+package crm.v1;
+
+
+service CrmCalculationService {
+  rpc CalculateCart(CalculateCartRequest) returns (CalculateCartResponse);
+
+  
+  rpc InvalidateCartSession(InvalidateCartSessionRequest) returns (InvalidateCartSessionResponse);
+
+  
+  rpc ReserveBonuses(ReserveBonusesRequest) returns (ReserveBonusesResponse);
+  rpc ReleaseBonusReserve(ReleaseBonusReserveRequest) returns (ReleaseBonusReserveResponse);
+}
+
+message CrmCalculationItem {
+  string product_id  = 1;
+  string variant_id  = 2; 
+  string category_id = 3; 
+  string brand_id    = 4; 
+  int32  quantity    = 5;
+  double unit_price  = 6;
+  double subtotal    = 7; 
+}
+
+message CalculateCartRequest {
+  string cart_session_id = 1; 
+  string user_id         = 2; 
+  repeated CrmCalculationItem items = 3;
+  double bonus_to_spend  = 4;
+  double total_amount    = 5;
+
+  string calculation_date = 6;
+  string order_id        = 7; 
+  repeated string coupon_codes = 8; 
+  string business_unit_entry_id = 9; 
+}
+
+message CrmCalculatedItem {
+  string product_id      = 1;
+  string variant_id      = 2;
+  int32  quantity        = 3;
+  double unit_price      = 4; 
+  double line_total      = 5;
+  double discount_amount = 6;
+  string promotion_name  = 7; 
+}
+
+message CrmAppliedPromotion {
+  string id              = 1;
+  string name            = 2;
+  double discount_amount = 3;
+}
+
+message CrmPromoError {
+  string code    = 1; 
+  string message = 2;
+}
+
+message CalculateCartResponse {
+  
+  string source = 1;
+  
+  bool degraded = 2;
+  
+  bool parsed = 3;
+
+  double subtotal         = 4;
+  double discount_total   = 5;
+  double total            = 6;
+  double bonus_to_deduct  = 7;
+  double bonus_max_spend  = 8;
+  double cashback_to_earn = 9;
+
+  repeated CrmCalculatedItem items = 10;
+  repeated CrmAppliedPromotion promotions = 11;
+  repeated CrmPromoError promo_errors = 12;
+
+
+  string crm_task_id    = 13;
+  string crm_comment_id = 14;
+ 
+  string raw_result = 15;
+
+  int32 duration_ms = 16;
+}
+
+message ReserveBonusesRequest {
+  string user_id         = 1;
+  string cart_session_id = 2;
+  double amount          = 3;
+}
+
+message ReserveBonusesResponse {
+  bool   success    = 1;
+  string reserve_id = 2;
+  
+  int64  expires_at = 3;
+  
+  double available  = 4;
+
+  string error      = 5;
+}
+
+message ReleaseBonusReserveRequest {
+  
+  string reserve_id      = 1;
+  string cart_session_id = 2;
+}
+
+message ReleaseBonusReserveResponse {
+  bool success = 1;
+}
+
+message InvalidateCartSessionRequest {
+  string cart_session_id = 1;
+}
+
+message InvalidateCartSessionResponse {
+  bool success = 1;
+}

package/dist/proto/order.proto

@@ -26,6 +26,11 @@ service OrderService {
   rpc EditItems(EditItemsRequest) returns (OrderResponse);
   rpc SetTrackingNumber(SetTrackingNumberRequest) returns (OrderResponse);
 
+  
+  rpc SetCrmOrderId(SetCrmOrderIdRequest) returns (OrderResponse);
+  
+  rpc ConfirmPickup(ConfirmPickupRequest) returns (OrderResponse);
+
   rpc ReorderOrder(ReorderOrderRequest) returns (ReorderResponse);
 
   rpc ListHistory(ListHistoryRequest) returns (ListHistoryResponse);
@@ -183,6 +188,13 @@ message Order {
 
   
   int64  archived_at = 23;
+
+ 
+  string cancelled_by = 24;
+
+  string crm_order_id = 25;
+  
+  int64  sale_recorded_at = 26;
 }
 
 
@@ -265,6 +277,8 @@ message UpdateStatusRequest {
   string reason    = 3;
   string actor_id  = 4;
   string actor_name = 5;
+  
+  string cancelled_by = 6;
 }
 
 message CancelOrderRequest {
@@ -272,6 +286,19 @@ message CancelOrderRequest {
   string reason    = 2;
   string actor_id  = 3;
   string actor_name = 4;
+  
+  string cancelled_by = 5;
+}
+
+message SetCrmOrderIdRequest {
+  string id           = 1;
+  string crm_order_id = 2;
+}
+
+message ConfirmPickupRequest {
+  string id         = 1;
+  string actor_id   = 2;
+  string actor_name = 3;
 }
 
 message ArchiveOrderRequest {

package/dist/proto/users.proto

@@ -94,6 +94,8 @@ message User {
   optional string email = 5;
   optional string phone = 6;
   optional string internal_note = 7;
+  
+  optional string planfix_contact_id = 8;
 }
 
 message AdminUpdateCustomerRequest {

package/dist/src/proto/paths.d.ts

@@ -36,6 +36,7 @@ export declare const PROTO_PATHS: {
     readonly PAGE: string;
     readonly SITE_SETTINGS: string;
     readonly CART: string;
+    readonly CRM_CALCULATION: string;
     readonly ORDER: string;
     readonly MANAGER: string;
     readonly PAYMENT: string;

package/dist/src/proto/paths.js

@@ -40,6 +40,7 @@ exports.PROTO_PATHS = {
     PAGE: (0, node_path_1.join)(__dirname, '../../proto/page.proto'),
     SITE_SETTINGS: (0, node_path_1.join)(__dirname, '../../proto/site_settings.proto'),
     CART: (0, node_path_1.join)(__dirname, '../../proto/cart.proto'),
+    CRM_CALCULATION: (0, node_path_1.join)(__dirname, '../../proto/crm_calculation.proto'),
     ORDER: (0, node_path_1.join)(__dirname, '../../proto/order.proto'),
     MANAGER: (0, node_path_1.join)(__dirname, '../../proto/manager.proto'),
     PAYMENT: (0, node_path_1.join)(__dirname, '../../proto/payment.proto'),

package/events/orders/index.ts

@@ -1,3 +1,4 @@
 export * from './order-cancelled.interface'
 export * from './order-created.interface'
 export * from './order-status-changed.interface'
+export * from './order-crm.interface'

package/events/orders/order-cancelled.interface.ts

@@ -2,6 +2,8 @@ export interface OrderCancelledEvent {
 	orderId: string
 	orderNumber: string
 	reason: string
+
+	cancelledBy?: string
 	actorId?: string
 	actorName?: string
 	wasPaid: boolean

package/events/orders/order-created.interface.ts

@@ -5,16 +5,16 @@ export interface OrderCreatedEvent {
 	guestId?: string
 	source: string
 	totals: {
-		grandTotal: number
-		shippingCost: number
-		bonusesEarned: number
+		grandTotal: string
+		shippingCost: string
+		bonusesEarned: string
 	}
 	items: Array<{
 		productId: string
 		variantId?: string
 		sku: string
 		quantity: number
-		price: number
+		price: string
 	}>
 	delivery: {
 		method: string
@@ -24,7 +24,7 @@ export interface OrderCreatedEvent {
 	}
 	payment: {
 		provider: string
-		amount: number
+		amount: string
 		idempotencyKey: string
 	}
 	customer: {

package/events/orders/order-crm.interface.ts

@@ -0,0 +1,26 @@
+export interface OrderCrmPlacedEvent {
+	orderId: string
+	orderNumber: string
+	userId?: string
+
+	cartSessionId?: string
+	placedAt: number
+	grandTotal: string
+	bonusesUsed: string
+	items: Array<{
+		productId: string
+		variantId?: string
+		quantity: number
+		price: string
+		lineTotal: string
+	}>
+}
+
+export interface OrderSaleRecordedEvent {
+	orderId: string
+	invoiceId: string
+	pickupPointId?: string
+	totalAmount: string
+	saleDate: string
+	recordedAt: number
+}

package/events/orders/order-status-changed.interface.ts

@@ -4,6 +4,8 @@ export interface OrderStatusChangedEvent {
 	fromStatus: string
 	toStatus: string
 	reason?: string
+
+	cancelledBy?: string
 	actorId?: string
 	actorName?: string
 	changedAt: number

package/events/payments/payment-cancelled.interface.ts

@@ -3,7 +3,7 @@ export interface PaymentCancelledEvent {
 	orderId: string
 	provider: string
 	providerInvoiceId: string
-	amount: number
+	amount: string
 	reason?: string
 	cancelledAt: number
 }

package/events/payments/payment-captured.interface.ts

@@ -3,8 +3,8 @@ export interface PaymentCapturedEvent {
 	orderId: string
 	provider: string
 	providerInvoiceId: string
-	amount: number
-	capturedAmount: number
+	amount: string
+	capturedAmount: string
 	currency: string
 	capturedAt: number
 }

package/events/payments/payment-failed.interface.ts

@@ -3,7 +3,7 @@ export interface PaymentFailedEvent {
 	orderId: string
 	provider: string
 	providerInvoiceId?: string
-	amount: number
+	amount: string
 	failureReason: string
 	failedAt: number
 }

package/events/payments/payment-held.interface.ts

@@ -3,7 +3,7 @@ export interface PaymentHeldEvent {
 	orderId: string
 	provider: string
 	providerInvoiceId: string
-	amount: number
+	amount: string
 	currency: string
 	heldAt: number
 }

package/events/payments/payment-refunded.interface.ts

@@ -3,9 +3,9 @@ export interface PaymentRefundedEvent {
 	orderId: string
 	provider: string
 	providerInvoiceId: string
-	refundAmount: number
-	totalRefunded: number
-	originalAmount: number
+	refundAmount: string
+	totalRefunded: string
+	originalAmount: string
 	isPartial: boolean
 	reason?: string
 	refundedAt: number

package/gen/cart.ts

@@ -7,6 +7,7 @@
 /* eslint-disable */
 import { GrpcMethod, GrpcStreamMethod } from "@nestjs/microservices";
 import { Observable } from "rxjs";
+import { CalculateCartResponse } from "./crm_calculation";
 
 export const protobufPackage = "cart.v1";
 
@@ -137,6 +138,11 @@ export interface GetCartRequest {
   owner: CartOwner | undefined;
 }
 
+export interface CalculateCrmRequest {
+  owner: CartOwner | undefined;
+  calculationDate: string;
+}
+
 export interface ClearCartRequest {
   owner: CartOwner | undefined;
 }
@@ -287,6 +293,8 @@ export interface CartServiceClient {
 
   recalculate(request: RecalculateRequest): Observable<CartResponse>;
 
+  calculateCrm(request: CalculateCrmRequest): Observable<CalculateCartResponse>;
+
   mergeGuestToUser(request: MergeGuestToUserRequest): Observable<CartResponse>;
 
   addToWishlist(request: WishlistItemRequest): Observable<WishlistResponse>;
@@ -331,6 +339,10 @@ export interface CartServiceController {
 
   recalculate(request: RecalculateRequest): Promise<CartResponse> | Observable<CartResponse> | CartResponse;
 
+  calculateCrm(
+    request: CalculateCrmRequest,
+  ): Promise<CalculateCartResponse> | Observable<CalculateCartResponse> | CalculateCartResponse;
+
   mergeGuestToUser(request: MergeGuestToUserRequest): Promise<CartResponse> | Observable<CartResponse> | CartResponse;
 
   addToWishlist(
@@ -366,6 +378,7 @@ export function CartServiceControllerMethods() {
       "setComment",
       "setCheckoutDraft",
       "recalculate",
+      "calculateCrm",
       "mergeGuestToUser",
       "addToWishlist",
       "removeFromWishlist",

package/gen/crm_calculation.ts

@@ -0,0 +1,151 @@
+// Code generated by protoc-gen-ts_proto. DO NOT EDIT.
+// versions:
+//   protoc-gen-ts_proto  v2.11.4
+//   protoc               v3.21.12
+// source: crm_calculation.proto
+
+/* eslint-disable */
+import { GrpcMethod, GrpcStreamMethod } from "@nestjs/microservices";
+import { Observable } from "rxjs";
+
+export const protobufPackage = "crm.v1";
+
+export interface CrmCalculationItem {
+  productId: string;
+  variantId: string;
+  categoryId: string;
+  brandId: string;
+  quantity: number;
+  unitPrice: number;
+  subtotal: number;
+}
+
+export interface CalculateCartRequest {
+  cartSessionId: string;
+  userId: string;
+  items: CrmCalculationItem[];
+  bonusToSpend: number;
+  totalAmount: number;
+  calculationDate: string;
+  orderId: string;
+  couponCodes: string[];
+  businessUnitEntryId: string;
+}
+
+export interface CrmCalculatedItem {
+  productId: string;
+  variantId: string;
+  quantity: number;
+  unitPrice: number;
+  lineTotal: number;
+  discountAmount: number;
+  promotionName: string;
+}
+
+export interface CrmAppliedPromotion {
+  id: string;
+  name: string;
+  discountAmount: number;
+}
+
+export interface CrmPromoError {
+  code: string;
+  message: string;
+}
+
+export interface CalculateCartResponse {
+  source: string;
+  degraded: boolean;
+  parsed: boolean;
+  subtotal: number;
+  discountTotal: number;
+  total: number;
+  bonusToDeduct: number;
+  bonusMaxSpend: number;
+  cashbackToEarn: number;
+  items: CrmCalculatedItem[];
+  promotions: CrmAppliedPromotion[];
+  promoErrors: CrmPromoError[];
+  crmTaskId: string;
+  crmCommentId: string;
+  rawResult: string;
+  durationMs: number;
+}
+
+export interface ReserveBonusesRequest {
+  userId: string;
+  cartSessionId: string;
+  amount: number;
+}
+
+export interface ReserveBonusesResponse {
+  success: boolean;
+  reserveId: string;
+  expiresAt: number;
+  available: number;
+  error: string;
+}
+
+export interface ReleaseBonusReserveRequest {
+  reserveId: string;
+  cartSessionId: string;
+}
+
+export interface ReleaseBonusReserveResponse {
+  success: boolean;
+}
+
+export interface InvalidateCartSessionRequest {
+  cartSessionId: string;
+}
+
+export interface InvalidateCartSessionResponse {
+  success: boolean;
+}
+
+export const CRM_V1_PACKAGE_NAME = "crm.v1";
+
+export interface CrmCalculationServiceClient {
+  calculateCart(request: CalculateCartRequest): Observable<CalculateCartResponse>;
+
+  invalidateCartSession(request: InvalidateCartSessionRequest): Observable<InvalidateCartSessionResponse>;
+
+  reserveBonuses(request: ReserveBonusesRequest): Observable<ReserveBonusesResponse>;
+
+  releaseBonusReserve(request: ReleaseBonusReserveRequest): Observable<ReleaseBonusReserveResponse>;
+}
+
+export interface CrmCalculationServiceController {
+  calculateCart(
+    request: CalculateCartRequest,
+  ): Promise<CalculateCartResponse> | Observable<CalculateCartResponse> | CalculateCartResponse;
+
+  invalidateCartSession(
+    request: InvalidateCartSessionRequest,
+  ): Promise<InvalidateCartSessionResponse> | Observable<InvalidateCartSessionResponse> | InvalidateCartSessionResponse;
+
+  reserveBonuses(
+    request: ReserveBonusesRequest,
+  ): Promise<ReserveBonusesResponse> | Observable<ReserveBonusesResponse> | ReserveBonusesResponse;
+
+  releaseBonusReserve(
+    request: ReleaseBonusReserveRequest,
+  ): Promise<ReleaseBonusReserveResponse> | Observable<ReleaseBonusReserveResponse> | ReleaseBonusReserveResponse;
+}
+
+export function CrmCalculationServiceControllerMethods() {
+  return function (constructor: Function) {
+    const grpcMethods: string[] = ["calculateCart", "invalidateCartSession", "reserveBonuses", "releaseBonusReserve"];
+    for (const method of grpcMethods) {
+      const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
+      GrpcMethod("CrmCalculationService", method)(constructor.prototype[method], method, descriptor);
+    }
+    const grpcStreamMethods: string[] = [];
+    for (const method of grpcStreamMethods) {
+      const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
+      GrpcStreamMethod("CrmCalculationService", method)(constructor.prototype[method], method, descriptor);
+    }
+  };
+}
+
+export const CRM_CALCULATION_SERVICE_NAME = "CrmCalculationService";

package/gen/order.ts

@@ -146,6 +146,9 @@ export interface Order {
   updatedAt: number;
   notes: OrderNote[];
   archivedAt: number;
+  cancelledBy: string;
+  crmOrderId: string;
+  saleRecordedAt: number;
 }
 
 export interface CreateOrderRequest {
@@ -224,6 +227,7 @@ export interface UpdateStatusRequest {
   reason: string;
   actorId: string;
   actorName: string;
+  cancelledBy: string;
 }
 
 export interface CancelOrderRequest {
@@ -231,6 +235,18 @@ export interface CancelOrderRequest {
   reason: string;
   actorId: string;
   actorName: string;
+  cancelledBy: string;
+}
+
+export interface SetCrmOrderIdRequest {
+  id: string;
+  crmOrderId: string;
+}
+
+export interface ConfirmPickupRequest {
+  id: string;
+  actorId: string;
+  actorName: string;
 }
 
 export interface ArchiveOrderRequest {
@@ -344,6 +360,10 @@ export interface OrderServiceClient {
 
   setTrackingNumber(request: SetTrackingNumberRequest): Observable<OrderResponse>;
 
+  setCrmOrderId(request: SetCrmOrderIdRequest): Observable<OrderResponse>;
+
+  confirmPickup(request: ConfirmPickupRequest): Observable<OrderResponse>;
+
   reorderOrder(request: ReorderOrderRequest): Observable<ReorderResponse>;
 
   listHistory(request: ListHistoryRequest): Observable<ListHistoryResponse>;
@@ -394,6 +414,10 @@ export interface OrderServiceController {
     request: SetTrackingNumberRequest,
   ): Promise<OrderResponse> | Observable<OrderResponse> | OrderResponse;
 
+  setCrmOrderId(request: SetCrmOrderIdRequest): Promise<OrderResponse> | Observable<OrderResponse> | OrderResponse;
+
+  confirmPickup(request: ConfirmPickupRequest): Promise<OrderResponse> | Observable<OrderResponse> | OrderResponse;
+
   reorderOrder(request: ReorderOrderRequest): Promise<ReorderResponse> | Observable<ReorderResponse> | ReorderResponse;
 
   listHistory(
@@ -424,6 +448,8 @@ export function OrderServiceControllerMethods() {
       "removeTag",
       "editItems",
       "setTrackingNumber",
+      "setCrmOrderId",
+      "confirmPickup",
       "reorderOrder",
       "listHistory",
       "aggregateByCustomers",

package/gen/users.ts

@@ -63,6 +63,7 @@ export interface User {
   email?: string | undefined;
   phone?: string | undefined;
   internalNote?: string | undefined;
+  planfixContactId?: string | undefined;
 }
 
 export interface AdminUpdateCustomerRequest {

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@mamindom/contracts",
 	"description": "proto",
-	"version": "1.0.152",
+	"version": "1.0.155",
 	"main": "./dist/src/index.js",
 	"types": "./dist/src/index.d.ts",
 	"exports": {

package/proto/cart.proto

@@ -2,6 +2,8 @@ syntax = "proto3";
 
 package cart.v1;
 
+import "crm_calculation.proto";
+
 service CartService {
   rpc GetCart(GetCartRequest) returns (CartResponse);
 
@@ -29,6 +31,9 @@ service CartService {
 
   rpc Recalculate(RecalculateRequest) returns (CartResponse);
 
+  
+  rpc CalculateCrm(CalculateCrmRequest) returns (crm.v1.CalculateCartResponse);
+
   rpc MergeGuestToUser(MergeGuestToUserRequest) returns (CartResponse);
 
   rpc AddToWishlist(WishlistItemRequest) returns (WishlistResponse);
@@ -167,6 +172,12 @@ message GetCartRequest {
   CartOwner owner = 1;
 }
 
+message CalculateCrmRequest {
+  CartOwner owner = 1;
+
+  string calculation_date = 2;
+}
+
 message ClearCartRequest {
   CartOwner owner = 1;
 }

package/proto/crm_calculation.proto

@@ -0,0 +1,122 @@
+syntax = "proto3";
+
+package crm.v1;
+
+
+service CrmCalculationService {
+  rpc CalculateCart(CalculateCartRequest) returns (CalculateCartResponse);
+
+  
+  rpc InvalidateCartSession(InvalidateCartSessionRequest) returns (InvalidateCartSessionResponse);
+
+  
+  rpc ReserveBonuses(ReserveBonusesRequest) returns (ReserveBonusesResponse);
+  rpc ReleaseBonusReserve(ReleaseBonusReserveRequest) returns (ReleaseBonusReserveResponse);
+}
+
+message CrmCalculationItem {
+  string product_id  = 1;
+  string variant_id  = 2; 
+  string category_id = 3; 
+  string brand_id    = 4; 
+  int32  quantity    = 5;
+  double unit_price  = 6;
+  double subtotal    = 7; 
+}
+
+message CalculateCartRequest {
+  string cart_session_id = 1; 
+  string user_id         = 2; 
+  repeated CrmCalculationItem items = 3;
+  double bonus_to_spend  = 4;
+  double total_amount    = 5;
+
+  string calculation_date = 6;
+  string order_id        = 7; 
+  repeated string coupon_codes = 8; 
+  string business_unit_entry_id = 9; 
+}
+
+message CrmCalculatedItem {
+  string product_id      = 1;
+  string variant_id      = 2;
+  int32  quantity        = 3;
+  double unit_price      = 4; 
+  double line_total      = 5;
+  double discount_amount = 6;
+  string promotion_name  = 7; 
+}
+
+message CrmAppliedPromotion {
+  string id              = 1;
+  string name            = 2;
+  double discount_amount = 3;
+}
+
+message CrmPromoError {
+  string code    = 1; 
+  string message = 2;
+}
+
+message CalculateCartResponse {
+  
+  string source = 1;
+  
+  bool degraded = 2;
+  
+  bool parsed = 3;
+
+  double subtotal         = 4;
+  double discount_total   = 5;
+  double total            = 6;
+  double bonus_to_deduct  = 7;
+  double bonus_max_spend  = 8;
+  double cashback_to_earn = 9;
+
+  repeated CrmCalculatedItem items = 10;
+  repeated CrmAppliedPromotion promotions = 11;
+  repeated CrmPromoError promo_errors = 12;
+
+
+  string crm_task_id    = 13;
+  string crm_comment_id = 14;
+ 
+  string raw_result = 15;
+
+  int32 duration_ms = 16;
+}
+
+message ReserveBonusesRequest {
+  string user_id         = 1;
+  string cart_session_id = 2;
+  double amount          = 3;
+}
+
+message ReserveBonusesResponse {
+  bool   success    = 1;
+  string reserve_id = 2;
+  
+  int64  expires_at = 3;
+  
+  double available  = 4;
+
+  string error      = 5;
+}
+
+message ReleaseBonusReserveRequest {
+  
+  string reserve_id      = 1;
+  string cart_session_id = 2;
+}
+
+message ReleaseBonusReserveResponse {
+  bool success = 1;
+}
+
+message InvalidateCartSessionRequest {
+  string cart_session_id = 1;
+}
+
+message InvalidateCartSessionResponse {
+  bool success = 1;
+}

package/proto/order.proto

@@ -26,6 +26,11 @@ service OrderService {
   rpc EditItems(EditItemsRequest) returns (OrderResponse);
   rpc SetTrackingNumber(SetTrackingNumberRequest) returns (OrderResponse);
 
+  
+  rpc SetCrmOrderId(SetCrmOrderIdRequest) returns (OrderResponse);
+  
+  rpc ConfirmPickup(ConfirmPickupRequest) returns (OrderResponse);
+
   rpc ReorderOrder(ReorderOrderRequest) returns (ReorderResponse);
 
   rpc ListHistory(ListHistoryRequest) returns (ListHistoryResponse);
@@ -183,6 +188,13 @@ message Order {
 
   
   int64  archived_at = 23;
+
+ 
+  string cancelled_by = 24;
+
+  string crm_order_id = 25;
+  
+  int64  sale_recorded_at = 26;
 }
 
 
@@ -265,6 +277,8 @@ message UpdateStatusRequest {
   string reason    = 3;
   string actor_id  = 4;
   string actor_name = 5;
+  
+  string cancelled_by = 6;
 }
 
 message CancelOrderRequest {
@@ -272,6 +286,19 @@ message CancelOrderRequest {
   string reason    = 2;
   string actor_id  = 3;
   string actor_name = 4;
+  
+  string cancelled_by = 5;
+}
+
+message SetCrmOrderIdRequest {
+  string id           = 1;
+  string crm_order_id = 2;
+}
+
+message ConfirmPickupRequest {
+  string id         = 1;
+  string actor_id   = 2;
+  string actor_name = 3;
 }
 
 message ArchiveOrderRequest {

package/proto/users.proto

@@ -94,6 +94,8 @@ message User {
   optional string email = 5;
   optional string phone = 6;
   optional string internal_note = 7;
+  
+  optional string planfix_contact_id = 8;
 }
 
 message AdminUpdateCustomerRequest {