Skip to content
This repository was archived by the owner on Mar 28, 2023. It is now read-only.

Commit d9cd0f3

Browse files
authored
Merge pull request #2075 from OpenBazaar/brian.addShippingLocationData
Updated protobufs to support shipping location
2 parents 0361d31 + b039c41 commit d9cd0f3

File tree

9 files changed

+303
-265
lines changed

9 files changed

+303
-265
lines changed

pb/api.pb.go

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pb/contracts.pb.go

Lines changed: 269 additions & 247 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pb/countrycodes.pb.go

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pb/message.pb.go

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pb/moderator.pb.go

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pb/orders.pb.go

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pb/posts.pb.go

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pb/profile.pb.go

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pb/protos/contracts.proto

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,19 @@ message Listing {
3838
string refundPolicy = 10;
3939

4040
message Metadata {
41-
uint32 version = 1;
42-
ContractType contractType = 2;
43-
Format format = 3;
44-
google.protobuf.Timestamp expiry = 4;
45-
repeated string acceptedCurrencies = 5;
46-
string pricingCurrency = 6 [deprecated = true];
47-
string language = 7;
48-
uint32 escrowTimeoutHours = 8;
49-
string cryptoCurrencyCode = 9 [json_name = "coinType"];
50-
uint32 cryptoDivisibility = 10 [json_name = "coinDivisibility"];
51-
float priceModifier = 11 [deprecated = true];
41+
uint32 version = 1;
42+
ContractType contractType = 2;
43+
Format format = 3;
44+
google.protobuf.Timestamp expiry = 4;
45+
repeated string acceptedCurrencies = 5;
46+
string pricingCurrency = 6 [deprecated = true];
47+
string language = 7;
48+
uint32 escrowTimeoutHours = 8;
49+
string cryptoCurrencyCode = 9 [json_name = "coinType"];
50+
uint32 cryptoDivisibility = 10 [json_name = "coinDivisibility"];
51+
float priceModifier = 11 [deprecated = true];
52+
CountryCode shippingFromCountryCode = 12;
53+
string shippingFromPostalCode = 13;
5254

5355
enum ContractType {
5456
PHYSICAL_GOOD = 0;

0 commit comments

Comments
 (0)