@restorecommerce/protos 6.8.0 → 6.8.2

package/CHANGELOG.md

@@ -3,6 +3,31 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.8.2](https://github.com/restorecommerce/libs/compare/@restorecommerce/protos@6.8.1...@restorecommerce/protos@6.8.2) (2024-04-19)
+
+
+### Bug Fixes
+
+* **ordering:** remove fulfillment state and payment state from order ([73ab259](https://github.com/restorecommerce/libs/commit/73ab25928fb7ce3cc9b19e7ac06cda31b2f0f78e))
+* **protos:** rename State to FulfillmentState ([4debc8b](https://github.com/restorecommerce/libs/commit/4debc8bfcb7e870ca827826cb3d58c2f6aa20840))
+
+
+
+
+
+## [6.8.1](https://github.com/restorecommerce/libs/compare/@restorecommerce/protos@6.8.0...@restorecommerce/protos@6.8.1) (2024-04-15)
+
+
+### Bug Fixes
+
+* **order_state:** remove FAILED and INVALID from order_state ([6a0c6bf](https://github.com/restorecommerce/libs/commit/6a0c6bfb54d00e5c169bd2d688f773baff8a88c8))
+* **product:** add missing imports for resolver ([be68bdf](https://github.com/restorecommerce/libs/commit/be68bdfa5a281454a641808895bd227cdbc6e605))
+* **timezone:** more information in timezone, fix invalid resolver on product.taxIds ([106ef81](https://github.com/restorecommerce/libs/commit/106ef81533ce279129c5d8be89f7070382a705da))
+
+
+
+
+
 # [6.8.0](https://github.com/restorecommerce/libs/compare/@restorecommerce/protos@6.7.0...@restorecommerce/protos@6.8.0) (2024-03-05)
 
 

package/io/restorecommerce/fulfillment.proto

@@ -89,15 +89,15 @@ service FulfillmentService {
   rpc TriggerInvoice (FulfillmentInvoiceRequestList) returns (io.restorecommerce.status.StatusListResponse);
 }
 
-enum State {
-  FAILED = 0;
+enum FulfillmentState {
+  PENDING = 0;
   INVALID = 1;
-  CREATED = 2;
-  SUBMITTED = 3;
-  IN_TRANSIT = 4;
-  FULFILLED = 5;
-  WITHDRAWN = 6;
-  CANCELLED = 7;
+  SUBMITTED = 2;
+  IN_TRANSIT = 3;
+  COMPLETED = 4;
+  WITHDRAWN = 5;
+  CANCELLED = 6;
+  FAILED = 7;
 }
 
 message Item {
@@ -133,7 +133,7 @@ message Label {
   }
   optional string parcel_id = 4;
   optional string shipment_number = 5; //filled on Order
-  optional State state = 6; //update by Track
+  optional FulfillmentState state = 6; //update by Track
   optional io.restorecommerce.status.Status status = 7; //API status
 }
 
@@ -207,7 +207,7 @@ message Fulfillment {
   repeated Label labels = 8; //set by service
   repeated Tracking trackings = 9; //set by service
   repeated io.restorecommerce.amount.Amount total_amounts = 10; //set by service
-  optional State state = 11; //set by service
+  optional FulfillmentState fulfillment_state = 11; //set by service
 }
 
 message FulfillmentList {

package/io/restorecommerce/locale.proto

@@ -45,6 +45,7 @@ message LocaleResponse {
 message Locale {
   optional string id = 1;
   optional io.restorecommerce.meta.Meta meta = 2;
-  optional string value = 3;
+  optional string value = 3; // official symbole
   optional string description = 4;
+  optional string name = 5; // display name
 }

package/io/restorecommerce/order.proto

@@ -21,6 +21,7 @@ import "io/restorecommerce/invoice.proto";
 import "io/restorecommerce/user.proto";
 import "io/restorecommerce/customer.proto";
 import "io/restorecommerce/shop.proto";
+import "io/restorecommerce/product.proto";
 
 
 service OrderService {
@@ -50,14 +51,11 @@ service OrderService {
 }
 
 enum OrderState {
-  FAILED = 0;
-  INVALID = 1;
-  CREATED = 2;
-  SUBMITTED = 3;
-  IN_PROCESS = 4;
-  DONE = 5;
-  WITHDRAWN = 6;
-  CANCELLED = 7;
+  PENDING = 0;
+  SUBMITTED = 1;
+  COMPLETED = 2;
+  WITHDRAWN = 3;
+  CANCELLED = 4;
 }
 
 enum FulfillmentInvoiceMode {
@@ -126,15 +124,13 @@ message Order {
   ];
   repeated Item items = 6;
   optional OrderState order_state = 7;                                         // Set by service
-  optional io.restorecommerce.fulfillment.State fulfillment_state = 8;    // Set by kafka
-  optional io.restorecommerce.invoice.PaymentState payment_state = 9;            // Set by kafka
-  repeated io.restorecommerce.amount.Amount total_amounts = 10;                // Set by service --- repeated in case of variant currency?
-  optional io.restorecommerce.address.ShippingAddress shipping_address = 11;
-  optional io.restorecommerce.address.BillingAddress billing_address = 12;
-  optional string notification_email = 13;
-  optional string customer_order_nr = 14;
-  optional string customer_remark = 15;
-  optional io.restorecommerce.fulfillment_product.Preferences packaging_preferences = 16;
+  repeated io.restorecommerce.amount.Amount total_amounts = 8;                // Set by service --- repeated in case of variant currency?
+  optional io.restorecommerce.address.ShippingAddress shipping_address = 9;
+  optional io.restorecommerce.address.BillingAddress billing_address = 10;
+  optional string notification_email = 11;
+  optional string customer_order_nr = 12;
+  optional string customer_remark = 13;
+  optional io.restorecommerce.fulfillment_product.Preferences packaging_preferences = 14;
 }
 
 message OrderIdList {

package/io/restorecommerce/product.proto

@@ -15,6 +15,8 @@ import "io/restorecommerce/price.proto";
 import "io/restorecommerce/options.proto";
 
 // Used by resolvers
+import "io/restorecommerce/product_category.proto";
+import "io/restorecommerce/product_prototype.proto";
 import "io/restorecommerce/manufacturer.proto";
 import "io/restorecommerce/property.proto";
 import "io/restorecommerce/shop.proto";
@@ -125,15 +127,7 @@ message IndividualProduct {
       }
     ];
   }
-  repeated string tax_ids = 8 [
-    (io.restorecommerce.options.resolver) = {
-      target_type: ".io.restorecommerce.tax.Tax",
-      target_service: "master_data",
-      target_sub_service: "tax",
-      target_method: "Read",
-      field_name: "tax",
-    }
-  ];
+  repeated string tax_ids = 8;
   optional string gtin = 10;
   oneof nature {
     PhysicalProduct physical = 11;
@@ -188,15 +182,7 @@ message PhysicalVariant {
   optional string stock_keeping_unit = 8;
   optional string parent_variant_id = 9;
   repeated io.restorecommerce.property.Property properties = 10;
-  repeated string tax_ids = 11 [
-    (io.restorecommerce.options.resolver) = {
-      target_type: ".io.restorecommerce.tax.Tax",
-      target_service: "master_data",
-      target_sub_service: "tax",
-      target_method: "Read",
-      field_name: "tax",
-    }
-  ];
+  repeated string tax_ids = 11;
   optional Package package = 12;
 }
 
@@ -211,15 +197,7 @@ message ServiceVariant {
   optional string stock_keeping_unit = 8;
   optional string parent_variant_id = 9;
   repeated io.restorecommerce.property.Property properties = 10;
-  repeated string tax_ids = 11 [
-    (io.restorecommerce.options.resolver) = {
-      target_type: ".io.restorecommerce.tax.Tax",
-      target_service: "master_data",
-      target_sub_service: "tax",
-      target_method: "Read",
-      field_name: "tax",
-    }
-  ];
+  repeated string tax_ids = 11;
 }
 
 message VirtualVariant {
@@ -233,15 +211,7 @@ message VirtualVariant {
   optional string stock_keeping_unit = 8;
   optional string parent_variant_id = 9;
   repeated io.restorecommerce.property.Property properties = 10;
-  repeated string tax_ids = 11 [
-    (io.restorecommerce.options.resolver) = {
-      target_type: ".io.restorecommerce.tax.Tax",
-      target_service: "master_data",
-      target_sub_service: "tax",
-      target_method: "Read",
-      field_name: "tax",
-    }
-  ];
+  repeated string tax_ids = 11;
 }
 
 message Bundle {

package/io/restorecommerce/tax.proto

@@ -69,4 +69,6 @@ message Tax {
       field_name: "type",
     }
   ];
+  optional string name = 7;
+  optional string abbreviation = 8;
 }

package/io/restorecommerce/timezone.proto

@@ -42,8 +42,19 @@ message TimezoneResponse {
   optional io.restorecommerce.status.Status status = 2;
 }
 
+message TimezoneOffset {
+  optional int32 hours = 1;
+  optional int32 minutes = 2;
+}
+
 message Timezone {
   optional string id = 1;
   optional io.restorecommerce.meta.Meta meta = 2;
-  optional string description = 3;
+  optional string name = 3; // display name
+  optional string value = 4; // official name
+  optional string abbreviation_std = 5;
+  optional string abbreviation_dst = 6;
+  optional TimezoneOffset offset_std = 7;
+  optional TimezoneOffset offset_dst = 8;
+  optional string description = 9;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@restorecommerce/protos",
-  "version": "6.8.0",
+  "version": "6.8.2",
   "description": "Protobuf descriptors for Restorecommerce services",
   "author": "n-fuse GmbH",
   "repository": {
@@ -15,5 +15,5 @@
     "protobufs"
   ],
   "scripts": {},
-  "gitHead": "48456b8ea43fd3bfad46deaea7010ccd899ea074"
+  "gitHead": "a612bb7c4da0d4aeebdabe4d5b9c4f15224188a1"
 }