Merge branch 'dev'

tibetsprague · tibetsprague · commit cf3ba6bbce44 · 2023-03-04T11:42:32.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [5.3.6] - 2023-03-04
+
+### Added
+- New product categories for farms: grains, other_row_crops
+
 ## [5.3.5] - 2023-02-26
 
 ### Added
diff --git a/api/graphql/schema.graphql b/api/graphql/schema.graphql
@@ -55,7 +55,7 @@ type Query {
     Example object
     {
       farmType: 'wholesale_farm, directsale_farm',
-      productCategories: 'grains_other', 'vegetables',
+      productCategories: 'grains', 'vegetables',
       certOrManagementPlan: 'american_grassfed'
     }
     """
diff --git a/lib/constants.js b/lib/constants.js
@@ -446,6 +446,14 @@ exports.PREFERRED_CONTACT_METHODS = [
 ]
 
 exports.PRODUCT_CATAGORIES = [
+  {
+    value: 'grains',
+    label: 'Grains'
+  },
+  {
+    value: 'other_row_crops',
+    label: 'Other row crops'
+  },
   {
     value: 'grains_other',
     label: 'Grains and other row crops'
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "author": "Tibet Sprague <tibet@hylo.com>",
   "license": "GNU AFFERO GENERAL PUBLIC LICENSE v3",
   "private": true,
-  "version": "5.3.5",
+  "version": "5.3.6",
   "repository": {
     "type": "git",
     "url": "git://github.com/Hylozoic/hylo-node.git"

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ type Query {`
`55`	`55`	`Example object`
`56`	`56`	`{`
`57`	`57`	`farmType: 'wholesale_farm, directsale_farm',`
`58`		`- productCategories: 'grains_other', 'vegetables',`
	`58`	`+ productCategories: 'grains', 'vegetables',`
`59`	`59`	`certOrManagementPlan: 'american_grassfed'`
`60`	`60`	`}`
`61`	`61`	`"""`
Original file line number	Diff line number	Diff line change
`@@ -446,6 +446,14 @@ exports.PREFERRED_CONTACT_METHODS = [`
`446`	`446`	`]`
`447`	`447`
`448`	`448`	`exports.PRODUCT_CATAGORIES = [`
	`449`	`+ {`
	`450`	`+ value: 'grains',`
	`451`	`+ label: 'Grains'`
	`452`	`+ },`
	`453`	`+ {`
	`454`	`+ value: 'other_row_crops',`
	`455`	`+ label: 'Other row crops'`
	`456`	`+ },`
`449`	`457`	`{`
`450`	`458`	`value: 'grains_other',`
`451`	`459`	`label: 'Grains and other row crops'`