add flag for logging a contribution as a trade

src/components/GiftedDialog.vue

@@ -36,9 +36,15 @@
           <fa icon="chevron-right" />
         </div>
       </div>
-      <div v-if="showGivenToUser" class="mt-2 text-right">
-        <input type="checkbox" class="mr-2" v-model="givenToUser" />
-        <label class="text-sm">Given to you</label>
+      <div class="mt-2 text-right">
+        <span v-if="showGivenToUser" class="mt-2 mr-16">
+          <input type="checkbox" class="mr-2" v-model="givenToUser" />
+          <label class="text-sm">Given to you</label>
+        </span>
+        <span class="mt-2">
+          <input type="checkbox" class="mr-2" v-model="isTrade" />
+          <label class="text-sm">Trade (not a gift)</label>
+        </span>
       </div>
       <p class="text-center mb-2 mt-6 italic">
         Sign & Send to publish to the world
@@ -88,6 +94,7 @@ export default class GiftedDialog extends Vue {
   giver?: GiverInputInfo; // undefined means no identified giver agent
   description = "";
   givenToUser = false;
+  isTrade = false;
   unitCode = "HUR";
   visible = false;
 
@@ -264,6 +271,7 @@ export default class GiftedDialog extends Vue {
         amountInput,
         unitCode,
         this.projectId,
+        this.isTrade,
       );
 
       if (
@@ -287,7 +295,7 @@ export default class GiftedDialog extends Vue {
             group: "alert",
             type: "success",
             title: "Success",
-            text: "That gift was recorded.",
+            text: `That ${this.isTrade ? "trade" : "gift"} was recorded.`,
           },
           7000,
         );

src/libs/endorserServer.ts

@@ -88,7 +88,7 @@ export interface GiveVerifiableCredential {
   "@type": "GiveAction";
   agent?: { identifier: string };
   description?: string;
-  fulfills?: { "@type": string; identifier?: string; lastClaimId?: string };
+  fulfills?: { "@type": string; identifier?: string; lastClaimId?: string }[];
   identifier?: string;
   object?: { amountOfThisGood: number; unitCode: string };
   recipient?: { identifier: string };
@@ -312,6 +312,7 @@ export async function createAndSubmitGive(
   hours?: number,
   unitCode?: string,
   fulfillsProjectHandleId?: string,
+  isTrade: boolean = false,
 ): Promise<CreateAndSubmitClaimResult> {
   const vcClaim: GiveVerifiableCredential = {
     "@context": "https://schema.org",
@@ -322,10 +323,16 @@ export async function createAndSubmitGive(
     object: hours
       ? { amountOfThisGood: hours, unitCode: unitCode || "HUR" }
       : undefined,
-    fulfills: fulfillsProjectHandleId
-      ? { "@type": "PlanAction", identifier: fulfillsProjectHandleId }
-      : undefined,
+    fulfills: [{ "@type": isTrade ? "TradeAction" : "DonateAction" }],
   };
+  if (fulfillsProjectHandleId) {
+    vcClaim.fulfills = vcClaim.fulfills || []; // weird that it won't typecheck without this
+    vcClaim.fulfills.push({
+      "@type": "PlanAction",
+      identifier: fulfillsProjectHandleId,
+    });
+  }
+  console.log("createAndSubmitGive vcClaim", vcClaim);
   return createAndSubmitClaim(
     vcClaim as GenericServerRecord,
     identity,

src/views/HomeView.vue

@@ -385,7 +385,9 @@ export default class HomeView extends Vue {
   public async retrieveGives(endorserApiServer: string, beforeId?: string) {
     const beforeQuery = beforeId == null ? "" : "&beforeId=" + beforeId;
     const response = await fetch(
-      endorserApiServer + "/api/v2/report/gives?" + beforeQuery,
+      endorserApiServer +
+        "/api/v2/report/gives?giftNotTrade=true&" +
+        beforeQuery,
       {
         method: "GET",
         headers: await this.buildHeaders(),

src/views/ProjectViewView.vue

@@ -162,7 +162,7 @@
         </h3>
 
         <div v-if="offersToThis.length === 0">
-          (None yet. Record one above.)
+          (None yet. Wanna offer something if others join you?)
         </div>
 
         <ul v-else class="text-sm border-t border-slate-300">
@@ -197,7 +197,9 @@
       <div class="bg-slate-100 px-4 py-3 rounded-md">
         <h3 class="text-sm uppercase font-semibold mb-3">Given To This Idea</h3>
 
-        <div v-if="givesToThis.length === 0">(None yet. Record one above.)</div>
+        <div v-if="givesToThis.length === 0">
+          (None yet. You can be the first.)
+        </div>
 
         <ul v-else class="text-sm border-t border-slate-300">
           <li