WIP producer delivery

darksoil-studio · Sep 5, 2024 · 29c05ee · 29c05ee
1 parent 38f42bb
commit 29c05ee
Show file tree

Hide file tree

Showing 14 changed files with 935 additions and 686 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dnas/plenty/zomes/integrity/orders/src/producer_delivery.rs b/dnas/plenty/zomes/integrity/orders/src/producer_delivery.rs
@@ -31,9 +31,11 @@ pub enum DeliveredAmount {
 #[derive(Serialize, Deserialize, Clone, PartialEq, Debug)]
 #[serde(tag = "type")]
 pub enum ProductDelivery {
+    Delivered {
+        delivered_amount: DeliveredAmount,
+        comment: Option<String>,
+    },
     Missing,
-    Problem { problem: String },
-    Delivered { delivered_amount: DeliveredAmount },
 }
 
 #[derive(Clone, PartialEq)]

diff --git a/flake.lock b/flake.lock
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -19,7 +19,7 @@ tauri-build = { version = "2.0.0-rc", default-features = false, features = [
 
 [dependencies]
 tauri = { version = "2.0.0-rc", features = [] }
-tauri-plugin-holochain = { git = "https://github.com/darksoil-studio/tauri-plugin-holochain", branch = "main" }
+tauri-plugin-holochain = { git = "https://github.com/darksoil-studio/tauri-plugin-holochain", branch = "develop" }
 tauri-plugin-deep-link = "2.0.0-rc"
 tauri-plugin-log = "2.0.0-rc"
 tauri-plugin-single-instance = "2.0.0-rc"

diff --git a/src-tauri/gen/schemas/acl-manifests.json b/src-tauri/gen/schemas/acl-manifests.json