Merge pull request #24 from tutorcruncher/fix-con-enq

tomhamiltonstubber · web-flow · commit d3f95d61abe6 · 2018-11-19T15:15:02.000Z
Fix contractor on socket form
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,10 @@ cache:
   directories:
   - node_modules
 
+before_install:
+  - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.10.0
+  - export PATH="$HOME/.yarn/bin:$PATH"
+
 install:
 - yarn
 
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
   "engines": {
     "node": "8.x",
     "npm": "5.x",
-    "yarn": "1.3.x"
+    "yarn": "1.10.x"
   },
   "jest": {
     "verbose": true,
diff --git a/src/components/shared/EnquiryForm.js b/src/components/shared/EnquiryForm.js
@@ -44,8 +44,7 @@ class EnquiryForm extends Component {
       return
     }
 
-    const enquiry_form_info = this.props.root.get_enquiry()
-    const data = Object.assign(enquiry_form_info.hidden, this.state.enquiry_data)
+    const data = Object.assign({}, this.state.enquiry_data)
     data.upstream_http_referrer = document.referrer
     if (this.props.contractor) {
       data.contractor = this.props.contractor.id
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,7 @@ class EnquiryForm extends Component {`
`44`	`44`	`return`
`45`	`45`	`}`
`46`	`46`
`47`		`- const enquiry_form_info = this.props.root.get_enquiry()`
`48`		`- const data = Object.assign(enquiry_form_info.hidden, this.state.enquiry_data)`
	`47`	`+ const data = Object.assign({}, this.state.enquiry_data)`
`49`	`48`	`data.upstream_http_referrer = document.referrer`
`50`	`49`	`if (this.props.contractor) {`
`51`	`50`	`data.contractor = this.props.contractor.id`