Merge branch 'master' into vending-machine

1 files changed, 59 insertions, 21 deletions

diff --git a/15.md b/15.md
index f8df328..edece81 100644
--- a/15.md
+++ b/15.md
@@ -4,11 +4,11 @@ NIP-15
 Nostr Marketplace (for resilient marketplaces)
 -----------------------------------
 
-`draft` `optional` `author:fiatjaf` `author:benarc`  `author:motorina0` `author:talvasconcelos` 
+`draft` `optional` `author:fiatjaf` `author:benarc`  `author:motorina0` `author:talvasconcelos`
 
 > Based on https://github.com/lnbits/Diagon-Alley
 
-> Implemented here https://github.com/lnbits/nostrmarket
+> Implemented in [NostrMarket](https://github.com/lnbits/nostrmarket) and [Plebeian Market](https://github.com/PlebeianTech/plebeian-market) 
 
 ## Terms
 
@@ -33,13 +33,13 @@ The `merchant` admin software can be purely clientside, but for `convenience` an
 ## `Merchant` publishing/updating products (event)
 
 A merchant can publish these events:
-| Kind    |                  | Description                                                                                                   | NIP                                     |
-|---------|------------------|---------------------------------------------------------------------------------------------------------------|-----------------------------------------|
-| `0    ` | `set_meta`       | The merchant description (similar with any `nostr` public key).                                               | [NIP01       ](https://github.com/nostr-protocol/nips/blob/master/01.md)                            |
-| `30017` | `set_stall`      | Create or update a stall.                                                                                     | [NIP33](https://github.com/nostr-protocol/nips/blob/master/33.md) (Parameterized Replaceable Event) |
-| `30018` | `set_product`    | Create or update a product.                                                                                   | [NIP33](https://github.com/nostr-protocol/nips/blob/master/33.md) (Parameterized Replaceable Event) |
-| `4    ` | `direct_message` | Communicate with the customer. The messages can be plain-text or JSON. | [NIP04](https://github.com/nostr-protocol/nips/blob/master/04.md)                                            |
-| `5    ` | `delete`         | Delete a product or a stall.                                                                                  | [NIP09](https://github.com/nostr-protocol/nips/blob/master/09.md)                                   |
+| Kind      |                    | Description                                                                                                     |
+| --------- | ------------------ | --------------------------------------------------------------------------------------------------------------- |
+| `0    `   | `set_meta`         | The merchant description (similar with any `nostr` public key).                                                 |
+| `30017`   | `set_stall`        | Create or update a stall.                                                                                       |
+| `30018`   | `set_product`      | Create or update a product.                                                                                     |
+| `4    `   | `direct_message`   | Communicate with the customer. The messages can be plain-text or JSON.                                          |
+| `5    `   | `delete`           | Delete a product or a stall.                                                                                    |
 
 ### Event `30017`: Create or update a stall.
 
@@ -54,8 +54,8 @@ A merchant can publish these events:
         {
             "id": <String, UUID of the shipping zone, generated by the merchant>,
             "name": <String (optional), zone name>,
-            "cost": <float, cost for shipping. The currency is defined at the stall level>,
-            "countries": [<String, countries included in this zone>],
+            "cost": <float, base cost for shipping. The currency is defined at the stall level>,
+            "regions": [<String, regions included in this zone>],
         }
     ]
 }
@@ -63,15 +63,18 @@ A merchant can publish these events:
 
 Fields that are not self-explanatory:
  - `shipping`:
-   - an array with possible shipping zones for this stall. The customer MUST choose exactly one shipping zone.
+   - an array with possible shipping zones for this stall.
+   - the customer MUST choose exactly one of those shipping zones.
    - shipping to different zones can have different costs. For some goods (digital for example) the cost can be zero.
    - the `id` is an internal value used by the merchant. This value must be sent back as the customer selection.
+   - each shipping zone contains the base cost for orders made to that shipping zone, but a specific shipping cost per
+   product can also be specified if the shipping cost for that product is higher than what's specified by the base cost.
 
 **Event Tags**:
 ```json
   "tags": [["d", <String, id of stall]]
 ```
- - the `d` tag is required by [NIP33](https://github.com/nostr-protocol/nips/blob/master/33.md). Its value MUST be the same as the stall `id`.
+ - the `d` tag is required, its value MUST be the same as the stall `id`.
 
 ### Event `30018`: Create or update a product
 
@@ -87,17 +90,30 @@ Fields that are not self-explanatory:
     "price": <float, cost of product>,
     "quantity": <int, available items>,
     "specs": [
-      [ <String, spec key>, <String, spec value>]
-     ]
+        [<String, spec key>, <String, spec value>]
+    ],
+    "shipping": [
+        {
+            "id": <String, UUID of the shipping zone. Must match one of the zones defined for the stall>,
+            "cost": <float, extra cost for shipping. The currency is defined at the stall level>,
+        }
+    ]
 }
 ```
 
 Fields that are not self-explanatory:
  - `specs`:
-   - an array of key pair values. It allows for the Customer UI to present present product specifications in a structure mode. It also allows comparison between products
+   - an optional array of key pair values. It allows for the Customer UI to present product specifications in a structure mode. It also allows comparison between products
    - eg: `[["operating_system", "Android 12.0"], ["screen_size", "6.4 inches"], ["connector_type", "USB Type C"]]`
 
-_Open_: better to move `spec` in the `tags` section of the event?
+    _Open_: better to move `spec` in the `tags` section of the event?
+
+- `shipping`:
+   - an _optional_ array of extra costs to be used per shipping zone, only for products that require special shipping costs to be added to the base shipping cost defined in the stall
+   - the `id` should match the id of the shipping zone, as defined in the `shipping` field of the stall
+   - to calculate the total cost of shipping for an order, the user will choose a shipping option during checkout, and then the client must consider this costs:
+     - the `base cost from the stall` for the chosen shipping option
+     - the result of multiplying the product units by the `shipping costs specified in the product`, if any. 
 
 **Event Tags**:
 ```json
@@ -109,8 +125,8 @@ _Open_: better to move `spec` in the `tags` section of the event?
     ]
 ```
 
- - the `d` tag is required by [NIP33](https://github.com/nostr-protocol/nips/blob/master/33.md). Its value MUST be the same as the product `id`.
- - the `t` tag is as searchable tag ([NIP12](https://github.com/nostr-protocol/nips/blob/master/12.md)). It represents different categories that the product can be part of (`food`, `fruits`). Multiple `t` tags can be present.
+ - the `d` tag is required, its value MUST be the same as the product `id`.
+ - the `t` tag is as searchable tag, it represents different categories that the product can be part of (`food`, `fruits`). Multiple `t` tags can be present.
 
 ## Checkout events
 
@@ -152,7 +168,7 @@ The below json goes in content of [NIP04](https://github.com/nostr-protocol/nips
 ```
 
 _Open_: is `contact.nostr` required?
-  
+
 
 ### Step 2: `merchant` request payment (event)
 
@@ -204,6 +220,28 @@ The below json goes in `content` of [NIP04](https://github.com/nostr-protocol/ni
     "shipped": <Bool, true/false has been shipped>,
 }
 ```
+## Customize Marketplace
+Create a customized user experience using the `naddr` from [NIP-19](https://github.com/nostr-protocol/nips/blob/master/19.md#shareable-identifiers-with-extra-metadata). The use of `naddr` enables easy sharing of marketplace events while incorporating a rich set of metadata. This metadata can include relays, merchant profiles, and more. Subsequently, it allows merchants to be grouped into a market, empowering the market creator to configure the marketplace's user interface and user experience, and share that marketplace. This customization can encompass elements such as market name, description, logo, banner, themes, and even color schemes, offering a tailored and unique marketplace experience.
+
+### Event `30019`: Create or update marketplace UI/UX
+
+**Event Content**:
+```json
+{
+    "name": <String (optional), market name>,
+    "about": <String (optional), market description>,
+    "ui": {
+      "picture": <String (optional), market logo image URL>,
+      "banner": <String (optional), market logo banner URL>,
+      "theme": <String (optional), market theme>,
+      "darkMode": <Bool, true/false>
+    },
+    "merchants": <[String] (optional), array of pubkeys>,
+    ...
+}
+```
+
+This event leverages naddr to enable comprehensive customization and sharing of marketplace configurations, fostering a unique and engaging marketplace environment.
 
 ## Customer support events
 
@@ -211,4 +249,4 @@ Customer support is handled over whatever communication method was specified. If
 
 ## Additional
 
-Standard data models can be found here <a href="https://raw.githubusercontent.com/lnbits/nostrmarket/main/models.py">here</a>
+Standard data models can be found <a href="https://raw.githubusercontent.com/lnbits/nostrmarket/main/models.py">here</a>