Skip to content

Netto/Lordo#242

Merged
cannarocks merged 61 commits intomasterfrom
develop
Oct 16, 2023
Merged

Netto/Lordo#242
cannarocks merged 61 commits intomasterfrom
develop

Conversation

@d-beezee
Copy link
Copy Markdown
Member

No description provided.

marcbon and others added 30 commits September 18, 2023 11:23
…in Wallet Management page

🌟 feat(columns.ts): add support for sorting by gross amount in Wallet Management page
… in BootyDetailsModal

🔧 fix(columns.ts): add support for sorting by amount_gross in bootyDetailsColumns
…etState

🔀 refactor(types.d.ts): add "amount_gross" to orderBy options in WalletState for booty

🔀 refactor(types.d.ts): add "amount_gross" to orderBy options in WalletState for bootyDetails
✨ feat(cypress/support/commands.ts): add custom commands file
✨ feat(cypress/support/e2e.ts): add global configuration file
✨ feat(cypress/tsconfig.json): add TypeScript configuration file for Cypress
- Add fixture file for user's booty example response
- Add fixture file for user's pending booty example response
- Add fixture file for user's multiple pages payments response
- Add fixture file for user's paid and processing payments response
- Add fixture file for user's single paid payment response
- Add fixture file for user's multi-page payment response
- Add fixture file for user's simple payment response

🔀 chore(cypress): update fixture files for pending_booty/_get endpoint

- Update `200_multiple-attributions.json`:
  - Change `amount` to `net` and `gross` objects
  - Update values for `net` and `gross` objects

- Update `200_single-attribution.json`:
  - Change `amount` to `net` and `gross` objects
  - Update value for `net` object
The payment fixtures for multiple pages, paid and processing, and single paid payment have been updated to use a nested 'amount' object instead of a direct 'net' object. This change was made to align with the updated data structure.
…and gross properties for booty amount

🐛 fix(types.d.ts): update wallet state structure to use net and gross properties for orderBy field
…mount fields

🔨 refactor(columns.ts): update column names and data index for amount fields
✨ feat(cypress): add new test file manage_payment_net_gross.spec.cy.ts
✨ feat(cypress): add new test file table_net_gross.spec.cy.ts
🔀 merge(cypress): update fixture for multiple-pages.json
…ngBooty to objects with net and gross properties

✨ feat(usePerformance.tsx): update setAllBooty and setPendingBooty to handle object values instead of numbers
…et?.value

🐛 fix(WalletManagment.tsx): fix references to booty.amount_gross to booty.gross?.value
✨ feat(WalletManagment.tsx): remove condition for disabling Button component based on booty.amount value
…ounts

🐛 fix(columns.ts): fix dataIndex and key names for net and gross amounts
🐛 fix(columns.ts): fix dataIndex and key names for amount gross and amount properties
…ss variable for clarity

🌟 feat(Step2Recap.tsx): display both net and gross amounts in the "Total booty" section
🔧 fix(utils/schema.ts): fix formatting of schema definitions
🔧 chore(package.json): remove import/no-anonymous-default-export rule configuration
💡 Why:
The `orderBy` options in the `operations` interface were updated to include the new fields `net` and `gross`. This change allows for more flexibility in ordering the values in the API responses.
marcbon and others added 29 commits September 20, 2023 11:36
…get/200_Example_1

✨ feat(table_net_gross.spec.cy.ts): add new API endpoints for pending_booty and payments
🔧 fix(200_multiple-pages.json): update payment amounts to include net and gross values
…e paid payment

✨ feat(table_net_gross.spec.cy.ts): add support for net and gross values in wallet table
…xture for single paid payment

🔧 chore(200_simple.json): update fixture to include net and gross amounts for single paid payment
🔧 chore(table_net_gross.spec.cy.ts): remove commented out code
🔧 chore(commands.ts): remove unnecessary comments and add missing newline at end of file
…allet table

✨ feat(table_net_gross.spec.cy.ts): add test to check if the payment detail modal shows a non-empty table
✨ feat(table_net_gross.spec.cy.ts): add test to check if the payment detail modal shows an empty state if no payments exist
… and add inline styles for appearance, border, and background color
…tailsModal

🔥 refactor(columns.ts): remove net amount column from paymentDetailsColumns
…ty/tryber-react into performance-dashboard-net-gross
fix(net-gross): remove net from initial state
@cannarocks cannarocks merged commit 51937d9 into master Oct 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants