@peabody-soft/mbs-protos 1.4.0 → 1.6.0

package/Constants.proto

@@ -148,7 +148,7 @@ enum Constants {
   ENTITY_ID_UTILITIES = 1;
   ENTITY_ID_UNASSIGNED = 255;
 
-  // The two price lists every business is created with (PriceList.DEFAULT_SALE_PRICE_LIST_ID /
+  // The two price lists every business is created with (PriceListIds.DEFAULT_SALE_PRICE_LIST_ID /
   // DEFAULT_PURCHASE_PRICE_LIST_ID), well known rather than assigned. These are the low parts of a
   // 64 bit id too big for an enum value: id = (PRICE_LIST_ENTITY_TYPE_ID << ENTITY_TYPE_BIT_SHIFT) |
   // value, using 64 bit arithmetic. The sale list is what a business sells from unless given
@@ -157,6 +157,14 @@ enum Constants {
   DEFAULT_SALE_PRICE_LIST = 0;
   DEFAULT_PURCHASE_PRICE_LIST = 1;
 
+  // The other built-in price lists (PriceListIds.MERABILLS_ONLINE / AMAZON_SELLER /
+  // FACEBOOK_MARKETPLACE / WHATSAPP_BUSINESS), well known rather than assigned, built the same way
+  // as DEFAULT_SALE_PRICE_LIST / DEFAULT_PURCHASE_PRICE_LIST above.
+  MERABILLS_ONLINE_PRICE_LIST = 64;
+  AMAZON_SELLER_PRICE_LIST = 65;
+  FACEBOOK_MARKETPLACE_PRICE_LIST = 66;
+  WHATSAPP_BUSINESS_PRICE_LIST = 67;
+
   // The earliest valid Entity.createdAt / updatedAt, in milliseconds since Jan 1, 1970 UTC. Default
   // entities are created with this time so that a copy from another device always wins a sync.
   DEFAULT_ENTITY_CREATED_AT = 1;

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.4.0",
+  "version": "1.6.0",
   "description": "The MeraBills shop wire protocol",
   "author": "Peabody Soft",
   "license": "AGPL-3.0-or-later",