Restructure types for retailer-centric flow

payload/src/collections/Couriers.ts

@@ -10,34 +10,9 @@ const Couriers: CollectionConfig = {
   },
   fields: [
     {
-      name: 'name',
+      name: 'id',
       type: 'text',
       required: true,
-    },
-    {
-      name: 'startingPoint',
-      label: 'Traveling from',
-      type: 'text', // TODO use geopicker here
-    },
-    {
-      name: 'destination',
-      label: 'Traveling to',
-      type: 'text' // TODO user geopicker here
-    },
-    {
-      name: 'departureDate',
-      label: 'Departure date',
-      type: 'date'
-    },
-    {
-      name: 'arrivalDate',
-      label: 'Arrival date',
-      type: 'date'
-    },
-    {
-      name: 'weightAllowance',
-      label: 'Weight Allowance (KG)',
-      type: 'number'
     }
   ],
 };

payload/src/collections/Dispatches.ts

@@ -10,86 +10,78 @@ const Dispatches: CollectionConfig = {
   },
   fields: [
     {
-        name: 'dispatchesCode',
-        type: 'text', 
-        required: true,
-      },
-      {
-        name: 'products', 
-        type: 'relationship', 
-        relationTo: 'products', 
-        hasMany: true,
-      },
-      {
-        name: 'startingPoint', 
-        type: 'relationship', 
-        relationTo: 'makers', 
-        hasMany: false,
-      },
-      {
-        name: 'endPoint', 
-        type: 'relationship', 
-        relationTo: 'retailers', 
-        hasMany: false,
-      },
-      {
-        name: 'typeOfTransportation',
-        type: 'select',
-        hasMany: true,
-        options: [
-          {
-            label: 'Air',
-            value: 'air'
-          },
-          {
-            label: 'Car',
-            value: 'car'
-          },
-          {
-            label: 'Train',
-            value: 'train'
-          },
-          {
-            label: 'Boat',
-            value: 'boat'
-          }
-        ]
-      },
-      {
-        name: 'courier', 
-        type: 'relationship', 
-        relationTo: 'couriers', 
-        hasMany: false,
-        required: true
-      },
-      {
-        name: 'timeSensitive', 
-        type: 'checkbox', 
-      },
-      {
-        name: 'status', // required
-        type: 'select', // required
-        hasMany: true,
-        // admin: {
-        //   isClearable: true,
-        //   isSortable: true, // use mouse to drag and drop different values, and sort them according to your choice
-        // },
-        options: [
-          {
-            label: 'Route requested',
-            value: 'routeRequested',
-          },
-          {
-            label: 'In transit',
-            value: 'inTransit',
-          },
-          {
-            label: 'Completed',
-            value: 'completed',
-          },
-        ],
-      }
+      name: 'dispatchesCode',
+      type: 'text', 
+      required: true,
+    },
+    {
+      name: 'products', 
+      type: 'relationship', 
+      relationTo: 'products', 
+      hasMany: true // required
+      // required,
+    },
+    {
+      name: 'courier', 
+      type: 'relationship', 
+      relationTo: 'couriers', 
+      hasMany: false,
+      required: false
+    },
+    {
+      name: 'maker', 
+      type: 'relationship', 
+      relationTo: 'makers', 
+      hasMany: false,
+      required: false
+    },
+    {
+      name: 'retailer', 
+      type: 'relationship', 
+      relationTo: 'retailers', 
+      hasMany: false,
+      required: false
+    },
+    {
+      name: 'status',
+      type: 'select',
+      hasMany: true,
+      options: [
+        {
+          label: 'Requested',
+          value: 'requested',
+        },
+        {
+          label: 'Accepted',
+          value: 'accepted',
+        },
+        {
+          label: 'Archived',
+          value: 'archived',
+        },
+      ],
+    }
   ],
 };
 
 export default Dispatches;
+
+// type Dispatch = {
+//   id: string;
+//   dispatchesCode: string; //Human readable id
+//   createdAt: string;
+//   updatedAt: string;
+
+//   maker: Maker;
+//   retailer: Retailer;
+//   products: Product[];
+
+//   courier: User;
+  
+//   timeSensitive: boolean;
+//   status: DispatchStatus[];
+
+//   departureDate: string;
+//   arrivalDate: string;
+//   weightAllowance: number;
+// }

payload/src/collections/Makers.ts

@@ -11,22 +11,20 @@ const Makers: CollectionConfig = {
   },
   fields: [
     {
-        name: 'name', // required
-        type: 'text', // required
+        name: 'name',
+        type: 'text',
         required: true,
       },
-  //geoPickerField, is a bit broken right now
       {
         name: 'location',
         type: 'point',
         label: 'Location',
       },
       {
-        name: 'products', // required
-        type: 'relationship', // required
-        relationTo: 'products', // required
+        name: 'products',
+        type: 'relationship',
+        relationTo: 'products',
         hasMany: true,
-        // TODO: make the name of the product visible in the dropdown
       }
   ],
 };

payload/src/collections/Products.ts

@@ -10,10 +10,16 @@ const Products: CollectionConfig = {
   },
   fields: [
     {
-        name: 'productTitle', // required
-        type: 'text', // required
-        required: true,
-      },
+      name: 'productTitle',
+      type: 'text',
+      required: true,
+    },
+    {
+      name: 'picture',
+      type: 'relationship',
+      relationTo: 'media',
+      hasMany: false
+    }
   ],
 };
 

payload/src/collections/Retailers.ts

@@ -10,26 +10,21 @@ const Retailers: CollectionConfig = {
   },
   fields: [
     {
-        name: 'name', // required
-        type: 'text', // required
-        required: true,
-      },
-      {
-        name: 'location',
-        type: 'point',
-        label: 'Location',
-      },
-      {
-        name: 'products', // required
-        type: 'relationship', // required
-        relationTo: 'products', // required
-        hasMany: true,
-      },
-      {
-        name: 'salesPoint',
-        type: 'text',
-        label: 'Where do you plan to sell/exhibit products?'
-      }
+      name: 'name',
+      type: 'text',
+      required: true,
+    },
+    {
+      name: 'location',
+      type: 'point',
+      label: 'Location',
+    },
+    {
+      name: 'requestedProducts',
+      type: 'relationship',
+      relationTo: 'products',
+      hasMany: true,
+    },
   ],
 };
 

payload/src/collections/Users.ts

@@ -14,6 +14,17 @@ const Users: CollectionConfig = {
     {
       name: 'name',
       type: 'text',
+      required: true
+    },
+    {
+      name: 'phoneNumber',
+      type: 'number',
+      required: true
+    }, 
+    {
+      name: 'email',
+      type: 'email',
+      required: true
     }
   ],
 };