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

Jump to bottom

dev2stg #4402

Open
wants to merge 15 commits into
base: staging
Choose a base branch
from
Open

dev2stg #4402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
12fb477
add all fields to country endpoint, modify tests
pkujawa Oct 31, 2024
76fa076
Merge pull request #4399 from unicef/staging
domdinicola Nov 1, 2024
0bc1efe
Selenium: Payment Verification tests (#4318)
szymon-kellton Nov 4, 2024
9c36830
add specific fields instead of __all__
pkujawa Nov 4, 2024
ef77baa
Merge branch 'develop' into geo-api-search-and-filter
pkujawa Nov 4, 2024
cac3165
Merge pull request #4393 from unicef/geo-api-search-and-filter
domdinicola Nov 4, 2024
cd56de0
admin tweaks
domdinicola Nov 5, 2024
4c5879f
Merge pull request #4401 from unicef/widget-tweaks
domdinicola Nov 5, 2024
210a5d1
tweak
domdinicola Nov 5, 2024
1721fbf
Merge pull request #4403 from unicef/widget-tweaks
domdinicola Nov 5, 2024
55fbb75
move send api token to mailjet, change payment notification recipient…
pkujawa Nov 5, 2024
eface1d
BankAccountInfo changes
pkujawa Nov 5, 2024
fa67564
Merge branch 'develop' into mailjet-changes-send-to-call-recipients
pkujawa Nov 5, 2024
3e1b2a7
Merge pull request #4408 from unicef/bank-account-info-model-changes
domdinicola Nov 6, 2024
6ef7a33
Merge pull request #4407 from unicef/mailjet-changes-send-to-call-rec…
pkujawa Nov 6, 2024
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
114 changes: 31 additions & 83 deletions pdm.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,6 @@ dependencies = [
"sorl-thumbnail==12.9",
"swapper<2.0.0,>=1.3.0",
"tblib<2.0.0,>=1.7.0",
"unicef-power-query<1.0,>=0.4",
"update<1.0.0,>=0.0.1",
"urllib3<2.0.0,>=1.26.9",
"xlrd<2.0,>=1.2",
Expand Down
1 change: 1 addition & 0 deletions ...omponents/grievances/PaymentGrievance/PaymentGrievanceDetails/PaymentGrievanceDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ export function PaymentGrievanceDetails({
{canApprovePaymentVerification &&
ticket.status === GRIEVANCE_TICKET_STATES.FOR_APPROVAL ? (
<Button
data-cy="grievance-approve"
onClick={() =>
confirm({
title: t('Approve'),
Expand Down
1 change: 1 addition & 0 deletions ...mentGrievance/PaymentGrievanceDetails/__snapshots__/PaymentGrievanceDetails.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ exports[`components/grievances/PaymentGrievanceDetails should render with data 1
</h6>
<button
class="MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-colorPrimary MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-colorPrimary css-dl1jos-MuiButtonBase-root-MuiButton-root"
data-cy="grievance-approve"
tabindex="0"
type="button"
>
Expand Down
1 change: 1 addition & 0 deletions .../components/grievances/PaymentGrievance/VerifyPaymentGrievance/VerifyPaymentGrievance.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ export function VerifyPaymentGrievance({
<Button
color="primary"
variant="contained"
data-cy="grievance-verify"
onClick={() => setVerifyManualDialogOpen(true)}
>
{t('Verify')}
Expand Down
1 change: 1 addition & 0 deletions ...aymentGrievance/VerifyPaymentGrievance/__snapshots__/VerifyPaymentGrievance.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ exports[`components/grievances/VerifyPaymentGrievance should render with data 1`
>
<button
class="MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-colorPrimary MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-colorPrimary css-dl1jos-MuiButtonBase-root-MuiButton-root"
data-cy="grievance-verify"
tabindex="0"
type="button"
>
Expand Down
19 changes: 10 additions & 9 deletions src/frontend/src/components/payments/CreateVerificationPlan.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,8 @@ export const CreateVerificationPlan = ({
variant="fullWidth"
aria-label="full width tabs example"
>
<Tab label={t('FULL LIST')} />
<Tab label={t('RANDOM SAMPLING')} />
<Tab data-cy="tab-full-list" label={t('FULL LIST')} />
<Tab data-cy="tab-random-sampling" label={t('RANDOM SAMPLING')} />
</StyledTabs>
</TabsContainer>
<TabPanel value={selectedTab} index={0}>
Expand Down Expand Up @@ -340,10 +340,11 @@ export const CreateVerificationPlan = ({
name="verificationChannel"
label={t('Verification Channel')}
style={{ flexDirection: 'row' }}
data-cy="checkbox-verification-channel"
choices={[
{ value: 'RAPIDPRO', name: 'RAPIDPRO' },
{ value: 'XLSX', name: 'XLSX' },
{ value: 'MANUAL', name: 'MANUAL' },
{ value: 'RAPIDPRO', name: 'RAPIDPRO', dataCy: 'radio-rapidpro' },
{ value: 'XLSX', name: 'XLSX', dataCy: 'radio-xlsx' },
{ value: 'MANUAL', name: 'MANUAL', dataCy: 'radio-manual' },
]}
component={FormikRadioGroup}
alignItems="center"
Expand Down Expand Up @@ -480,9 +481,9 @@ export const CreateVerificationPlan = ({
style={{ flexDirection: 'row' }}
alignItems="center"
choices={[
{ value: 'RAPIDPRO', name: 'RAPIDPRO' },
{ value: 'XLSX', name: 'XLSX' },
{ value: 'MANUAL', name: 'MANUAL' },
{ value: 'RAPIDPRO', name: 'RAPIDPRO', dataCy: 'radio-rapidpro' },
{ value: 'XLSX', name: 'XLSX', dataCy: 'radio-xlsx' },
{ value: 'MANUAL', name: 'MANUAL', dataCy: 'radio-manual' },
]}
component={FormikRadioGroup}
/>
Expand All @@ -508,7 +509,7 @@ export const CreateVerificationPlan = ({
</DialogContent>
<DialogFooter>
<DialogActions>
<Button onClick={() => setOpen(false)}>CANCEL</Button>
<Button data-cy="button-cancel" onClick={() => setOpen(false)}>CANCEL</Button>
<LoadingButton
loading={loading}
type="submit"
Expand Down
16 changes: 8 additions & 8 deletions src/frontend/src/components/payments/EditVerificationPlan.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,8 +309,8 @@ export const EditVerificationPlan = ({
variant="fullWidth"
aria-label="full width tabs example"
>
<Tab label={t('FULL LIST')} />
<Tab label={t('RANDOM SAMPLING')} />
<Tab data-cy="tab-full-list" label={t('FULL LIST')} />
<Tab data-cy="tab-random-sampling" label={t('RANDOM SAMPLING')} />
</StyledTabs>
</TabsContainer>
<TabPanel value={selectedTab} index={0}>
Expand Down Expand Up @@ -351,9 +351,9 @@ export const EditVerificationPlan = ({
label={t('Verification Channel')}
style={{ flexDirection: 'row', alignItems: 'center' }}
choices={[
{ value: 'RAPIDPRO', name: 'RAPIDPRO' },
{ value: 'XLSX', name: 'XLSX' },
{ value: 'MANUAL', name: 'MANUAL' },
{ value: 'RAPIDPRO', name: 'RAPIDPRO', dataCy: 'radio-rapidpro' },
{ value: 'XLSX', name: 'XLSX', dataCy: 'radio-xlsx' },
{ value: 'MANUAL', name: 'MANUAL', dataCy: 'radio-manual' },
]}
component={FormikRadioGroup}
alignItems="center"
Expand Down Expand Up @@ -500,9 +500,9 @@ export const EditVerificationPlan = ({
}}
alignItems="center"
choices={[
{ value: 'RAPIDPRO', name: 'RAPIDPRO' },
{ value: 'XLSX', name: 'XLSX' },
{ value: 'MANUAL', name: 'MANUAL' },
{ value: 'RAPIDPRO', name: 'RAPIDPRO', dataCy: 'radio-rapidpro' },
{ value: 'XLSX', name: 'XLSX', dataCy: 'radio-xlsx' },
{ value: 'MANUAL', name: 'MANUAL', dataCy: 'radio-manual' },
]}
component={FormikRadioGroup}
/>
Expand Down
5 changes: 4 additions & 1 deletion src/frontend/src/components/payments/VerificationPlanActions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ export function VerificationPlanActions({
color="primary"
variant="outlined"
startIcon={<GetApp />}
data-cy="export-xlsx"
onClick={async () => {
try {
await mutateExport({
Expand Down Expand Up @@ -171,6 +172,7 @@ export function VerificationPlanActions({
<Button
color="primary"
variant="outlined"
data-cy="download-xlsx"
startIcon={<GetApp />}
>
{t('Download Xlsx')}
Expand All @@ -180,7 +182,7 @@ export function VerificationPlanActions({
)}

{canImport && (
<Box p={2}>
<Box p={2} data-cy="import-xlsx">
<ImportXlsx
paymentVerificationPlanId={verificationPlan.id}
cashOrPaymentPlanId={planNode.id}
Expand All @@ -204,6 +206,7 @@ export function VerificationPlanActions({
loading={loadingInvalid}
color="primary"
variant="outlined"
data-cy="button-mark-as-invalid"
onClick={async () => {
try {
await mutateInvalid({
Expand Down
Loading
Loading