ccs-digitalmarketplace-frameworks 1.8.39 → 1.8.41

package/frameworks/g-cloud-14/manifests/declaration.yml

@@ -125,8 +125,7 @@
   editable: True
   prefill: False
   questions:
-    - vatNumber
-    - vatCode
+    - multiqVat
 
 -
   name: Insurance Requirements

package/frameworks/g-cloud-14/questions/declaration/economicAndFinancialStandingEmail.yml

@@ -16,7 +16,7 @@ question: |
 
   <ul class="govuk-list govuk-list--bullet">
     <li>
-      failure score 50 or below
+      D&B score of 50 or below
     </li>
     <li>
       operating margin 2% or above

package/frameworks/g-cloud-14/questions/declaration/immediateParentCompanyDetailsVATNumber.yml

@@ -1,10 +1,4 @@
 name: VAT number
 question: VAT number
-hint: This is 9 or 12 numbers, sometimes with ‘GB’ at the start, like 123456789 or GB123456789
 type: text
 optional: true
-
-validations:
-  -
-    name: invalid_format
-    message: Enter the VAT number in the correct format

package/frameworks/g-cloud-14/questions/declaration/insuranceRequirements.yml

@@ -4,8 +4,8 @@ question: |
 
   <ul class="govuk-list govuk-list--bullet govuk-!-margin-top-2 govuk-!-margin-bottom-2">
     <li>Employer’s (Compulsory) Liability Insurance = £5,000,000</li>
-    <li>Public Liability Insurance = £10,000,000</li>
-    <li>Professional Indemnity Insurance = £10,000,000</li>
+    <li>Public Liability Insurance = £1,000,000</li>
+    <li>Professional Indemnity Insurance = £1,000,000</li>
   </ul>
 
   There is a legal requirement for certain employers to hold Employer's (Compulsory) Liability Insurance of £5 million as a minimum. See the

package/frameworks/g-cloud-14/questions/declaration/multiqVat.yml

@@ -0,0 +1,7 @@
+name: V.A.T
+question: ""
+type: multiquestion
+questions:
+  - vatCode
+  - vatNumber
+  - vatNumberNonUK

package/frameworks/g-cloud-14/questions/declaration/ultimateParentCompanyDetailsVATNumber.yml

@@ -1,10 +1,4 @@
 name: VAT number
 question: VAT number
-hint: This is 9 or 12 numbers, sometimes with ‘GB’ at the start, like 123456789 or GB123456789
 type: text
 optional: true
-
-validations:
-  -
-    name: invalid_format
-    message: Enter the VAT number in the correct format

package/frameworks/g-cloud-14/questions/declaration/vatCode.yml

@@ -17,6 +17,16 @@ options:
   - label: "UK Company - Not VAT Registered"
     value: "uk not vat registered uk"
 
+followup:
+  vatNumber:
+    - "uk vat registered uk"
+    - "eu vat registered uk"
+    - "ni vat registered uk"
+    - "non eu vat registered uk"
+  vatNumberNonUK:
+    - "non eu not vat registered uk"
+    - "eu not vat registered uk"
+
 validations:
   - name: answer_required
     message: You must select an option

package/frameworks/g-cloud-14/questions/declaration/vatNumber.yml

@@ -2,6 +2,7 @@ name: Registered VAT number
 question: What is your registered VAT number?
 question_advice: You can view <a class="govuk-link" href="https://www.gov.uk/register-for-vat" for guidance" target="_blank" rel="noopener noreferrer">Register for VAT (opens in new tab)</a> for guidance
 hint: This is 9 or 12 numbers, sometimes with ‘GB’ at the start, like 123456789 or GB123456789
+hidden: true
 
 type: text
 

package/frameworks/g-cloud-14/questions/declaration/vatNumberNonUK.yml

@@ -0,0 +1,9 @@
+name: Registered VAT number
+question: What is your registered VAT number?
+hidden: true
+
+type: text
+
+validations:
+  - name: answer_required
+    message: You must enter your registered VAT number

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccs-digitalmarketplace-frameworks",
-  "version": "1.8.39",
+  "version": "1.8.41",
   "description": "Data files for Digital Marketplace’s procurement frameworks",
   "repository": "git@github.com:Crown-Commercial-Service/ccs-digitalmarketplace-frameworks",
   "author": "enquiries@digitalmarketplace.service.gov.uk"

package/requirements-dev.txt

@@ -30,9 +30,9 @@ ccs-digitalmarketplace-apiclient==25.0.0
     # via
     #   -r requirements.txt
     #   ccs-digitalmarketplace-utils
-ccs-digitalmarketplace-content-loader==10.0.0
+ccs-digitalmarketplace-content-loader==11.1.0
     # via -r requirements.txt
-ccs-digitalmarketplace-utils==65.0.0
+ccs-digitalmarketplace-utils==65.2.0
     # via
     #   -r requirements.txt
     #   ccs-digitalmarketplace-content-loader
@@ -56,7 +56,7 @@ contextlib2==21.6.0
     # via
     #   -r requirements.txt
     #   ccs-digitalmarketplace-utils
-cryptography==42.0.0
+cryptography==42.0.4
     # via
     #   -r requirements.txt
     #   ccs-digitalmarketplace-utils
@@ -111,7 +111,7 @@ govuk-country-register==0.5.0
     # via
     #   -r requirements.txt
     #   ccs-digitalmarketplace-utils
-hypothesis==6.98.3
+hypothesis==6.98.12
     # via -r requirements-dev.in
 idna==3.4
     # via
@@ -132,10 +132,9 @@ itsdangerous==2.1.2
     #   -r requirements.txt
     #   flask
     #   flask-wtf
-jinja2==3.0.3
+jinja2==3.1.3
     # via
     #   -r requirements.txt
-    #   ccs-digitalmarketplace-content-loader
     #   flask
 jmespath==1.0.1
     # via
@@ -189,7 +188,7 @@ pyjwt==2.8.0
     #   notifications-python-client
 pyparsing==2.4.7
     # via packaging
-pytest==8.0.0
+pytest==8.0.2
     # via -r requirements-dev.in
 python-dateutil==2.8.2
     # via

package/requirements.in

@@ -1,5 +1,5 @@
 docopt==0.6.2
 deepmerge==1.1.1
 python-json-logger==2.0.7
-ccs-digitalmarketplace-content-loader==10.0.0
-ccs-digitalmarketplace-utils==65.0.0
+ccs-digitalmarketplace-content-loader==11.1.0
+ccs-digitalmarketplace-utils==65.2.0

package/requirements.txt

@@ -16,9 +16,9 @@ cachelib==0.10.2
     # via flask-session
 ccs-digitalmarketplace-apiclient==25.0.0
     # via ccs-digitalmarketplace-utils
-ccs-digitalmarketplace-content-loader==10.0.0
+ccs-digitalmarketplace-content-loader==11.1.0
     # via -r requirements.in
-ccs-digitalmarketplace-utils==65.0.0
+ccs-digitalmarketplace-utils==65.2.0
     # via
     #   -r requirements.in
     #   ccs-digitalmarketplace-content-loader
@@ -32,7 +32,7 @@ click==7.1.2
     # via flask
 contextlib2==21.6.0
     # via ccs-digitalmarketplace-utils
-cryptography==42.0.0
+cryptography==42.0.4
     # via ccs-digitalmarketplace-utils
 deepmerge==1.1.1
     # via -r requirements.in
@@ -72,10 +72,8 @@ itsdangerous==2.1.2
     # via
     #   flask
     #   flask-wtf
-jinja2==3.0.3
-    # via
-    #   ccs-digitalmarketplace-content-loader
-    #   flask
+jinja2==3.1.3
+    # via flask
 jmespath==1.0.1
     # via
     #   boto3