diff --git a/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/Submit-the-invoice_JSONSchema.json b/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/Submit-the-invoice_JSONSchema.json new file mode 100644 index 00000000..9b0be420 --- /dev/null +++ b/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/Submit-the-invoice_JSONSchema.json @@ -0,0 +1,64 @@ +{ + "definitions": { + "currencyEnum": { + "title": "Currency", + "type": "string", + "anyOf": [ + "options_from_task_data_var:enumerations_list" + ] + } + }, + "type": "object", + "required": [ + "filesAccept" + ], + "properties": { + "invoice": { + "type": "object", + "required": [ + "contributorName", + "contributorId", + "invoiceId", + "invoiceAmount", + "invoiceCurrency", + "dueDate" + ], + "title": "", + "properties": { + "contributorName": { + "type": "string", + + "title": "Contributor Name" + }, + + "contributorId": { + "type": "integer", + "title": "Contributor Id", + "minLength": 2 + }, + "invoiceId": { + "type": "integer", + "title": "Invoice Id", + "minLength": 4 + }, + "invoiceAmount": { + "type": "number", + "title": "Invoice Amount" + }, + "invoiceCurrency": { + "$ref": "#/definitions/currencyEnum", + "title": "Select Currency" + }, + "dueDate": { + "type": "string", + "title": "Due Date" + } + } + }, + "filesAccept": { + "type": "string", + "format": "data-url", + "title": "Upload Invoice PDF" + } + } +} \ No newline at end of file diff --git a/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/Submit-the-invoice_UISchema.json b/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/Submit-the-invoice_UISchema.json new file mode 100644 index 00000000..41435cbc --- /dev/null +++ b/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/Submit-the-invoice_UISchema.json @@ -0,0 +1,43 @@ +{ + "invoice": { + "contributorName": { + "ui:autofocus": true, + "ui:emptyValue": "", + "ui:placeholder": "First and Last Name" + }, + "contributorId": { + "ui:placeholder": "Employee or Vendor ID" + }, + "invoiceId": { + "ui:placeholder": "Enter the Status Invoice ID found in the upper left of the PDF to be uploaded" + }, + "invoiceAmount": { + "ui:placeholder": "Based on available currencies" + }, + "invoiceCurrency": { + "ui:placeholder": "Select payment currency" + }, + "dueDate": { + "ui:widget": "date", + "ui:placeholder": "Invoices submitted before the 15th of the month will be paided on the 25th" + }, + "ui:order": [ + "contributorName", + "contributorId", + "invoiceId", + "invoiceAmount", + "invoiceCurrency", + "dueDate" + ] + }, + "filesAccept": { + "ui:help": "Click here to select file to upload", + "ui:options": { + "accept": ".pdf" + } + }, + "ui:order": [ + "invoice", + "filesAccept" + ] +} \ No newline at end of file diff --git a/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/demo-preload_JSONSchema.json b/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/demo-preload_JSONSchema.json new file mode 100644 index 00000000..4504857c --- /dev/null +++ b/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/demo-preload_JSONSchema.json @@ -0,0 +1,28 @@ +{ + "title": "Submit Invoice", + "description": "Configuration options for submitting an invoice.", + "type": "object", + "properties": { + "ValidationChoices": { + "type": "array", + "title": "Select validation options", + "items": { + "type": "string", + "enum": [ + " Number in contributor name", + " Too many decimals in invoice amount", + " Due date before today's date" + ] + }, + "uniqueItems": true + }, + "scenarioChoices": { + "type": "string", + "title": "Select Currency", + "enum": [ + " Correct invoice amount", + " incorrect invoice amount" + ] + } + } +} \ No newline at end of file diff --git a/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/demo-preload_UISchema.json b/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/demo-preload_UISchema.json new file mode 100644 index 00000000..2bf58543 --- /dev/null +++ b/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/demo-preload_UISchema.json @@ -0,0 +1,13 @@ +{ + "scenarioChoices": { + "ui:widget": "radio", + "ui:help": " ", + "ui:options": { + "inline": false + } + }, + "ValidationChoices": { + "ui:widget": "checkboxes", + "ui:help": " " + } +} \ No newline at end of file diff --git a/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/invoice-approval_JSONSchema.json b/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/invoice-approval_JSONSchema.json new file mode 100644 index 00000000..825b7a99 --- /dev/null +++ b/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/invoice-approval_JSONSchema.json @@ -0,0 +1,13 @@ +{ + "type": "object", + "properties": { + "isInvoiceApproved": { + "type": "boolean", + "title": "Approve?" + }, + "approvalComment": { + "type": "string", + "title": "Approval Comment" + } + } +} \ No newline at end of file diff --git a/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/invoice-approval_UISchema.json b/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/invoice-approval_UISchema.json new file mode 100644 index 00000000..331ce955 --- /dev/null +++ b/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/invoice-approval_UISchema.json @@ -0,0 +1,15 @@ +{ + "isInvoiceApproved": { + "ui:autofocus": true, + "ui:widget": "radio", + "ui:help": "Select Yes to approve, No to reject" + }, + "approvalComment": { + "ui:widget": "textarea", + "ui:help": "Enter comments related to approval or rejection here" + }, +"ui:order": [ + "isInvoiceApproved", + "approvalComment" + ] +} \ No newline at end of file diff --git a/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/process_model.json b/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/process_model.json new file mode 100644 index 00000000..14301115 --- /dev/null +++ b/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/process_model.json @@ -0,0 +1,11 @@ +{ + "description": "Approval of Core Contributor's Invoice Submission", + "display_name": "7.4.5.1 - CC Invoice Approval", + "display_order": 0, + "exception_notification_addresses": [], + "fault_or_suspend_on_exception": "fault", + "files": [], + "is_review": false, + "primary_file_name": null, + "primary_process_id": null +} \ No newline at end of file diff --git a/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/submit_invoice_validation.dmn b/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/submit_invoice_validation.dmn new file mode 100644 index 00000000..084c8f6c --- /dev/null +++ b/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/submit_invoice_validation.dmn @@ -0,0 +1,177 @@ + + + + + + + svc_is_num_in_name + + + + + svc_decimal_cnt + + + + + svc_is_due_date_after + + + + + + + False + + + <=2 + + + True + + + True + + + "No numbers in name, involce amount decimal places not greated than two, invoice due date after today's date" + + + + + True + + + <=2 + + + True + + + False + + + """**Validation Error:** + - Numbers are not allowed in the Contributor's Name """ + + + + + False + + + >2 + + + True + + + False + + + """**Validation error:** + - The involce amount must not have more than two decimal places """ + + + + + True + + + >2 + + + True + + + False + + + """**Validation errors:** + - Numbers are not allowed in the Contributor's Name + - The involce amount must not have more than two decimal places """ + + + + + False + + + <=2 + + + False + + + False + + + """**Validation error:** + - The invoice due date must be after today's date. """ + + + + + True + + + >2 + + + False + + + False + + + """**Validation errors:** + - Numbers are not allowed in the Contributor's Name + - The involce amount must not have more than two decimal places + - The invoice due date must be after today's date. """ + + + + + False + + + >2 + + + False + + + False + + + """**Validation errors:** + - The involce amount must not have more than two decimal places + - The invoice due date must be after today's date. """ + + + + + + + + + + + + + + False + + + "Something is wrong with the Invoice validation process. Please notify support" + + + + + + + + + + + + diff --git a/manage-procurement/procurement/vendor-invoice-management/invoice-approval/Invoice Information.json b/manage-procurement/procurement/vendor-invoice-management/invoice-approval/Invoice Information.json deleted file mode 100644 index 313ad124..00000000 --- a/manage-procurement/procurement/vendor-invoice-management/invoice-approval/Invoice Information.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "title": "Invoice Information", - "description": "Submitted by: {{ invoice.contributorName }}
Contributor Id: {{ invoice.contributorId }}
Invoice Id: {{ invoice.invoiceId }} Invoice Amount: {{ invoice.invoiceAmount }} Select Currency: {{ invoice.invoiceCurrency }} Due Date: {{ invoice.dueDate }} Project Lead Comments: {{ invoice.commentsProjectLead }}", - "type": "object" -} \ No newline at end of file diff --git a/manage-procurement/procurement/vendor-invoice-management/invoice-approval/submit_invoice_validation.dmn b/manage-procurement/procurement/vendor-invoice-management/invoice-approval/submit_invoice_validation.dmn index 084c8f6c..c9473825 100644 --- a/manage-procurement/procurement/vendor-invoice-management/invoice-approval/submit_invoice_validation.dmn +++ b/manage-procurement/procurement/vendor-invoice-management/invoice-approval/submit_invoice_validation.dmn @@ -1,5 +1,5 @@ - +