@peabody-soft/mbs-protos 1.3.0 → 1.5.0

package/BusinessSyncInRequest.proto

@@ -12,9 +12,8 @@ import "Message.proto";
 // own and are replaced by the server, which returns the new ones in the BusinessSyncInResponse.
 message BusinessSyncInRequest {
 
-  // The business these entities belong to - its unique, lower case, url friendly id
-  // (Constants.BUSINESS_ID_MIN_LENGTH to Constants.BUSINESS_ID_MAX_LENGTH).
-  string businessId = 1;
+  // Client-side cursor for the customer's orders and shopping cart (Constants.MESSAGE_ENTITY_TYPE_ID).
+  int64 messageUpdateNumber = 1;
 
   // The shopping cart (a PartyPreferencesPayload) and orders (a SalesOrderPayload) of the customer -
   // entity type Constants.MESSAGE_ENTITY_TYPE_ID, the only entity type a customer may push.

package/BusinessSyncInResponse.proto

@@ -4,6 +4,7 @@ option java_multiple_files = true;
 option java_package = "com.merabills.server.core.generated";
 
 import "AuthTokens.proto";
+import "Message.proto";
 
 // The answer to a BusinessSyncInRequest: the update number the server assigned to the pushed
 // entities, one per entity type. Raise the matching cursor to this value so the next sync out does
@@ -15,7 +16,6 @@ message BusinessSyncInResponse {
   // what the client already holds still works - never a signal to drop the tokens it has.
   optional AuthTokens authTokens = 1;
 
-  // Highest update number assigned to the messages of the request - entity type
-  // Constants.MESSAGE_ENTITY_TYPE_ID, the only entity field this response carries.
-  int64 messageUpdateNumber = 2;
+  // The orders of the customer, and their shopping cart
+  repeated Message messages = 2;
 }

package/SalesOrderPayload.proto

@@ -3,12 +3,12 @@ package com.merabills.storefront;
 option java_multiple_files = true;
 option java_package = "com.merabills.server.core.generated";
 
+import "Address.proto";
 import "FulfillmentMode.proto";
 import "OrderStatus.proto";
 import "ShoppingList.proto";
 
-// The payload of a SALES_ORDER message: an order placed by a customer. Payments made against it are
-// not part of this payload.
+// The payload of a SALES_ORDER message: an order placed by a customer.
 // Excluded: serviceStationNumber, dueDate.
 message SalesOrderPayload {
 
@@ -28,9 +28,15 @@ message SalesOrderPayload {
   // Id of the delivery address, in User.addresses of the customer. 0 means no address.
   int64 deliveryAddressId = 6;
 
+  // If present, takes precedence over delivery address id
+  Address deliveryAddress = 7;
+
   // Time this order was created, in milliseconds since Jan 1, 1970 00:00:00 UTC
-  int64 creationDate = 7;
+  int64 creationDate = 8;
 
   // Note from the customer (at most Constants.SALES_ORDER_NOTE_MAX_LENGTH)
-  optional string note = 8;
-}
+  optional string note = 9;
+
+  // Payment received towards this order so far. Can only be set by an operator of the business.
+  optional int64 paymentReceived = 10;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peabody-soft/mbs-protos",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "description": "The MeraBills shop wire protocol",
   "author": "Peabody Soft",
   "license": "AGPL-3.0-or-later",