Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Display Payment Details for Direct Producer & CSO - Packaging Data Submissions #187

Open
wants to merge 6 commits into
base: squad3-dev-release9
Choose a base branch
from
Open

Display Payment Details for Direct Producer & CSO - Packaging Data Submissions #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
721238a
wip
karthikeviden Jan 14, 2025
0b354f1
Merge branch 'squad3-dev-release9' of https://github.com/DEFRA/epr-re…
karthikeviden Jan 14, 2025
193ed7d
Merge branch 'squad3-dev-release9' of https://github.com/DEFRA/epr-re…
karthikeviden Jan 14, 2025
d10c4f9
merge _submissiondetails and _resubmissiondetails for better maintenance
karthikeviden Jan 14, 2025
ebbbb31
missed to commit
karthikeviden Jan 14, 2025
9d87dfe
amend line items for cso and prod - resubmission
karthikeviden Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/EPR.RegulatorService.Frontend.Web/EPR.RegulatorService.Frontend.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,6 @@
<EmbeddedResource Remove="Resources\SharedResources.en-gb.resx" />
<EmbeddedResource Update="Resources\Views\Shared\Partials\_SubmissionDetails.cy.resx" />
<EmbeddedResource Update="Resources\Views\Shared\Partials\_SubmissionDetails.en.resx" />
<EmbeddedResource Update="Resources\Views\Shared\Partials\_ResubmissionDetails.cy.resx" />
<EmbeddedResource Update="Resources\Views\Shared\Partials\_ResubmissionDetails.en.resx" />
<EmbeddedResource Update="Resources\Views\RemoveApprovedUser\Confirm.cy.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Confirm.cy.Designer.cs</LastGenOutput>
Expand Down
48 changes: 0 additions & 48 deletions ...egulatorService.Frontend.Web/Resources/Views/Shared/Partials/_ResubmissionDetails.cy.resx
View file
Open in desktop

This file was deleted.

150 changes: 0 additions & 150 deletions ...egulatorService.Frontend.Web/Resources/Views/Shared/Partials/_ResubmissionDetails.en.resx
View file
Open in desktop

This file was deleted.

13 changes: 11 additions & 2 deletions ....RegulatorService.Frontend.Web/Resources/Views/Shared/Partials/_SubmissionDetails.cy.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,16 @@
<data name="SummaryList.SubTitle.ResubmissionRequired" xml:space="preserve">
<value>Angen ailgyflwyniad</value>
</data>
<data name="SummaryList.Information.Text" xml:space="preserve">
<value>Chaiff {0} ddim ailgyflwyno nes bod y cyflwyniad yma wedi’i weithredu.</value>
<data name="SummaryList.TitleForResubmission" xml:space="preserve">
<value>Manylion yr Ailgyflwyniad</value>
</data>
<data name="SummaryList.SubTitle.TimeAndDateOfReSubmission" xml:space="preserve">
<value>Amser a dyddiad ailgyflwyno</value>
</data>
<data name="SummaryList.SubTitle.ReSubmittedBy" xml:space="preserve">
<value>Wedi'i ailgyflwyno gan</value>
</data>
<data name="SummaryList.SubTitle.ReSubmissionReasonForRejection" xml:space="preserve">
<value>Rheswm dros wrthod y cyflwyniad blaenorol</value>
</data>
</root>
17 changes: 13 additions & 4 deletions ....RegulatorService.Frontend.Web/Resources/Views/Shared/Partials/_SubmissionDetails.en.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,19 @@
<data name="SummaryList.SubTitle.ResubmissionRequired" xml:space="preserve">
<value>Resubmission required</value>
</data>
<data name="SummaryList.Information.Text" xml:space="preserve">
<value>{0} cannot resubmit until this submission has been actioned.</value>
</data>
<data name="SummaryList.SubmissionPeriodSuffix" xml:space="preserve">
<value>submission period</value>
</data>
</root>
<data name="SummaryList.TitleForResubmission" xml:space="preserve">
<value>Resubmission details</value>
</data>
<data name="SummaryList.SubTitle.TimeAndDateOfReSubmission" xml:space="preserve">
<value>Time and date of resubmission</value>
</data>
<data name="SummaryList.SubTitle.ReSubmittedBy" xml:space="preserve">
<value>Resubmitted by</value>
</data>
<data name="SummaryList.SubTitle.ReSubmissionReasonForRejection" xml:space="preserve">
<value>Reason for rejection of previous submission</value>
</data>
</root>
3 changes: 3 additions & 0 deletions src/EPR.RegulatorService.Frontend.Web/Resources/Views/Submissions/SubmissionDetails.cy.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,4 +138,7 @@
<data name="Link.BackToSubmissions" xml:space="preserve">
<value>Yn ôl i bob cais</value>
</data>
<data name="SummaryList.Information.Text" xml:space="preserve">
<value>Chaiff {0} ddim ailgyflwyno nes bod y cyflwyniad yma wedi’i weithredu.</value>
</data>
</root>
5 changes: 4 additions & 1 deletion src/EPR.RegulatorService.Frontend.Web/Resources/Views/Submissions/SubmissionDetails.en.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,4 +138,7 @@
<data name="Link.BackToSubmissions" xml:space="preserve">
<value>Go back to all submissions</value>
</data>
</root>
<data name="SummaryList.Information.Text" xml:space="preserve">
<value>{0} cannot resubmit until this submission has been actioned.</value>
</data>
</root>
10 changes: 1 addition & 9 deletions ...ice.Frontend.Web/Views/Shared/Components/PackagingCompliancePaymentDetails/Default.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,7 @@

<div class="govuk-summary-list__row" style="display: flex; justify-content: space-between;">
<dd class="govuk-summary-list__value" style="width: 285px;">
<strong>Chargeable items</strong>
</dd>
@* <dd class="govuk-summary-list__value" style="width: 410px;">
</dd> *@
</div>

<div class="govuk-summary-list__row" style="display: flex; justify-content: space-between;">
<dd class="govuk-summary-list__value" style="width: 285px;">
@Localizer["PackagingCompliancePaymentDetails.ResubmissionFee"]
<strong>@Localizer["PackagingCompliancePaymentDetails.ResubmissionFee"]</strong>
</dd>
<dd class="govuk-summary-list__value" style="width: 410px;">
@Localizer[Model.MemberCount == 1 ? "PackagingCompliancePaymentDetails.ResubmissionFeeDescription1"
Expand Down
8 changes: 1 addition & 7 deletions ...rvice.Frontend.Web/Views/Shared/Components/PackagingProducerPaymentDetails/Default.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,7 @@

<div class="govuk-summary-list__row" style="display: flex; justify-content: space-between;">
<dd class="govuk-summary-list__value" style="width: 285px;">
<strong>Chargeable items</strong>
</dd>
</div>

<div class="govuk-summary-list__row" style="display: flex; justify-content: space-between;">
<dd class="govuk-summary-list__value" style="width: 285px;">
@Localizer["PackagingProducerPaymentDetails.ResubmissionFee"]
<strong>@Localizer["PackagingProducerPaymentDetails.ResubmissionFee"]</strong>
</dd>
<dd class="govuk-summary-list__value" style="width: 410px;">
@Localizer["PackagingProducerPaymentDetails.ResubmissionFeeDescription"]
Expand Down
Loading