Mercur requirements update #562
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
🚅 Deployed to the mercur-pr-562 environment in [DEV & QA] mercur-internal
|
railway-app
bot
temporarily deployed
to
[DEV & QA] mercur-internal / mercur-pr-562
tomaszdworniczak
approved these changes
Dec 15, 2025
LukaGiorgadze
added a commit
to checkatrade-labs/shop-mercur
that referenced
this pull request
Jan 6, 2026
* feat: add price preferences vendor endpoint * fix: oas tags * fix: events * version: bump to medusa 2.8.6 (mercurjs#332) * fix: enable setting up shipping option price with region * fix: use also for update * fix: seller invitation email * fix: return order display id with order sets * implement no talkjs app key screen (mercurjs#349) * mode fix * mode fix * talkjs app id request (mercurjs#353) * fix: invitation links & token * fix: returns process * fix: seller details admin panel (mercurjs#357) * fix: add reason id * fix: auth middleware * fix: return request status changed despite the error * add s3 storage * remove s3 * fix conflicts * feat(attribute): add is_required field to attribute model * feat(attribute): add is_required field to UpdateAttributeDTO and CreateAttributeDTO interfaces * feat(attribute): add is_required field to AttributeDTO interface * feat(attribute): add is_required field to API documentation for attributes * feat(attribute): add is_filterable and is_required fields to attribute validation schemas * feat(attribute): add is_required field to defaultAdminAttributeFields in query config * feat(attribute): enhance AttributeForm with is_required field and update labels for optional fields * feat(attribute): add is_filterable and is_required columns to attribute table with conditional rendering * fix(attribute): update import path for Attribute types and modify query key usage in useAttributes hook * fix(attribute): update import path for AttributeDTO to use @mercurjs/framework * feat(migration): add migration to include is_required column in attribute table * refactor(attribute): update useAttributes and useAttribute hooks to improve type definitions and query key handling * feat(attribute): enhance attribute table columns with edit, delete, and toggle functionalities * feat(attribute): implement client-side filtering and sorting for attributes table with enhanced UI components * feat(attribute): update sorting options in attributes table to include created_at and updated_at fields * feat(attribute): expand attribute details to include ui_component, is_filterable, and is_required fields * feat(attribute): enhance edit attribute page with progress tabs and improved save functionality * feat(attribute): add form state management and tab navigation for attribute creation and editing * feat(attribute): add CategorySelectionModal component for selecting product categories in attribute management * feat(attribute): implement progress tabs and update save button for attribute creation page * fix(MultiSelectCategory): update selected item indicator color * feat(PossibleValuesList): update UI components and improve layout for better usability * refactor(PossibleValuesList): remove unused icon import to streamline component * feat(attribute): add is_global field to attribute validators and enforce category assignment rules * feat(attribute): add is_global field and created_at/updated_at timestamps to AttributeDTO * feat(attribute): add is_global field to UpdateAttributeDTO and CreateAttributeDTO interfaces * feat(migration): add is_global column to attribute table with migration script * feat(migration): create migration script to add is_global column to attribute table * feat(attribute): add is_global field to Attribute model * fix(AttributeForm): simplify ui_component assignment and improve conditional rendering for PossibleValuesList * refactor(AttributeForm): remove is_global field and update category section visibility logic * refactor(AttributeForm): reposition warning message for improved visibility and conditional rendering * feat(EditAttributePage): include is_required field in attribute fields for correct data handling * refactor(attribute): remove is_global field from AttributeDTO and related interfaces, and create migration to drop the column from the database * feat(AttributeForm, EditAttributePage, CreateAttributePage): implement form reference handling and update button actions for improved navigation and submission (mercurjs#399) * feat(AttributeForm): implement custom validation for category selecti… (mercurjs#400) * feat(AttributeForm): implement custom validation for category selection and update error handling with Hint component * feat(MultiSelectCategory): enhance badge visibility logic and implement dynamic badge count based on available width * Mm2 1074 admin attributes when more than 10 attributes is selected bottom of modal is not visible (mercurjs#401) * refactor(EditAttributePage, CreateAttributePage): restructure modal layout for improved, scrollable UI * fix(AttributeForm, EditAttributePage, CreateAttributePage): updatecategory validation logic and integrate into form submission process * Mm2 1075 admin attributes possible values issues (mercurjs#402) * feat(AttributeDetailPage): enhance dropdown menu with icons for edit and delete actions * feat(PossibleValuesTable): add delete confirmation prompt and update possible values handling * fix(EditPossibleValuePage): update metadata handling to use undefined instead of null * refactor(EditPossibleValuePage): comment out MetadataEditor component for possible future implementation * fix(MultiSelectCategory): adjust badge width calculation for improved visibility * Merge main into testing via checkout * add secondary categories * feat/mm2-1378 admin panel cleanup * ver: update package.json versions * update changelog (mercurjs#430) * update changelog * update changelog, add contributors * fix: creating seller after accept of request from admin * fix: restore config files required to build (mercurjs#437) * chore: chnaged link send in mail order placed to redirect to order se… (mercurjs#428) * chore: chnaged link send in mail order placed to redirect to order set view * chore: moved link to constant * chore: update of medusa (mercurjs#425) * chore: update of medusa * chore: revert of local development change for loging info * chore: updated verison of medusa packages for resend package module * fix: admin invitation email (mercurjs#424) * Fix mm2-1319 (mercurjs#421) * chore: prevent sending email if product update request is automatic (mercurjs#414) * chore: added deletion of all links between product and second categories * chore: added calculated prices (mercurjs#438) * chore: added calculated prices * chore: updated currency * chore: added endpoint for managing campaign promotions for vendor panel * fix: bump Medusa version to 2.10.0, add explicit typing in vendor promotions rules endpoint, add new middelware for path params to mentioned endpoint * chore: deleted incorrect relation info request * fix: appraoch with using new index module from medusa core to allow filtering on linked enities fields * chore: revert of backend changes for aloglia indexes products info * update changelog (mercurjs#459) * update version to 1.4.2 * chore: fixed reviews for store (mercurjs#449) * chore: added possibility to remove location from product on vendor panel (mercurjs#445) * chore: changed default sorting of orders for vendor panel (mercurjs#444) * fix: creating return, fix of link seller return * chore: added ability to create request for updating product collection by vendor * fix: WIP * fix: bump up Medusa version to 2.10.2 * Clear build command for testing * added a valid ordering for both * MM2-1507 * MM2-1403 * fix: keep rule key in commission response at all times even if it is null * base * chore: updated packages versions and added fix for builds on railway * chore: added info about changes in 1.4.3 version * MM2-1403 * fix: introduce Index Module to allow filtering and sorting by linked modules properties (seller - customer group) * Release/1.4.3 (mercurjs#496) (mercurjs#497) * feat: add price preferences vendor endpoint * fix: oas tags * fix: events * version: bump to medusa 2.8.6 (mercurjs#332) * fix: enable setting up shipping option price with region * fix: use also for update * fix: seller invitation email * fix: return order display id with order sets * implement no talkjs app key screen (mercurjs#349) * mode fix * mode fix * talkjs app id request (mercurjs#353) * fix: invitation links & token * fix: returns process * fix: seller details admin panel (mercurjs#357) * fix: add reason id * fix: auth middleware * fix: return request status changed despite the error * add s3 storage * remove s3 * fix conflicts * feat(attribute): add is_required field to attribute model * feat(attribute): add is_required field to UpdateAttributeDTO and CreateAttributeDTO interfaces * feat(attribute): add is_required field to AttributeDTO interface * feat(attribute): add is_required field to API documentation for attributes * feat(attribute): add is_filterable and is_required fields to attribute validation schemas * feat(attribute): add is_required field to defaultAdminAttributeFields in query config * feat(attribute): enhance AttributeForm with is_required field and update labels for optional fields * feat(attribute): add is_filterable and is_required columns to attribute table with conditional rendering * fix(attribute): update import path for Attribute types and modify query key usage in useAttributes hook * fix(attribute): update import path for AttributeDTO to use @mercurjs/framework * feat(migration): add migration to include is_required column in attribute table * refactor(attribute): update useAttributes and useAttribute hooks to improve type definitions and query key handling * feat(attribute): enhance attribute table columns with edit, delete, and toggle functionalities * feat(attribute): implement client-side filtering and sorting for attributes table with enhanced UI components * feat(attribute): update sorting options in attributes table to include created_at and updated_at fields * feat(attribute): expand attribute details to include ui_component, is_filterable, and is_required fields * feat(attribute): enhance edit attribute page with progress tabs and improved save functionality * feat(attribute): add form state management and tab navigation for attribute creation and editing * feat(attribute): add CategorySelectionModal component for selecting product categories in attribute management * feat(attribute): implement progress tabs and update save button for attribute creation page * fix(MultiSelectCategory): update selected item indicator color * feat(PossibleValuesList): update UI components and improve layout for better usability * refactor(PossibleValuesList): remove unused icon import to streamline component * feat(attribute): add is_global field to attribute validators and enforce category assignment rules * feat(attribute): add is_global field and created_at/updated_at timestamps to AttributeDTO * feat(attribute): add is_global field to UpdateAttributeDTO and CreateAttributeDTO interfaces * feat(migration): add is_global column to attribute table with migration script * feat(migration): create migration script to add is_global column to attribute table * feat(attribute): add is_global field to Attribute model * fix(AttributeForm): simplify ui_component assignment and improve conditional rendering for PossibleValuesList * refactor(AttributeForm): remove is_global field and update category section visibility logic * refactor(AttributeForm): reposition warning message for improved visibility and conditional rendering * feat(EditAttributePage): include is_required field in attribute fields for correct data handling * refactor(attribute): remove is_global field from AttributeDTO and related interfaces, and create migration to drop the column from the database * feat(AttributeForm, EditAttributePage, CreateAttributePage): implement form reference handling and update button actions for improved navigation and submission (mercurjs#399) * feat(AttributeForm): implement custom validation for category selecti… (mercurjs#400) * feat(AttributeForm): implement custom validation for category selection and update error handling with Hint component * feat(MultiSelectCategory): enhance badge visibility logic and implement dynamic badge count based on available width * Mm2 1074 admin attributes when more than 10 attributes is selected bottom of modal is not visible (mercurjs#401) * refactor(EditAttributePage, CreateAttributePage): restructure modal layout for improved, scrollable UI * fix(AttributeForm, EditAttributePage, CreateAttributePage): updatecategory validation logic and integrate into form submission process * Mm2 1075 admin attributes possible values issues (mercurjs#402) * feat(AttributeDetailPage): enhance dropdown menu with icons for edit and delete actions * feat(PossibleValuesTable): add delete confirmation prompt and update possible values handling * fix(EditPossibleValuePage): update metadata handling to use undefined instead of null * refactor(EditPossibleValuePage): comment out MetadataEditor component for possible future implementation * fix(MultiSelectCategory): adjust badge width calculation for improved visibility * Merge main into testing via checkout * add secondary categories * feat/mm2-1378 admin panel cleanup * ver: update package.json versions * update changelog (mercurjs#430) * update changelog * update changelog, add contributors * fix: creating seller after accept of request from admin * fix: restore config files required to build (mercurjs#437) * chore: chnaged link send in mail order placed to redirect to order se… (mercurjs#428) * chore: chnaged link send in mail order placed to redirect to order set view * chore: moved link to constant * chore: update of medusa (mercurjs#425) * chore: update of medusa * chore: revert of local development change for loging info * chore: updated verison of medusa packages for resend package module * fix: admin invitation email (mercurjs#424) * Fix mm2-1319 (mercurjs#421) * chore: prevent sending email if product update request is automatic (mercurjs#414) * chore: added deletion of all links between product and second categories * chore: added calculated prices (mercurjs#438) * chore: added calculated prices * chore: updated currency * fix: bump Medusa version to 2.10.0, add explicit typing in vendor promotions rules endpoint, add new middelware for path params to mentioned endpoint * chore: deleted incorrect relation info request * chore: revert of backend changes for aloglia indexes products info * update changelog (mercurjs#459) * update version to 1.4.2 * chore: fixed reviews for store (mercurjs#449) * chore: added possibility to remove location from product on vendor panel (mercurjs#445) * chore: changed default sorting of orders for vendor panel (mercurjs#444) * fix: bump up Medusa version to 2.10.2 * Clear build command for testing * chore: updated packages versions and added fix for builds on railway * chore: added info about changes in 1.4.3 version --------- Co-authored-by: slusarczykmichal <slusarczyk.michal@outlook.com> Co-authored-by: WojciechPlodzien <wojciech.plodzien@rigbyjs.com> Co-authored-by: slusarczykmichal <85502538+slusarczykmichal@users.noreply.github.com> Co-authored-by: Paweł Fulara <39165521+pfulara@users.noreply.github.com> Co-authored-by: pfulara <fulara.pawel@gmail.com> Co-authored-by: katPanek <91321969+katPanek@users.noreply.github.com> Co-authored-by: MWesterRigby <maciej.wester@rigbyjs.com> Co-authored-by: Mikolaj Borowski <mikolajborowskiii@gmail.com> Co-authored-by: rigbyms <85502538+rigbyms@users.noreply.github.com> Co-authored-by: jakub-borek <56539678+jakub-borek@users.noreply.github.com> Co-authored-by: Kacper Drewniak <k.drewniak.dev@gmail.com> Co-authored-by: Tomasz Dworniczak <tomdworniczak@Tomaszs-MacBook-Pro.local> Co-authored-by: maciej <maciej.golaszewski@rigbyjs.com> Co-authored-by: appsessive <157238815+appsessive-tech@users.noreply.github.com> * chore: updated url for order cancel * feat: WIP * feat: bump Medusa version to latest one - 2.11.3 * fix: remove filterable property from Seller module object in link bedefinition between Seller and Campaign to allow proper ingestion of index data * fix: revert introduction of Index Module for soritng and filtering in vendor campaigns and customer groups endpoints * feat: resolve conflicts and bump medusa/index dependency to 2.11.3 * fix: typo in index package dependancy * fix: add custom endpoint to attach promotions to cart that validates if promo codes are part of the seller context * fix: add missing undefined check for auth context in new custom apply promo codes endpoint * chore: update changelog, bump up application version * chore: remove duplicated scripts in apps/backend package.json file * fix: return a filtered stock locations count in the endpoint response (mercurjs#523) Co-authored-by: Tomasz Dworniczak <tomdworniczak@Tomaszs-MacBook-Pro.local> * MM2-1777 (mercurjs#508) * git commit -m "MM2-1387 [B2C][Vendor panel] I get an error when I do searching on Product Types view" (mercurjs#491) * chore: updated all templates to return actual store name and url instead of Mercur (mercurjs#502) * bump version * remove mercur resend * working version * Update column header text from "Amount" to "Price" in buyer-new-order email template (mercurjs#533) * wip * resend * yalc * bumped version * chore: update changelog, bump up application version to 1.4.5 * fix(MM-1403): enhance vendor campaigns API to support search and improved filtering (mercurjs#545) * fix(MM2-2096): change file content encoding from binary to base64 in upload route (mercurjs#543) * fix(MM2-2103): update stock locations endpoint to exclude linked seller stock locations (mercurjs#542) * Remove test env file (mercurjs#486) * fix[mm2-2189]: add missing filters object to query fetching seller products (mercurjs#549) * chore: add @mercurjs/algolia dependency to backend package.json (mercurjs#561) * update packages * chore: add @mercurjs/algolia dependency to backend package.json * fix[mm2-2201]: add endpoint for vendor product variants to allow search, filtering and sorting (mercurjs#555) * feat: add Docker support and improve seeding Docker improvements: - Add multi-stage Dockerfile for backend with Turbo cache - Run migrations before server start - Add conditional seeding based on SEED_DEMO_DATA env var - Add healthcheck endpoint monitoring - Add .dockerignore for optimal build context Seed improvements: - Create admin user with email/password authentication - Create seller with full authentication - Both users created via authService.register for immediate login - Add proper error handling for auth identity creation Configuration: - Disable SSL for local PostgreSQL connections - Disable built-in Medusa admin UI (separate admin-panel used) - Update CORS settings for admin panel on port 8000 - Update .env.template with new admin panel URL * refactor: simplify CMD in backend Dockerfile Remove unnecessary echo statements - yarn commands already provide logging * fix: enable SSL connection for PostgreSQL database * Fix env.example * chore: bump up application version, update changelog * chore: update changelog * fix(MM2-1953): add vendor promotions rule attribute options middleware and update related validation logic (mercurjs#532) * fix(MM2-1953): add vendor promotions rule attribute options middleware and update related validation logic * refactor: remove commented code and clean up rule type normalization in promotions middleware * Mercur requirements update (mercurjs#562) * chore: extract date filter validator to shared location to use across validators files (mercurjs#574) * chore: remove console log (mercurjs#576) * fix: changing status of order return (mercurjs#521) * fix: add metadata property to create and update product option validator (mercurjs#571) * chore: change dockerfile to be able to control wheater or not syncing links should happen when running migrations (mercurjs#578) * chore: add @mercurjs/algolia dependency to backend package.json (mercurjs#579) Co-authored-by: Tomasz Buras <tomaszburas.dev@gmail.com> * chore: bump up packages version, update changelog * yarn * fix types * fix build issues * fix duploicate import { createLinkBody } from '@medusajs/medusa/api/utils/validators' * medusa config * wip * update email * add order details --------- Co-authored-by: slusarczykmichal <slusarczyk.michal@outlook.com> Co-authored-by: WojciechPlodzien <wojciech.plodzien@rigbyjs.com> Co-authored-by: slusarczykmichal <85502538+slusarczykmichal@users.noreply.github.com> Co-authored-by: Paweł Fulara <39165521+pfulara@users.noreply.github.com> Co-authored-by: pfulara <fulara.pawel@gmail.com> Co-authored-by: katPanek <91321969+katPanek@users.noreply.github.com> Co-authored-by: itariv <damian.grzesiak.dev@gmail.com> Co-authored-by: MWesterRigby <maciej.wester@rigbyjs.com> Co-authored-by: Mikolaj Borowski <mikolajborowskiii@gmail.com> Co-authored-by: rigbyms <85502538+rigbyms@users.noreply.github.com> Co-authored-by: jakub-borek <56539678+jakub-borek@users.noreply.github.com> Co-authored-by: Kacper Drewniak <k.drewniak.dev@gmail.com> Co-authored-by: Tomasz Dworniczak <tomdworniczak@Tomaszs-MacBook-Pro.local> Co-authored-by: maciej <maciej.golaszewski@rigbyjs.com> Co-authored-by: appsessive <157238815+appsessive-tech@users.noreply.github.com> Co-authored-by: milosz-w-rigby <milosz.wisniewski@rigbyjs.com> Co-authored-by: kamilkieres09 <kamil.kieres@rigbyjs.com> Co-authored-by: Tomek <50457289+tomaszdworniczak@users.noreply.github.com> Co-authored-by: tomaszdworniczak <tomdworniczak@gmail.com> Co-authored-by: Kamil Kiliasiński <kamilkiliasinski@gmail.com> Co-authored-by: Tomasz Buras <91786940+tomaszburas@users.noreply.github.com> Co-authored-by: Tomasz Buras <tomaszburas.dev@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added Yarn to requirements list
Note
Updates README with linked prerequisites (adding Yarn) and reflows content for readability.
YarntoPrerequisitesand convert all prerequisites to links.Written by Cursor Bugbot for commit 71cd0f6. This will update automatically on new commits. Configure here.