ccs-digitalmarketplace-frameworks 5.1.34 → 5.1.36

package/README.md

@@ -63,6 +63,7 @@ Question keys
     * `max_value` integer, sets the maximum value for number questions (default 100)
     * `integer_only` boolean, when `true` makes the number question accept only integer values instead of numbers
     * `format` sets JSON schema 'format' property for text questions (eg `email`, `uri`)
+    * `max_decimal_places` sets a limit to the number of decimal places allowed if `integer_only` is not set to `true`
 * `number_of_items` sets the maximum number of items
     * for list questions, the add button becomes "Add another (N remaining)", and the default is 10
     * for checkboxes and checkbox tree questions, by default any number can be checked, but this sets a maximum number

package/frameworks/g-cloud-15/manifests/edit_lot_pricing_questions.yml

@@ -152,11 +152,11 @@
   questions:
     - discountPercentage
 
-- name: Discount percentage by call-off contract value
+- name: Discount percentage by annual call-off contract value (excluding VAT)
   editable: True
   edit_questions: False
   description: |
-    You need to provide discount percentages for different call-off contract values. You must enter a value for each value between 0 and 100 for this lot to be completed. All discounts will be visible to potential buyers.
+    You need to provide discount percentages for different annual call-off contract values (excluding VAT). You must enter percentage discount values between 0 and 100 for each contract value. All discounts will be visible to potential buyers.
   questions:
     - discountPercentagesLessThan250000
     - discountPercentagesLessThan500000

package/frameworks/g-cloud-15/questions/additional-lot-questions/carbonReduction.yml

@@ -2,7 +2,7 @@ name: Trading less than 12 months
 
 
 question: >
-   <p class="govuk-body">Public procurement of contracts with an annual contract value of £5 million and 
+   <p class="govuk-body">Public procurement of contracts with an annual contract value of £5 million and
    above should take into account suppliers' carbon reduction plans (CRP) and commitment to Net Zero by 2050. This Policy is set out in detail in <a class="govuk-link" href="https://www.gov.uk/government/publications/ppn-006-taking-account-of-carbon-reduction-plans-in-the-procurement-of-major-government-contracts" target="_blank">PPN 006 (opens in new tab)</a>.
    </p>
 
@@ -86,9 +86,9 @@ question: >
       </li>
     </ul>
 
-   
+
    <p class="govuk-label--m">
-   Have you been trading for less than 12 months??
+   Have you been trading for less than 12 months?
    </p>
 
 depends:
@@ -115,4 +115,4 @@ followup:
 
 validations:
   - name: answer_required
-    message: You must select an option
+    message: You must select an option

package/frameworks/g-cloud-15/questions/lot-pricing-questions/discountPercentage.yml

@@ -3,7 +3,7 @@ question: |
     <span class="govuk-warning-text__icon" aria-hidden="true">!</span>
     <strong class="govuk-warning-text__text">
       <span class="govuk-visually-hidden">Warning</span>
-      You must enter a percentage for call-off contract value, between 0 and 100 for this lot to be completed
+      You must enter percentage discount values between 0 and 100 for this lot to be completed. Discounts will apply to the annual call-off contract values (excluding VAT)
     </strong>
   </div>
 

package/frameworks/g-cloud-15/questions/lot-pricing-questions/discountPercentagesLessThan1000000.yml

@@ -13,10 +13,12 @@ unit_position: "after"
 limits:
   min_value: 0
   max_value: 100
-  integer_only: true
+  max_decimal_places: 2
 
 validations:
   - name: answer_required
     message: You must provide a percentage discount between 0 and 100
   - name: not_a_number
     message: You must provide a percentage discount between 0 and 100
+  - name: exceeded_allowed_decimal_places
+    message: The percentage must have a maximum of 2 decimal places

package/frameworks/g-cloud-15/questions/lot-pricing-questions/discountPercentagesLessThan250000.yml

@@ -13,10 +13,12 @@ unit_position: "after"
 limits:
   min_value: 0
   max_value: 100
-  integer_only: true
+  max_decimal_places: 2
 
 validations:
   - name: answer_required
     message: You must provide a percentage discount between 0 and 100
   - name: not_a_number
     message: You must provide a percentage discount between 0 and 100
+  - name: exceeded_allowed_decimal_places
+    message: The percentage must have a maximum of 2 decimal places

package/frameworks/g-cloud-15/questions/lot-pricing-questions/discountPercentagesLessThan2500000.yml

@@ -13,10 +13,12 @@ unit_position: "after"
 limits:
   min_value: 0
   max_value: 100
-  integer_only: true
+  max_decimal_places: 2
 
 validations:
   - name: answer_required
     message: You must provide a percentage discount between 0 and 100
   - name: not_a_number
     message: You must provide a percentage discount between 0 and 100
+  - name: exceeded_allowed_decimal_places
+    message: The percentage must have a maximum of 2 decimal places

package/frameworks/g-cloud-15/questions/lot-pricing-questions/discountPercentagesLessThan500000.yml

@@ -13,10 +13,12 @@ unit_position: "after"
 limits:
   min_value: 0
   max_value: 100
-  integer_only: true
+  max_decimal_places: 2
 
 validations:
   - name: answer_required
     message: You must provide a percentage discount between 0 and 100
   - name: not_a_number
     message: You must provide a percentage discount between 0 and 100
+  - name: exceeded_allowed_decimal_places
+    message: The percentage must have a maximum of 2 decimal places

package/frameworks/g-cloud-15/questions/lot-pricing-questions/discountPercentagesLessThan5000000.yml

@@ -13,10 +13,12 @@ unit_position: "after"
 limits:
   min_value: 0
   max_value: 100
-  integer_only: true
+  max_decimal_places: 2
 
 validations:
   - name: answer_required
     message: You must provide a percentage discount between 0 and 100
   - name: not_a_number
     message: You must provide a percentage discount between 0 and 100
+  - name: exceeded_allowed_decimal_places
+    message: The percentage must have a maximum of 2 decimal places

package/frameworks/g-cloud-15/questions/lot-pricing-questions/discountPercentagesOver5000000.yml

@@ -13,10 +13,12 @@ unit_position: "after"
 limits:
   min_value: 0
   max_value: 100
-  integer_only: true
+  max_decimal_places: 2
 
 validations:
   - name: answer_required
     message: You must provide a percentage discount between 0 and 100
   - name: not_a_number
     message: You must provide a percentage discount between 0 and 100
+  - name: exceeded_allowed_decimal_places
+    message: The percentage must have a maximum of 2 decimal places

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccs-digitalmarketplace-frameworks",
-  "version": "5.1.34",
+  "version": "5.1.36",
   "description": "Data files for Digital Marketplace’s procurement frameworks",
   "repository": {
     "type": "git",