Skip to content

The complete open source platform to run your entire marketplace. Storefront, vendor panel, admin console, and integrations in one enterprise-grade platform you own.

fix(admin,vendor,core): add i18n store translations and fix seller registration (#840)

Viktor Holik9d0688d1eb01
diff --git a/apps/vendor/package.json b/apps/vendor/package.json
index cca27d0b1..097c94b45 100644
--- a/apps/vendor/package.json
+++ b/apps/vendor/package.json
@@ -26,7 +26,8 @@
"react-hook-form": "7.49.1",
"@hookform/resolvers": "3.4.2",
"jsonwebtoken": "9.0.2",
- "react-jwt": "^2.0.0"
+ "react-jwt": "^2.0.0",
+ "radix-ui": "1.1.2"
},
"devDependencies": {
"@types/react": "^18.3.2",
@@ -44,6 +45,7 @@
"ts-node": "^10.9.2",
"turbo": "^2.7.4",
"typescript": "5.9.3",
- "@types/node": "^24.10.1"
+ "@types/node": "^24.10.1",
+ "@mercurjs/types": "workspace:*"
}
}
\ No newline at end of file
diff --git a/apps/vendor/src/components/store-setup/store-setup.tsx b/apps/vendor/src/components/store-setup/store-setup.tsx
new file mode 100644
index 000000000..1748c10a2
--- /dev/null
+++ b/apps/vendor/src/components/store-setup/store-setup.tsx
@@ -0,0 +1,141 @@
+import { useMemo, useState } from "react";
+import { useNavigate } from "react-router-dom";
+import { Container, Text, clx } from "@medusajs/ui";
+import {
+ CheckCircleSolid,
+ TriangleDownMini,
+ CircleDottedLine,
+} from "@medusajs/icons";
+import { Collapsible as RadixCollapsible } from "radix-ui";
+
+import { SellerDTO } from "@mercurjs/types";
+
+type ProfileStep = {
+ key: string;
+ label: string;
+ completed: boolean;
+ path: string;
+};
+
+function getProfileSteps(seller: SellerDTO): ProfileStep[] {
+ const hasStoreDetails = !!(seller.name && seller.email && seller.description);
+
+ const hasAddress = !!(
+ seller.address &&
+ seller.address.address_1 &&
+ seller.address.city &&
+ seller.address.country_code
+ );
+
+ const hasCompanyDetails = !!(
+ seller.professional_details && seller.professional_details.corporate_name
+ );
+
+ const hasPaymentDetails = !!(
+ seller.payment_details &&
+ seller.payment_details.holder_name &&
+ seller.payment_details.country_code
+ );
+
+ return [
+ {
+ key: "store_details",
+ label: "Add store details",
+ completed: hasStoreDetails,
+ path: "/settings/store/edit",
+ },
+ {
+ key: "address",
+ label: "Add address",
+ completed: hasAddress,
+ path: "/settings/store/address",
+ },
+ {
+ key: "company_details",
+ label: "Add company details",
+ completed: hasCompanyDetails,
+ path: "/settings/store/professional-details",
+ },
+ {
+ key: "payment_details",
+ label: "Add payment details",
+ completed: hasPaymentDetails,
+ path: "/settings/store/payment-details",
+ },
+ ];
+}
+
+const StoreSetup = ({ seller }: { seller: SellerDTO }) => {
+ const navigate = useNavigate();
+ const [open, setOpen] = useState(true);
+
+ const steps = useMemo(() => getProfileSteps(seller), [seller]);
+
+ const completedCount = steps.filter((s) => s.completed).length;
+ const totalCount = steps.length;
+ const progressPercent = (completedCount / totalCount) * 100;
+
+ if (completedCount === totalCount) {
+ return null;
+ }
+
+ return (
+ <RadixCollapsible.Root open={open} onOpenChange={setOpen}>
+ <Container className="overflow-hidden p-0">
+ <div
+ className="h-1 bg-ui-tag-green-icon transition-all duration-500"
+ style={{ width: `${progressPercent}%` }}
+ />
+ <div className="p-6">
+ <RadixCollapsible.Trigger asChild>
+ <button className="flex w-full items-center justify-between">
+ <Text size="large" weight="plus" leading="compact">
+ Complete store profile
+ </Text>
+ <TriangleDownMini
+ className={clx(
+ "text-ui-fg-muted transition-transform duration-200",
+ !open && "-rotate-90",
+ )}
+ />
+ </button>
+ </RadixCollapsible.Trigger>
+
+ <RadixCollapsible.Content>
+ <div className="mt-4 flex flex-col gap-y-3">
+ {steps.map((step) => (
+ <button
+ key={step.key}
+ className="flex items-center gap-x-3 text-left"
+ onClick={() => {
+ if (!step.completed) {
+ navigate(step.path);
+ }
+ }}
+ disabled={step.completed}
+ >
+ {step.completed ? (
+ <CheckCircleSolid className="text-ui-tag-green-icon shrink-0" />
+ ) : (
+ <CircleDottedLine className="text-ui-fg-muted shrink-0" />
+ )}
+ <Text
+ size="small"
+ leading="compact"
+ className={clx(
+ step.completed ? "text-ui-fg-base" : "text-ui-fg-base",
+ )}
+ >
+ {step.label}
+ </Text>
+ </button>
+ ))}
+ </div>
+ </RadixCollapsible.Content>
+ </div>
+ </Container>
+ </RadixCollapsible.Root>
+ );
+};
+
+export default StoreSetup;
diff --git a/apps/vendor/vite.config.ts b/apps/vendor/vite.config.ts
index c8c24eb22..87092f321 100644
--- a/apps/vendor/vite.config.ts
+++ b/apps/vendor/vite.config.ts
@@ -8,6 +8,9 @@ export default defineConfig({
react(),
mercurDashboardPlugin({
medusaConfigPath: '../../packages/api/medusa-config.ts',
+ components: {
+ StoreSetup: 'components/store-setup/store-setup',
+ },
}),
],
})
diff --git a/bun.lock b/bun.lock
index 9c42a9ab8..16037de58 100644
--- a/bun.lock
+++ b/bun.lock
@@ -99,6 +99,7 @@
"@tanstack/react-query": "5.64.2",
"@tanstack/react-table": "8.20.5",
"jsonwebtoken": "9.0.2",
+ "radix-ui": "1.1.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-hook-form": "7.49.1",
@@ -109,6 +110,7 @@
},
"devDependencies": {
"@eslint/js": "^9.39.1",
+ "@mercurjs/types": "workspace:*",
"@types/jsonwebtoken": "^9.0.9",
"@types/node": "^24.10.1",
"@types/react": "^18.3.2",
diff --git a/docs/roles-and-permissions.md b/docs/roles-and-permissions.md
deleted file mode 100644
index bab7bb623..000000000
--- a/docs/roles-and-permissions.md
+++ /dev/null
@@ -1,88 +0,0 @@
-# Roles and Permissions
-
-Mercur uses a **role-based access control (RBAC)** system to govern what each [seller member](seller-members.md) can do within a seller account. This page describes the two-layer architecture, the default permission set, the built-in roles, and how role assignment works.
-
-## Two-Layer Architecture
-
-The RBAC system is built on two layers:
-
-1. **Permissions** — Fine-grained capabilities defined at the platform level (e.g. "can edit products", "can view orders"). Permissions are atomic and cannot be subdivided further.
-2. **Roles** — Named bundles of permissions that can be assigned to members. A role groups related permissions into a meaningful job function (e.g. "Inventory Management" bundles product and stock permissions together).
-
-Members are never assigned permissions directly. Instead, they receive one or more **roles**, and their effective permissions are the union of all permissions across their assigned roles.
-
-## Permissions
-
-The platform ships with the following permissions:
-
-
-| Permission | Description |
-| ------------------- | ---------------------------------------------------------- |
-| `seller_management` | Manage seller account settings, profile, and configuration |
-| `member_management` | Add, remove, and manage members and their role assignments |
-| `product_read` | View products, variants, and associated data |
-| `product_write` | Create, edit, and delete products and variants |
-| `inventory_read` | View stock levels and inventory locations |
-| `inventory_write` | Update stock levels and manage inventory |
-| `order_read` | View orders, line items, and order history |
-| `order_write` | Process orders — fulfill, cancel, issue refunds |
-| `payout_read` | View payout history and balance information |
-| `payout_write` | Request payouts and manage payout settings |
-| `customer_read` | View customer information related to the seller's orders |
-| `support` | Access and respond to customer inquiries and disputes |
-
-
-### Permissions Grow With Modules
-
-The permissions listed above represent the **base set** shipped with the core platform. As additional modules are installed (e.g. promotions, analytics, messaging), new permissions are registered automatically. The RBAC system is designed to accommodate this growth without requiring changes to existing roles.
-
-## Default Roles
-
-Mercur includes **five default roles** that cover common team structures:
-
-
-| Role | Permissions Included |
-| ------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| **Store Administration** | `seller_management`, `member_management`, `product_read`, `product_write`, `inventory_read`, `inventory_write`, `order_read`, `order_write`, `payout_read`, `payout_write`, `customer_read`, `support` |
-| **Inventory Management** | `product_read`, `product_write`, `inventory_read`, `inventory_write` |
-| **Order Management** | `order_read`, `order_write`, `customer_read`, `support` |
-| **Accounting** | `order_read`, `payout_read`, `payout_write` |
-| **Support** | `order_read`, `customer_read`, `support` |
-
-
-### Default Roles Are Immutable
-
-Default roles **cannot be edited or deleted**. They provide a consistent baseline across all seller accounts on the platform. This ensures that core job functions remain predictable regardless of customization elsewhere.
-
-If the default roles do not match a seller's team structure, custom roles (see below) will address this in a future release.
-
-## Role Assignment
-
-Roles are assigned **per seller account**. When a [member](seller-members.md) is added to a seller account, they receive one or more roles that define their permissions within that specific store.
-
-Key points:
-
-- A member can hold **multiple roles** on the same seller account. Their effective permissions are the combined set of all assigned roles.
-- The same user can have **different roles** on different seller accounts. For example, a user might be a Store Administrator on one store and limited to Order Management on another.
-- Role assignment is managed by members with the `member_management` permission or by platform operators.
-
-### Minimum Admin Requirement
-
-Every seller account must have at least one member assigned the **Store Administration** role (or a role containing `member_management`). This prevents a seller account from becoming unmanageable — there must always be someone who can manage team access.
-
-## Custom Roles (Phase 2)
-
-A future release will introduce **custom roles**, allowing seller admins to define their own permission bundles tailored to their team's needs. Custom roles will:
-
-- Be created and managed per seller account
-- Combine any subset of available permissions
-- Coexist alongside the immutable default roles
-
-Until custom roles are available, sellers should use the default roles and assign multiple roles to members who need a specific combination of permissions.
-
-## Relationship to Other Concepts
-
-- **Members** are assigned roles through their [seller–member association](seller-members.md)
-- **Seller accounts** define the scope in which roles apply (see [Seller](seller.md))
-- **Subscriptions** are independent of RBAC — billing access is controlled by the `payout_read` / `payout_write` permissions within the Accounting role (see [Subscriptions](subscriptions.md))
-
diff --git a/docs/seller-members.md b/docs/seller-members.md
index 9299aeda2..db1b03146 100644
--- a/docs/seller-members.md
+++ b/docs/seller-members.md
@@ -6,17 +6,19 @@ A **seller member** represents a user who has access to a seller account. Mercur
The relationship between users and sellers is **many-to-many**. A seller account can have several members (e.g. an owner, a warehouse manager, and a support agent), and a single user can be a member of multiple seller accounts (e.g. a consultant managing stores for different brands).
-Each membership is a distinct association that carries its own [role assignment](roles-and-permissions.md). This means the same user can have different permissions on different stores.
+Each membership is a distinct association between a user and a seller account.
## Member Data
Each member record holds the following information:
-| Field | Description |
-|---|---|
-| `email` | The member's email address, used for login and notifications |
-| `locale` | Preferred language/locale for the vendor portal UI |
-| `status` | Whether the member is active or deactivated |
+
+| Field | Description |
+| -------- | ------------------------------------------------------------ |
+| `email` | The member's email address, used for login and notifications |
+| `locale` | Preferred language/locale for the vendor portal UI |
+| `status` | Whether the member is active or deactivated |
+
The member's identity is tied to their **email address**. Email addresses must be unique across all members within a single seller account but the same email can appear on different seller accounts.
@@ -26,13 +28,12 @@ When a member is added to a seller account, the association includes:
- A reference to the **seller account**
- A reference to the **member**
-- One or more **roles** that define the member's permissions on that account
-This association is the core of the access model. Removing the association revokes the member's access to that seller account entirely.
+Removing the association revokes the member's access to that seller account entirely.
## Store Switcher
-For users who belong to multiple seller accounts, the vendor portal provides a **store switcher**. Each store context is fully isolated — when a member switches stores, they see only the data (products, orders, payouts) belonging to that seller account, and their permissions are governed by the roles assigned on that specific account.
+For users who belong to multiple seller accounts, the vendor portal provides a **store switcher**. Each store context is fully isolated — when a member switches stores, they see only the data (products, orders, payouts) belonging to that seller account.
This isolation ensures that access to one store never leaks information from another, even when the same person manages both.
@@ -41,7 +42,7 @@ This isolation ensures that access to one store never leaks information from ano
Members can be added to a seller account by:
- **Operators** — via the admin dashboard, an operator can add members to any seller account
-- **Seller admins** — members with the appropriate role (see [Roles and Permissions](roles-and-permissions.md)) can invite new members to their own seller account
+- **Seller admins** — members with admin access can invite new members to their own seller account
When a new member is added, they receive an invitation to set up their access. If the email already belongs to an existing user in the system, the new seller association is linked to their existing account.
@@ -51,27 +52,9 @@ Removing a member **deletes the association** between the user and the seller ac
Both **operators** and **seller admins** can remove members, subject to the constraint that a seller account must always retain at least one admin member.
-## Deactivation vs. Deletion
-
-Rather than removing a member entirely, a seller admin can **deactivate** a member. A deactivated member:
-
-- Cannot log in to the seller account
-- Retains their association and role assignments
-- Can be reactivated later without re-invitation
-
-This is useful for temporary access revocation — for example, when a seasonal worker is off-duty or when investigating a potential issue.
-
-## Member Notifications
-
-In the current implementation, **all members** of a seller account receive all notifications related to that account (order placed, payout settled, etc.). There is no per-member notification filtering — every member sees every event.
-
-Future iterations may introduce notification preferences tied to roles or individual member settings.
-
## Business Rules
-- A seller account must have **at least one member** with an admin role at all times
+- A seller account must have **at least one member** with admin access at all times
- **Email addresses** must be unique within a single seller account
-- A member's **roles** are scoped to a specific seller account — the same user can hold different roles on different stores
-- **Deactivation** preserves the member record; **removal** deletes the association entirely
- Members are managed through the [seller account lifecycle](seller.md) — if a seller is terminated, all member associations are effectively void
-- Permissions are determined by the member's assigned roles (see [Roles and Permissions](roles-and-permissions.md))
+
diff --git a/docs/seller.md b/docs/seller.md
index 97503eab8..1240d7cf2 100644
--- a/docs/seller.md
+++ b/docs/seller.md
@@ -7,20 +7,20 @@ A **seller** is the central actor in a Mercur marketplace. Every product listing
Each seller account holds the following core fields:
-| Field | Description |
-| ----------------- | ----------------------------------------------------------------------------- |
-| `name` | Display name shown to customers on the storefront (unique) |
-| `handle` | URL-friendly identifier for the seller (unique) |
-| `email` | Primary contact email for the seller account (unique) |
-| `description` | Free-text seller description, typically shown on the seller's storefront page |
-| `logo` | Seller logo or avatar |
-| `banner` | Banner image for the seller's storefront page |
-| `website_url` | Seller's external website |
-| `currency_code` | The single currency in which this seller operates |
-| `is_premium` | Operator-designated premium seller flag (see below) |
-| `status_reason` | Optional explanation for the current status (e.g. reason for suspension) |
-| `external_id` | Identifier in an external system (unique, optional) |
-| `metadata` | Arbitrary JSON metadata |
+| Field | Description |
+| --------------- | ----------------------------------------------------------------------------- |
+| `name` | Display name shown to customers on the storefront (unique) |
+| `handle` | URL-friendly identifier for the seller (unique) |
+| `email` | Primary contact email for the seller account (unique) |
+| `description` | Free-text seller description, typically shown on the seller's storefront page |
+| `logo` | Seller logo or avatar |
+| `banner` | Banner image for the seller's storefront page |
+| `website_url` | Seller's external website |
+| `currency_code` | The single currency in which this seller operates |
+| `is_premium` | Operator-designated premium seller flag (see below) |
+| `status_reason` | Optional explanation for the current status (e.g. reason for suspension) |
+| `external_id` | Identifier in an external system (unique, optional) |
+| `metadata` | Arbitrary JSON metadata |
### Single Currency Per Account
@@ -31,9 +31,7 @@ If a seller needs to trade in multiple currencies, the recommended pattern is to
### Professional Sellers
-A seller is considered professional when it has associated **`professional_details`** — a separate record containing business information such as company name, registration number, and VAT ID. If this record is present, the seller is treated as a registered business; if absent, the seller is an individual.
-
-This distinction affects tax handling, invoice formatting, and may influence storefront presentation.
+A seller can optionally have associated **professional details**. If present, the seller is treated as a registered business; if absent, the seller is an individual.
## Address and Payment Information
@@ -78,16 +76,6 @@ A seller account moves through **four statuses** over its lifetime:
| `suspended` | `terminated` | Operator | All prerequisites met (see below) |
-Transitions not listed above are **not permitted**. A terminated seller cannot be reopened — a new account must be created instead.
-
-### Termination Prerequisites
-
-Before a seller account can be terminated:
-
-- All **open orders** must be fulfilled, cancelled, or otherwise resolved
-- All **pending payouts** must be settled or forfeited
-- Any **active subscription** must be cancelled and final billing completed
-
## Scheduled Closures
Sellers can schedule **temporary closures** without changing their account status. Two date fields control this:
@@ -114,8 +102,7 @@ The specific storefront behavior tied to premium status is determined by the fro
There are **three methods** for creating a seller account:
1. **Operator-created** — The platform operator creates the seller account directly via the admin dashboard. The account can be set to `open` immediately, bypassing `pending_approval`.
-2. **Invite** — The operator sends an invitation to a prospective seller. The seller completes registration using the invite link. The resulting account may still require approval depending on platform configuration.
-3. **Self-registration** — The seller registers through the public-facing registration flow. The account enters `pending_approval` status and waits for operator review.
+2. **Self-registration** — The seller registers through the public-facing registration flow. The account enters `pending_approval` status and waits for operator review.
## Business Rules Summary
diff --git a/docs/subscriptions.md b/docs/subscriptions.md
index 3c4f8df02..6a78c7e78 100644
--- a/docs/subscriptions.md
+++ b/docs/subscriptions.md
@@ -15,13 +15,15 @@ Toggling subscriptions off after they have been enabled **does not delete** exis
When subscriptions are enabled, the operator defines a **default plan** for each currency in which sellers operate. Each plan specifies:
-| Field | Description |
-|---|---|
-| `currency_code` | The currency this plan applies to (matches the seller's `currency_code`, unique per plan) |
-| `monthly_amount` | The recurring fee charged each billing cycle |
-| `free_months` | Number of initial months during which no charge is applied (default: 0) |
-| `requires_orders` | When enabled, billing only occurs for months in which the seller had at least one order |
-| `metadata` | Arbitrary JSON metadata |
+
+| Field | Description |
+| ----------------- | ----------------------------------------------------------------------------------------- |
+| `currency_code` | The currency this plan applies to (matches the seller's `currency_code`, unique per plan) |
+| `monthly_amount` | The recurring fee charged each billing cycle |
+| `free_months` | Number of initial months during which no charge is applied (default: 0) |
+| `requires_orders` | When enabled, billing only occurs for months in which the seller had at least one order |
+| `metadata` | Arbitrary JSON metadata |
+
### How the Default Plan Works
@@ -33,13 +35,15 @@ The `requires_orders` flag is designed for marketplaces that want to avoid charg
The operator can override subscription terms for **individual sellers**. An override is linked to a plan and identified by a `reference` / `reference_id` pair (e.g. referencing a specific seller). Each seller can have at most one override per plan. Override fields take precedence over the default plan when present:
-| Field | Description |
-|---|---|
-| `monthly_amount` | Custom recurring fee (nullable — when null, the plan's amount applies) |
-| `free_months` | Custom number of free initial months (nullable — when null, the plan's value applies) |
-| `free_from` | Start date of a temporary free period |
-| `free_to` | End date of a temporary free period |
-| `metadata` | Arbitrary JSON metadata |
+
+| Field | Description |
+| ---------------- | ------------------------------------------------------------------------------------- |
+| `monthly_amount` | Custom recurring fee (nullable — when null, the plan's amount applies) |
+| `free_months` | Custom number of free initial months (nullable — when null, the plan's value applies) |
+| `free_from` | Start date of a temporary free period |
+| `free_to` | End date of a temporary free period |
+| `metadata` | Arbitrary JSON metadata |
+
The `free_from` / `free_to` date range allows **time-bound fee waivers** independent of the initial free months. This is useful for granting temporary relief without permanently changing the seller's subscription terms.
@@ -61,12 +65,14 @@ If the start date falls on the 29th, 30th, or 31st, billing rolls to the last da
Subscription billing continues regardless of the seller's [account status](seller.md), with one exception:
-| Status | Billed? | Notes |
-|---|---|---|
-| `open` | Yes | Normal billing |
-| `suspended` | Yes | Seller is still occupying platform resources |
-| `pending_approval` | No | Billing begins only after approval |
-| `terminated` | No | Final invoice issued at termination; no further billing |
+
+| Status | Billed? | Notes |
+| ------------------ | ------- | ------------------------------------------------------- |
+| `open` | Yes | Normal billing |
+| `suspended` | Yes | Seller is still occupying platform resources |
+| `pending_approval` | No | Billing begins only after approval |
+| `terminated` | No | Final invoice issued at termination; no further billing |
+
Suspended sellers **continue to be billed**. This is intentional — suspension is a temporary measure, and the seller retains their catalog, data, and platform presence. If the operator does not wish to charge a suspended seller, they can apply a per-seller override.
@@ -76,18 +82,8 @@ If a seller's subscription payment fails, the unpaid amount carries forward as a
Persistent negative balances may be grounds for suspension or termination at the operator's discretion.
-## Taxes on Subscriptions
-
-In the current implementation, subscription fees support a **flat tax rate** or **zero tax**:
-
-- The operator configures a single tax rate that applies to all subscription invoices
-- Tax is calculated on the `monthly_amount` and included as a line item on the invoice
-- Per-region or per-category tax rules are not supported for subscriptions in this phase
-
-Future iterations may integrate with the platform's tax engine for more granular tax handling.
-
## Relationship to Other Concepts
- **Seller accounts** determine which default plan applies based on `currency_code` (see [Seller](seller.md))
-- **Billing access** in the vendor portal is controlled by the `payout_read` and `payout_write` permissions (see [Roles and Permissions](roles-and-permissions.md))
- Subscription status is independent of [member management](seller-members.md) — adding or removing members does not affect billing
+
diff --git a/packages/admin/src/i18n/translations/$schema.json b/packages/admin/src/i18n/translations/$schema.json
index 7af05a643..166a0a694 100644
--- a/packages/admin/src/i18n/translations/$schema.json
+++ b/packages/admin/src/i18n/translations/$schema.json
@@ -9219,6 +9219,12 @@
"currencyAlreadyAdded": {
"type": "string"
},
+ "logo": {
+ "type": "string"
+ },
+ "banner": {
+ "type": "string"
+ },
"edit": {
"type": "object",
"properties": {
@@ -9229,6 +9235,121 @@
"required": ["header"],
"additionalProperties": false
},
+ "address": {
+ "type": "object",
+ "properties": {
+ "header": { "type": "string" },
+ "edit": {
+ "type": "object",
+ "properties": {
+ "header": { "type": "string" },
+ "description": { "type": "string" },
+ "successToast": { "type": "string" }
+ },
+ "required": ["header", "description", "successToast"],
+ "additionalProperties": false
+ }
+ },
+ "required": ["header", "edit"],
+ "additionalProperties": false
+ },
+ "paymentDetails": {
+ "type": "object",
+ "properties": {
+ "header": { "type": "string" },
+ "edit": {
+ "type": "object",
+ "properties": {
+ "header": { "type": "string" },
+ "description": { "type": "string" },
+ "successToast": { "type": "string" }
+ },
+ "required": ["header", "description", "successToast"],
+ "additionalProperties": false
+ },
+ "fields": {
+ "type": "object",
+ "properties": {
+ "countryCode": { "type": "string" },
+ "holderName": { "type": "string" },
+ "bankName": { "type": "string" },
+ "iban": { "type": "string" },
+ "bic": { "type": "string" },
+ "routingNumber": { "type": "string" },
+ "accountNumber": { "type": "string" }
+ },
+ "required": ["countryCode", "holderName", "bankName", "iban", "bic", "routingNumber", "accountNumber"],
+ "additionalProperties": false
+ }
+ },
+ "required": ["header", "edit", "fields"],
+ "additionalProperties": false
+ },
+ "professionalDetails": {
+ "type": "object",
+ "properties": {
+ "header": { "type": "string" },
+ "edit": {
+ "type": "object",
+ "properties": {
+ "header": { "type": "string" },
+ "description": { "type": "string" },
+ "successToast": { "type": "string" }
+ },
+ "required": ["header", "description", "successToast"],
+ "additionalProperties": false
+ },
+ "fields": {
+ "type": "object",
+ "properties": {
+ "corporateName": { "type": "string" },
+ "registrationNumber": { "type": "string" },
+ "taxId": { "type": "string" }
+ },
+ "required": ["corporateName", "registrationNumber", "taxId"],
+ "additionalProperties": false
+ }
+ },
+ "required": ["header", "edit", "fields"],
+ "additionalProperties": false
+ },
+ "scheduledClosure": {
+ "type": "object",
+ "properties": {
+ "header": { "type": "string" },
+ "edit": {
+ "type": "object",
+ "properties": {
+ "header": { "type": "string" },
+ "description": { "type": "string" },
+ "successToast": { "type": "string" }
+ },
+ "required": ["header", "description", "successToast"],
+ "additionalProperties": false
+ },
+ "fields": {
+ "type": "object",
+ "properties": {
+ "closedFrom": { "type": "string" },
+ "closedTo": { "type": "string" },
+ "closedToHint": { "type": "string" }
+ },
+ "required": ["closedFrom", "closedTo", "closedToHint"],
+ "additionalProperties": false
+ }
+ },
+ "required": ["header", "edit", "fields"],
+ "additionalProperties": false
+ },
+ "subscription": {
+ "type": "object",
+ "properties": {
+ "header": { "type": "string" },
+ "month": { "type": "string" }
+ },
+ "required": ["header", "month"],
+ "additionalProperties": false
+ },
"toast": {
"type": "object",
"properties": {
@@ -9272,7 +9393,14 @@
"removeCurrencyWarning_one",
"removeCurrencyWarning_other",
"currencyAlreadyAdded",
+ "logo",
+ "banner",
"edit",
+ "address",
+ "paymentDetails",
+ "professionalDetails",
+ "scheduledClosure",
+ "subscription",
"toast"
],
"additionalProperties": false
diff --git a/packages/admin/src/i18n/translations/en.json b/packages/admin/src/i18n/translations/en.json
index 56ad9268b..b5c065105 100644
--- a/packages/admin/src/i18n/translations/en.json
+++ b/packages/admin/src/i18n/translations/en.json
@@ -2505,6 +2505,63 @@
"edit": {
"header": "Edit Store"
},
+ "logo": "Logo",
+ "banner": "Banner",
+ "address": {
+ "header": "Address",
+ "edit": {
+ "header": "Edit Address",
+ "description": "Update the address for this store.",
+ "successToast": "Address updated"
+ }
+ },
+ "paymentDetails": {
+ "header": "Payment Details",
+ "edit": {
+ "header": "Edit Payment Details",
+ "description": "Update the payment details for this store.",
+ "successToast": "Payment details updated"
+ },
+ "fields": {
+ "countryCode": "Country",
+ "holderName": "Account holder",
+ "bankName": "Bank name",
+ "iban": "IBAN",
+ "bic": "BIC / SWIFT",
+ "routingNumber": "Routing number",
+ "accountNumber": "Account number"
+ }
+ },
+ "professionalDetails": {
+ "header": "Company Details",
+ "edit": {
+ "header": "Edit Professional Details",
+ "description": "Update the professional details for this store.",
+ "successToast": "Professional details updated"
+ },
+ "fields": {
+ "corporateName": "Corporate name",
+ "registrationNumber": "Registration number",
+ "taxId": "Tax ID"
+ }
+ },
+ "scheduledClosure": {
+ "header": "Scheduled Closure",
+ "edit": {
+ "header": "Schedule Store Closure",
+ "description": "Configure the scheduled closure dates for this store.",
+ "successToast": "Scheduled closure updated"
+ },
+ "fields": {
+ "closedFrom": "Close from",
+ "closedTo": "Close until",
+ "closedToHint": "If empty, the store will remain closed indefinitely."
+ }
+ },
+ "subscription": {
+ "header": "Subscription Plan",
+ "month": "month"
+ },
"toast": {
"update": "Store successfully updated",
"currenciesUpdated": "Currencies updated successfully",
diff --git a/packages/admin/src/pages/stores/store-address-edit/components/store-address-edit-form.tsx b/packages/admin/src/pages/stores/store-address-edit/components/store-address-edit-form.tsx
index b808adf1a..b1cfda0d3 100644
--- a/packages/admin/src/pages/stores/store-address-edit/components/store-address-edit-form.tsx
+++ b/packages/admin/src/pages/stores/store-address-edit/components/store-address-edit-form.tsx
@@ -67,7 +67,7 @@ export const StoreAddressEditForm = ({
{
onSuccess: () => {
toast.success(
- t("store.address.edit.successToast", "Address updated"),
+ t("store.address.edit.successToast"),
);
handleSuccess();
},
diff --git a/packages/admin/src/pages/stores/store-address-edit/store-address-edit.tsx b/packages/admin/src/pages/stores/store-address-edit/store-address-edit.tsx
index 31f423a75..d2ef8bc93 100644
--- a/packages/admin/src/pages/stores/store-address-edit/store-address-edit.tsx
+++ b/packages/admin/src/pages/stores/store-address-edit/store-address-edit.tsx
@@ -21,14 +21,11 @@ export const StoreAddressEdit = () => {
<RouteDrawer.Header>
<RouteDrawer.Title asChild>
<Heading>
- {t("store.address.edit.header", "Edit Address")}
+ {t("store.address.edit.header")}
</Heading>
</RouteDrawer.Title>
<RouteDrawer.Description className="sr-only">
- {t(
- "store.address.edit.description",
- "Update the address for this store.",
- )}
+ {t("store.address.edit.description")}
</RouteDrawer.Description>
</RouteDrawer.Header>
{!isLoading && seller && <StoreAddressEditForm seller={seller} />}
diff --git a/packages/admin/src/pages/stores/store-closure-edit/components/store-closure-form.tsx b/packages/admin/src/pages/stores/store-closure-edit/components/store-closure-form.tsx
index 081003020..68fdd8da1 100644
--- a/packages/admin/src/pages/stores/store-closure-edit/components/store-closure-form.tsx
+++ b/packages/admin/src/pages/stores/store-closure-edit/components/store-closure-form.tsx
@@ -52,10 +52,7 @@ export const StoreClosureForm = ({ seller }: StoreClosureFormProps) => {
{
onSuccess: () => {
toast.success(
- t(
- "store.scheduledClosure.edit.successToast",
- "Scheduled closure updated",
- ),
+ t("store.scheduledClosure.edit.successToast"),
);
handleSuccess();
},
@@ -78,10 +75,7 @@ export const StoreClosureForm = ({ seller }: StoreClosureFormProps) => {
return (
<Form.Item>
<Form.Label>
- {t(
- "store.scheduledClosure.fields.closedFrom",
- "Close from",
- )}
+ {t("store.scheduledClosure.fields.closedFrom")}
</Form.Label>
<Form.Control>
<DatePicker
@@ -104,16 +98,10 @@ export const StoreClosureForm = ({ seller }: StoreClosureFormProps) => {
return (
<Form.Item>
<Form.Label optional>
- {t(
- "store.scheduledClosure.fields.closedTo",
- "Close until",
- )}
+ {t("store.scheduledClosure.fields.closedTo")}
</Form.Label>
<Form.Hint>
- {t(
- "store.scheduledClosure.fields.closedToHint",
- "If empty, the store will remain closed indefinitely.",
- )}
+ {t("store.scheduledClosure.fields.closedToHint")}
</Form.Hint>
<Form.Control>
<DatePicker
diff --git a/packages/admin/src/pages/stores/store-closure-edit/store-closure-edit.tsx b/packages/admin/src/pages/stores/store-closure-edit/store-closure-edit.tsx
index 2566ce0d1..884ff822c 100644
--- a/packages/admin/src/pages/stores/store-closure-edit/store-closure-edit.tsx
+++ b/packages/admin/src/pages/stores/store-closure-edit/store-closure-edit.tsx
@@ -21,17 +21,11 @@ export const StoreClosureEdit = () => {
<RouteDrawer.Header>
<RouteDrawer.Title asChild>
<Heading>
- {t(
- "store.scheduledClosure.edit.header",
- "Schedule Store Closure",
- )}
+ {t("store.scheduledClosure.edit.header")}
</Heading>
</RouteDrawer.Title>
<RouteDrawer.Description className="sr-only">
- {t(
- "store.scheduledClosure.edit.description",
- "Configure the scheduled closure dates for this store.",
- )}
+ {t("store.scheduledClosure.edit.description")}
</RouteDrawer.Description>
</RouteDrawer.Header>
{!isLoading && seller && <StoreClosureForm seller={seller} />}
diff --git a/packages/admin/src/pages/stores/store-details/components/store-address-section.tsx b/packages/admin/src/pages/stores/store-details/components/store-address-section.tsx
index e30240fb8..e24481616 100644
--- a/packages/admin/src/pages/stores/store-details/components/store-address-section.tsx
+++ b/packages/admin/src/pages/stores/store-details/components/store-address-section.tsx
@@ -34,7 +34,7 @@ export const StoreAddressSection = ({ seller }: StoreAddressSectionProps) => {
return (
<Container className="p-0">
<div className="flex items-center justify-between px-6 py-4">
- <Heading level="h2">{t("store.address.header", "Address")}</Heading>
+ <Heading level="h2">{t("store.address.header")}</Heading>
<ActionMenu
groups={[
{
diff --git a/packages/admin/src/pages/stores/store-details/components/store-company-details-section.tsx b/packages/admin/src/pages/stores/store-details/components/store-company-details-section.tsx
index 9288c9713..0757919f2 100644
--- a/packages/admin/src/pages/stores/store-details/components/store-company-details-section.tsx
+++ b/packages/admin/src/pages/stores/store-details/components/store-company-details-section.tsx
@@ -23,7 +23,7 @@ export const StoreCompanyDetailsSection = ({
<Container className="p-0">
<div className="flex items-center justify-between px-6 py-4">
<Heading level="h2">
- {t("store.professionalDetails.header", "Company Details")}
+ {t("store.professionalDetails.header")}
</Heading>
<ActionMenu
groups={[
diff --git a/packages/admin/src/pages/stores/store-details/components/store-configuration-section.tsx b/packages/admin/src/pages/stores/store-details/components/store-configuration-section.tsx
index 56a8744fb..4f2d4df89 100644
--- a/packages/admin/src/pages/stores/store-details/components/store-configuration-section.tsx
+++ b/packages/admin/src/pages/stores/store-details/components/store-configuration-section.tsx
@@ -22,7 +22,7 @@ export const StoreConfigurationSection = ({
<Container className="flex flex-col gap-y-4">
<div className="flex items-center justify-between">
<Heading level="h2">
- {t("store.scheduledClosure.header", "Scheduled Closure")}
+ {t("store.scheduledClosure.header")}
</Heading>
<ActionMenu
groups={[
diff --git a/packages/admin/src/pages/stores/store-details/components/store-payment-details-section.tsx b/packages/admin/src/pages/stores/store-details/components/store-payment-details-section.tsx
index a4cf936ff..ac4ed0de1 100644
--- a/packages/admin/src/pages/stores/store-details/components/store-payment-details-section.tsx
+++ b/packages/admin/src/pages/stores/store-details/components/store-payment-details-section.tsx
@@ -32,7 +32,7 @@ export const StorePaymentDetailsSection = ({
<Container className="p-0">
<div className="flex items-center justify-between px-6 py-4">
<Heading level="h2">
- {t("store.paymentDetails.header", "Payment Details")}
+ {t("store.paymentDetails.header")}
</Heading>
<ActionMenu
groups={[
diff --git a/packages/admin/src/pages/stores/store-details/components/store-subscription-section.tsx b/packages/admin/src/pages/stores/store-details/components/store-subscription-section.tsx
index b326de93d..67134ca03 100644
--- a/packages/admin/src/pages/stores/store-details/components/store-subscription-section.tsx
+++ b/packages/admin/src/pages/stores/store-details/components/store-subscription-section.tsx
@@ -44,7 +44,7 @@ export const StoreSubscriptionSection = ({
<Container className="p-0">
<div className="flex items-center justify-between px-6 py-4">
<Heading level="h2">
- {t("store.subscription.header", "Subscription Plan")}
+ {t("store.subscription.header")}
</Heading>
</div>
<div className="flex flex-col gap-2 px-2 pb-2">
@@ -66,7 +66,7 @@ export const StoreSubscriptionSection = ({
leading="compact"
className="text-ui-fg-subtle"
>
- {getStylizedAmount(effectiveAmount, plan.currency_code)}/{t("store.subscription.month", "month")}
+ {getStylizedAmount(effectiveAmount, plan.currency_code)}/{t("store.subscription.month")}
</Text>
</div>
<div className="flex size-7 items-center justify-center">
diff --git a/packages/admin/src/pages/stores/store-edit/components/store-edit-form.tsx b/packages/admin/src/pages/stores/store-edit/components/store-edit-form.tsx
index 47129db68..f0b09f302 100644
--- a/packages/admin/src/pages/stores/store-edit/components/store-edit-form.tsx
+++ b/packages/admin/src/pages/stores/store-edit/components/store-edit-form.tsx
@@ -293,7 +293,7 @@ export const StoreEditForm = ({ seller }: StoreEditFormProps) => {
return (
<Form.Item>
- <Form.Label optional>{t("store.logo", "Logo")}</Form.Label>
+ <Form.Label optional>{t("store.logo")}</Form.Label>
<Form.Control>
<FileUpload
uploadedImage={previewUrl}
@@ -322,7 +322,7 @@ export const StoreEditForm = ({ seller }: StoreEditFormProps) => {
return (
<Form.Item>
- <Form.Label optional>{t("store.banner", "Banner")}</Form.Label>
+ <Form.Label optional>{t("store.banner")}</Form.Label>
<Form.Control>
<FileUpload
uploadedImage={previewUrl}
diff --git a/packages/admin/src/pages/stores/store-payment-details-edit/components/store-payment-details-form.tsx b/packages/admin/src/pages/stores/store-payment-details-edit/components/store-payment-details-form.tsx
index ed59c1bbd..bec7d042f 100644
--- a/packages/admin/src/pages/stores/store-payment-details-edit/components/store-payment-details-form.tsx
+++ b/packages/admin/src/pages/stores/store-payment-details-edit/components/store-payment-details-form.tsx
@@ -67,10 +67,7 @@ export const StorePaymentDetailsForm = ({
{
onSuccess: () => {
toast.success(
- t(
- "store.paymentDetails.edit.successToast",
- "Payment details updated",
- ),
+ t("store.paymentDetails.edit.successToast"),
);
handleSuccess();
},
@@ -94,10 +91,7 @@ export const StorePaymentDetailsForm = ({
render={({ field: { onChange, ref: _ref, ...field } }) => (
<Form.Item>
<Form.Label>
- {t(
- "store.paymentDetails.fields.countryCode",
- "Country",
- )}
+ {t("store.paymentDetails.fields.countryCode")}
</Form.Label>
<Form.Control>
<CountrySelect {...field} onChange={onChange} />
@@ -112,10 +106,7 @@ export const StorePaymentDetailsForm = ({
render={({ field }) => (
<Form.Item>
<Form.Label>
- {t(
- "store.paymentDetails.fields.holderName",
- "Account holder",
- )}
+ {t("store.paymentDetails.fields.holderName")}
</Form.Label>
<Form.Control>
<Input size="small" {...field} />
@@ -130,7 +121,7 @@ export const StorePaymentDetailsForm = ({
render={({ field }) => (
<Form.Item>
<Form.Label optional>
- {t("store.paymentDetails.fields.bankName", "Bank name")}
+ {t("store.paymentDetails.fields.bankName")}
</Form.Label>
<Form.Control>
<Input size="small" {...field} />
@@ -149,7 +140,6 @@ export const StorePaymentDetailsForm = ({
<Form.Label optional>
{t(
"store.paymentDetails.fields.routingNumber",
- "Routing number",
)}
</Form.Label>
<Form.Control>
@@ -167,7 +157,6 @@ export const StorePaymentDetailsForm = ({
<Form.Label optional>
{t(
"store.paymentDetails.fields.accountNumber",
- "Account number",
)}
</Form.Label>
<Form.Control>
@@ -186,7 +175,7 @@ export const StorePaymentDetailsForm = ({
render={({ field }) => (
<Form.Item>
<Form.Label optional>
- {t("store.paymentDetails.fields.iban", "IBAN")}
+ {t("store.paymentDetails.fields.iban")}
</Form.Label>
<Form.Control>
<Input size="small" {...field} />
@@ -201,7 +190,7 @@ export const StorePaymentDetailsForm = ({
render={({ field }) => (
<Form.Item>
<Form.Label optional>
- {t("store.paymentDetails.fields.bic", "BIC / SWIFT")}
+ {t("store.paymentDetails.fields.bic")}
</Form.Label>
<Form.Control>
<Input size="small" {...field} />
diff --git a/packages/admin/src/pages/stores/store-payment-details-edit/store-payment-details-edit.tsx b/packages/admin/src/pages/stores/store-payment-details-edit/store-payment-details-edit.tsx
index c144f8799..a223ded58 100644
--- a/packages/admin/src/pages/stores/store-payment-details-edit/store-payment-details-edit.tsx
+++ b/packages/admin/src/pages/stores/store-payment-details-edit/store-payment-details-edit.tsx
@@ -21,14 +21,11 @@ export const StorePaymentDetailsEdit = () => {
<RouteDrawer.Header>
<RouteDrawer.Title asChild>
<Heading>
- {t("store.paymentDetails.edit.header", "Edit Payment Details")}
+ {t("store.paymentDetails.edit.header")}
</Heading>
</RouteDrawer.Title>
<RouteDrawer.Description className="sr-only">
- {t(
- "store.paymentDetails.edit.description",
- "Update the payment details for this store.",
- )}
+ {t("store.paymentDetails.edit.description")}
</RouteDrawer.Description>
</RouteDrawer.Header>
{!isLoading && seller && <StorePaymentDetailsForm seller={seller} />}
diff --git a/packages/admin/src/pages/stores/store-professional-details-edit/components/store-professional-details-form.tsx b/packages/admin/src/pages/stores/store-professional-details-edit/components/store-professional-details-form.tsx
index 9a14bdb9f..241862667 100644
--- a/packages/admin/src/pages/stores/store-professional-details-edit/components/store-professional-details-form.tsx
+++ b/packages/admin/src/pages/stores/store-professional-details-edit/components/store-professional-details-form.tsx
@@ -18,7 +18,7 @@ type StoreProfessionalDetailsFormProps = {
};
const StoreProfessionalDetailsSchema = zod.object({
- corporate_name: zod.string().min(1, "Corporate name is required"),
+ corporate_name: zod.string().optional().or(zod.literal("")),
registration_number: zod.string().optional().or(zod.literal("")),
tax_id: zod.string().optional().or(zod.literal("")),
});
@@ -46,17 +46,14 @@ export const StoreProfessionalDetailsForm = ({
const handleSubmit = form.handleSubmit(async (values) => {
await mutateAsync(
{
- corporate_name: values.corporate_name,
+ corporate_name: values.corporate_name || null,
registration_number: values.registration_number || null,
tax_id: values.tax_id || null,
},
{
onSuccess: () => {
toast.success(
- t(
- "store.professionalDetails.edit.successToast",
- "Professional details updated",
- ),
+ t("store.professionalDetails.edit.successToast"),
);
handleSuccess();
},
@@ -79,11 +76,8 @@ export const StoreProfessionalDetailsForm = ({
name="corporate_name"
render={({ field }) => (
<Form.Item>
- <Form.Label>
- {t(
- "store.professionalDetails.fields.corporateName",
- "Corporate name",
- )}
+ <Form.Label optional>
+ {t("store.professionalDetails.fields.corporateName")}
</Form.Label>
<Form.Control>
<Input size="small" {...field} />
@@ -98,10 +92,7 @@ export const StoreProfessionalDetailsForm = ({
render={({ field }) => (
<Form.Item>
<Form.Label optional>
- {t(
- "store.professionalDetails.fields.registrationNumber",
- "Registration number",
- )}
+ {t("store.professionalDetails.fields.registrationNumber")}
</Form.Label>
<Form.Control>
<Input size="small" {...field} />
@@ -116,7 +107,7 @@ export const StoreProfessionalDetailsForm = ({
render={({ field }) => (
<Form.Item>
<Form.Label optional>
- {t("store.professionalDetails.fields.taxId", "Tax ID")}
+ {t("store.professionalDetails.fields.taxId")}
</Form.Label>
<Form.Control>
<Input size="small" {...field} />
diff --git a/packages/admin/src/pages/stores/store-professional-details-edit/store-professional-details-edit.tsx b/packages/admin/src/pages/stores/store-professional-details-edit/store-professional-details-edit.tsx
index a87157682..2096341e0 100644
--- a/packages/admin/src/pages/stores/store-professional-details-edit/store-professional-details-edit.tsx
+++ b/packages/admin/src/pages/stores/store-professional-details-edit/store-professional-details-edit.tsx
@@ -21,17 +21,11 @@ export const StoreProfessionalDetailsEdit = () => {
<RouteDrawer.Header>
<RouteDrawer.Title asChild>
<Heading>
- {t(
- "store.professionalDetails.edit.header",
- "Edit Professional Details",
- )}
+ {t("store.professionalDetails.edit.header")}
</Heading>
</RouteDrawer.Title>
<RouteDrawer.Description className="sr-only">
- {t(
- "store.professionalDetails.edit.description",
- "Update the professional details for this store.",
- )}
+ {t("store.professionalDetails.edit.description")}
</RouteDrawer.Description>
</RouteDrawer.Header>
{!isLoading && seller && (
diff --git a/packages/core-plugin/src/api/vendor/sellers/route.ts b/packages/core-plugin/src/api/vendor/sellers/route.ts
index e15f14349..16a504106 100644
--- a/packages/core-plugin/src/api/vendor/sellers/route.ts
+++ b/packages/core-plugin/src/api/vendor/sellers/route.ts
@@ -53,7 +53,7 @@ export const POST = async (
const existingMemberId = req.auth_context?.actor_id
- if (!existingMemberId && !member_email) {
+ if (!existingMemberId) {
throw new MedusaError(
MedusaError.Types.INVALID_DATA,
"member_email is required when creating a new account"
diff --git a/packages/core-plugin/src/api/vendor/sellers/validators.ts b/packages/core-plugin/src/api/vendor/sellers/validators.ts
index 93aeae37d..e8f3bf2c5 100644
--- a/packages/core-plugin/src/api/vendor/sellers/validators.ts
+++ b/packages/core-plugin/src/api/vendor/sellers/validators.ts
@@ -18,7 +18,7 @@ export type VendorCreateSellerAccountType = z.infer<typeof VendorCreateSellerAcc
export const VendorCreateSellerAccount = z.object({
name: z.string(),
email: z.string().email(),
- member_email: z.string().email().optional(),
+ member_email: z.string().email(),
description: z.string().nullable().optional(),
currency_code: z.string(),
address: z
diff --git a/packages/dashboard-sdk/src/types.ts b/packages/dashboard-sdk/src/types.ts
index bf9ed4bc9..96bc3044c 100644
--- a/packages/dashboard-sdk/src/types.ts
+++ b/packages/dashboard-sdk/src/types.ts
@@ -34,6 +34,7 @@ export interface MercurConfig {
MainSidebar?: string
SettingsSidebar?: string
TopbarActions?: string
+ StoreSetup?: string
},
/** Internationalization settings. */
i18n?: {
diff --git a/packages/vendor/src/components/layout/shell/shell.tsx b/packages/vendor/src/components/layout/shell/shell.tsx
index 20f6f2f31..2b7de7a30 100644
--- a/packages/vendor/src/components/layout/shell/shell.tsx
+++ b/packages/vendor/src/components/layout/shell/shell.tsx
@@ -2,12 +2,13 @@ import { SidebarLeft, TriangleRightMini, XMark } from "@medusajs/icons"
import { IconButton, clx } from "@medusajs/ui"
import { AnimatePresence } from "motion/react"
import { Dialog as RadixDialog } from "radix-ui"
-import { PropsWithChildren, ReactNode, useEffect, useState } from "react"
+import React, { PropsWithChildren, ReactNode, useEffect, useState } from "react"
import { useTranslation } from "react-i18next"
import {
Link,
Outlet,
UIMatch,
+ useLocation,
useMatches,
useNavigation,
} from "react-router-dom"
@@ -16,6 +17,7 @@ import components from "virtual:mercur/components"
import { KeybindProvider } from "../../../providers/keybind-provider"
import { useGlobalShortcuts } from "../../../providers/keybind-provider/hooks"
import { useSidebar } from "../../../providers/sidebar-provider"
+import { useMe } from "../../../hooks/api"
import { ProgressBar } from "../../common/progress-bar"
export const Shell = ({ children }: PropsWithChildren) => {
@@ -43,6 +45,7 @@ export const Shell = ({ children }: PropsWithChildren) => {
)}
>
<Gutter>
+ <StoreSetupWidget />
<Outlet />
</Gutter>
</main>
@@ -263,3 +266,24 @@ const MobileSidebarContainer = ({ children }: PropsWithChildren) => {
</RadixDialog.Root>
)
}
+
+const isTopLevelRoute = (pathname: string) => {
+ const clean = pathname.replace(/\/$/, "")
+ const segments = clean.split("/").filter(Boolean)
+ return segments.length === 1 || clean === "/settings/store"
+}
+
+const StoreSetupWidget = () => {
+ const StoreSetup = components.StoreSetup as
+ | React.ComponentType<{ seller: any }>
+ | undefined
+ const { seller_member } = useMe()
+ const seller = seller_member?.seller
+ const location = useLocation()
+
+ if (!StoreSetup || !seller || !isTopLevelRoute(location.pathname)) {
+ return null
+ }
+
+ return <StoreSetup seller={seller} />
+}
diff --git a/packages/vendor/src/i18n/translations/$schema.json b/packages/vendor/src/i18n/translations/$schema.json
index bba340b4e..ef4bcac71 100644
--- a/packages/vendor/src/i18n/translations/$schema.json
+++ b/packages/vendor/src/i18n/translations/$schema.json
@@ -9592,6 +9592,63 @@
"currencyAlreadyAdded": {
"type": "string"
},
+ "status": {
+ "type": "object",
+ "properties": {
+ "active": { "type": "string" },
+ "pendingApproval": { "type": "string" },
+ "suspended": { "type": "string" },
+ "terminated": { "type": "string" }
+ },
+ "required": ["active", "pendingApproval", "suspended", "terminated"],
+ "additionalProperties": false
+ },
+ "alert": {
+ "type": "object",
+ "properties": {
+ "pendingApproval": {
+ "type": "object",
+ "properties": {
+ "title": { "type": "string" },
+ "description": { "type": "string" }
+ },
+ "required": ["title", "description"],
+ "additionalProperties": false
+ },
+ "suspended": {
+ "type": "object",
+ "properties": {
+ "title": { "type": "string" },
+ "description": { "type": "string" }
+ },
+ "required": ["title", "description"],
+ "additionalProperties": false
+ },
+ "terminated": {
+ "type": "object",
+ "properties": {
+ "title": { "type": "string" },
+ "description": { "type": "string" }
+ },
+ "required": ["title", "description"],
+ "additionalProperties": false
+ }
+ },
+ "required": ["pendingApproval", "suspended", "terminated"],
+ "additionalProperties": false
+ },
+ "company": {
+ "type": "string"
+ },
+ "manageCompanyDetails": {
+ "type": "string"
+ },
+ "logo": {
+ "type": "string"
+ },
+ "banner": {
+ "type": "string"
+ },
"edit": {
"type": "object",
"properties": {
@@ -9602,6 +9659,137 @@
"required": ["header"],
"additionalProperties": false
},
+ "editCompany": {
+ "type": "object",
+ "properties": {
+ "header": {
+ "type": "string"
+ }
+ },
+ "required": ["header"],
+ "additionalProperties": false
+ },
+ "address": {
+ "type": "object",
+ "properties": {
+ "header": { "type": "string" },
+ "edit": {
+ "type": "object",
+ "properties": {
+ "header": { "type": "string" },
+ "description": { "type": "string" },
+ "successToast": { "type": "string" }
+ },
+ "required": ["header", "description", "successToast"],
+ "additionalProperties": false
+ }
+ },
+ "required": ["header", "edit"],
+ "additionalProperties": false
+ },
+ "paymentDetails": {
+ "type": "object",
+ "properties": {
+ "header": { "type": "string" },
+ "edit": {
+ "type": "object",
+ "properties": {
+ "header": { "type": "string" },
+ "description": { "type": "string" },
+ "successToast": { "type": "string" }
+ },
+ "required": ["header", "description", "successToast"],
+ "additionalProperties": false
+ },
+ "fields": {
+ "type": "object",
+ "properties": {
+ "countryCode": { "type": "string" },
+ "holderName": { "type": "string" },
+ "bankName": { "type": "string" },
+ "iban": { "type": "string" },
+ "bic": { "type": "string" },
+ "routingNumber": { "type": "string" },
+ "accountNumber": { "type": "string" }
+ },
+ "required": ["countryCode", "holderName", "bankName", "iban", "bic", "routingNumber", "accountNumber"],
+ "additionalProperties": false
+ }
+ },
+ "required": ["header", "edit", "fields"],
+ "additionalProperties": false
+ },
+ "professionalDetails": {
+ "type": "object",
+ "properties": {
+ "header": { "type": "string" },
+ "edit": {
+ "type": "object",
+ "properties": {
+ "header": { "type": "string" },
+ "description": { "type": "string" },
+ "successToast": { "type": "string" }
+ },
+ "required": ["header", "description", "successToast"],
+ "additionalProperties": false
+ },
+ "fields": {
+ "type": "object",
+ "properties": {
+ "corporateName": { "type": "string" },
+ "registrationNumber": { "type": "string" },
+ "taxId": { "type": "string" }
+ },
+ "required": ["corporateName", "registrationNumber", "taxId"],
+ "additionalProperties": false
+ }
+ },
+ "required": ["header", "edit", "fields"],
+ "additionalProperties": false
+ },
+ "scheduledClosure": {
+ "type": "object",
+ "properties": {
+ "header": { "type": "string" },
+ "edit": {
+ "type": "object",
+ "properties": {
+ "header": { "type": "string" },
+ "description": { "type": "string" },
+ "successToast": { "type": "string" }
+ },
+ "required": ["header", "description", "successToast"],
+ "additionalProperties": false
+ },
+ "fields": {
+ "type": "object",
+ "properties": {
+ "closedFrom": { "type": "string" },
+ "closedTo": { "type": "string" },
+ "closedToHint": { "type": "string" }
+ },
+ "required": ["closedFrom", "closedTo", "closedToHint"],
+ "additionalProperties": false
+ }
+ },
+ "required": ["header", "edit", "fields"],
+ "additionalProperties": false
+ },
+ "subscription": {
+ "type": "object",
+ "properties": {
+ "header": { "type": "string" },
+ "noPlan": { "type": "string" },
+ "noPlanMessage": { "type": "string" },
+ "monthlyAmount": { "type": "string" },
+ "freeMonths": { "type": "string" },
+ "freePeriod": { "type": "string" },
+ "requiresOrders": { "type": "string" },
+ "month": { "type": "string" }
+ },
+ "required": ["header", "noPlan", "noPlanMessage", "monthlyAmount", "freeMonths", "freePeriod", "requiresOrders", "month"],
+ "additionalProperties": false
+ },
"toast": {
"type": "object",
"properties": {
@@ -9639,6 +9827,8 @@
"domain",
"manageYourStoresDetails",
"editStore",
+ "status",
+ "alert",
"defaultCurrency",
"defaultLocale",
"defaultRegion",
@@ -9658,7 +9848,17 @@
"removeLocaleWarning_other",
"currencyAlreadyAdded",
"localeAlreadyAdded",
+ "company",
+ "manageCompanyDetails",
+ "logo",
+ "banner",
"edit",
+ "editCompany",
+ "address",
+ "paymentDetails",
+ "professionalDetails",
+ "scheduledClosure",
+ "subscription",
"toast"
],
"additionalProperties": false
diff --git a/packages/vendor/src/i18n/translations/en.json b/packages/vendor/src/i18n/translations/en.json
index e54fd95f8..ff1c1ac48 100644
--- a/packages/vendor/src/i18n/translations/en.json
+++ b/packages/vendor/src/i18n/translations/en.json
@@ -2686,6 +2686,15 @@
"domain": "Seller",
"manageYourStoresDetails": "Manage your seller's details",
"editStore": "Edit seller",
+ "profileCompletion": {
+ "title": "Complete store profile",
+ "steps": {
+ "storeDetails": "Add store details",
+ "address": "Add address",
+ "companyDetails": "Add company details",
+ "paymentDetails": "Add payment details"
+ }
+ },
"status": {
"active": "Active",
"pendingApproval": "Pending approval",
@@ -2735,6 +2744,57 @@
"editCompany": {
"header": "Edit Company"
},
+ "address": {
+ "header": "Address",
+ "edit": {
+ "header": "Edit Address",
+ "description": "Update the address for your store.",
+ "successToast": "Address updated"
+ }
+ },
+ "paymentDetails": {
+ "header": "Payment Details",
+ "edit": {
+ "header": "Edit Payment Details",
+ "description": "Update the payment details for your store.",
+ "successToast": "Payment details updated"
+ },
+ "fields": {
+ "countryCode": "Country",
+ "holderName": "Account holder",
+ "bankName": "Bank name",
+ "iban": "IBAN",
+ "bic": "BIC / SWIFT",
+ "routingNumber": "Routing number",
+ "accountNumber": "Account number"
+ }
+ },
+ "professionalDetails": {
+ "header": "Company Details",
+ "edit": {
+ "header": "Edit Professional Details",
+ "description": "Update the professional details for your store.",
+ "successToast": "Professional details updated"
+ },
+ "fields": {
+ "corporateName": "Corporate name",
+ "registrationNumber": "Registration number",
+ "taxId": "Tax ID"
+ }
+ },
+ "scheduledClosure": {
+ "header": "Scheduled Closure",
+ "edit": {
+ "header": "Schedule Store Closure",
+ "description": "Configure the scheduled closure dates for your store.",
+ "successToast": "Scheduled closure updated"
+ },
+ "fields": {
+ "closedFrom": "Close from",
+ "closedTo": "Close until",
+ "closedToHint": "If empty, the store will remain closed indefinitely."
+ }
+ },
"subscription": {
"header": "Subscription",
"noPlan": "No subscription plan",
@@ -2742,7 +2802,8 @@
"monthlyAmount": "Monthly amount",
"freeMonths": "Free months",
"freePeriod": "Free period",
- "requiresOrders": "Requires orders"
+ "requiresOrders": "Requires orders",
+ "month": "month"
},
"toast": {
"update": "Store successfully updated",
diff --git a/packages/vendor/src/pages/settings/store/_components/store-address-section.tsx b/packages/vendor/src/pages/settings/store/_components/store-address-section.tsx
index aeffede7b..b4484d154 100644
--- a/packages/vendor/src/pages/settings/store/_components/store-address-section.tsx
+++ b/packages/vendor/src/pages/settings/store/_components/store-address-section.tsx
@@ -30,7 +30,7 @@ export const StoreAddressSection = ({ seller }: StoreAddressSectionProps) => {
return (
<Container className="p-0">
<div className="flex items-center justify-between px-6 py-4">
- <Heading level="h2">{t("store.address.header", "Address")}</Heading>
+ <Heading level="h2">{t("store.address.header")}</Heading>
<ActionMenu
groups={[
{
diff --git a/packages/vendor/src/pages/settings/store/_components/store-configuration-section.tsx b/packages/vendor/src/pages/settings/store/_components/store-configuration-section.tsx
index 15cddf4f2..4ad44eb41 100644
--- a/packages/vendor/src/pages/settings/store/_components/store-configuration-section.tsx
+++ b/packages/vendor/src/pages/settings/store/_components/store-configuration-section.tsx
@@ -19,7 +19,7 @@ export const StoreConfigurationSection = ({
<Container className="flex flex-col gap-y-4">
<div className="flex items-center justify-between">
<Heading level="h2">
- {t("store.scheduledClosure.header", "Scheduled Closure")}
+ {t("store.scheduledClosure.header")}
</Heading>
<ActionMenu
groups={[
diff --git a/packages/vendor/src/pages/settings/store/_components/store-payment-details-section.tsx b/packages/vendor/src/pages/settings/store/_components/store-payment-details-section.tsx
index 842d0e963..234537571 100644
--- a/packages/vendor/src/pages/settings/store/_components/store-payment-details-section.tsx
+++ b/packages/vendor/src/pages/settings/store/_components/store-payment-details-section.tsx
@@ -29,7 +29,7 @@ export const StorePaymentDetailsSection = ({
<Container className="p-0">
<div className="flex items-center justify-between px-6 py-4">
<Heading level="h2">
- {t("store.paymentDetails.header", "Payment Details")}
+ {t("store.paymentDetails.header")}
</Heading>
<ActionMenu
groups={[
diff --git a/packages/vendor/src/pages/settings/store/_components/store-professional-details-section.tsx b/packages/vendor/src/pages/settings/store/_components/store-professional-details-section.tsx
index 65820d0df..daebaf507 100644
--- a/packages/vendor/src/pages/settings/store/_components/store-professional-details-section.tsx
+++ b/packages/vendor/src/pages/settings/store/_components/store-professional-details-section.tsx
@@ -20,7 +20,7 @@ export const StoreProfessionalDetailsSection = ({
<Container className="p-0">
<div className="flex items-center justify-between px-6 py-4">
<Heading level="h2">
- {t("store.professionalDetails.header", "Company Details")}
+ {t("store.professionalDetails.header")}
</Heading>
<ActionMenu
groups={[
diff --git a/packages/vendor/src/pages/settings/store/_components/store-subscription-section.tsx b/packages/vendor/src/pages/settings/store/_components/store-subscription-section.tsx
index 01f3a705c..29200a124 100644
--- a/packages/vendor/src/pages/settings/store/_components/store-subscription-section.tsx
+++ b/packages/vendor/src/pages/settings/store/_components/store-subscription-section.tsx
@@ -49,7 +49,7 @@ export const StoreSubscriptionSection = ({
effectiveMonthlyAmount ?? 0,
subscription_plan.currency_code,
)}
- /{t("store.subscription.month", "month")}
+ /{t("store.subscription.month")}
</Text>
</div>
</div>
diff --git a/packages/vendor/src/pages/settings/store/address/index.tsx b/packages/vendor/src/pages/settings/store/address/index.tsx
index 23b01e6fc..dc04e1906 100644
--- a/packages/vendor/src/pages/settings/store/address/index.tsx
+++ b/packages/vendor/src/pages/settings/store/address/index.tsx
@@ -21,14 +21,11 @@ export const Component = () => {
<RouteDrawer.Header>
<RouteDrawer.Title asChild>
<Heading>
- {t("store.address.edit.header", "Edit Address")}
+ {t("store.address.edit.header")}
</Heading>
</RouteDrawer.Title>
<RouteDrawer.Description className="sr-only">
- {t(
- "store.address.edit.description",
- "Update the address for your store.",
- )}
+ {t("store.address.edit.description")}
</RouteDrawer.Description>
</RouteDrawer.Header>
{!isPending && seller && <StoreAddressForm seller={seller} />}
diff --git a/packages/vendor/src/pages/settings/store/address/store-address-form.tsx b/packages/vendor/src/pages/settings/store/address/store-address-form.tsx
index c8efe1299..c35b09ac5 100644
--- a/packages/vendor/src/pages/settings/store/address/store-address-form.tsx
+++ b/packages/vendor/src/pages/settings/store/address/store-address-form.tsx
@@ -62,7 +62,7 @@ export const StoreAddressForm = ({ seller }: StoreAddressFormProps) => {
{
onSuccess: () => {
toast.success(
- t("store.address.edit.successToast", "Address updated"),
+ t("store.address.edit.successToast"),
);
handleSuccess();
},
diff --git a/packages/vendor/src/pages/settings/store/payment-details/index.tsx b/packages/vendor/src/pages/settings/store/payment-details/index.tsx
index c14b69954..47f9ede12 100644
--- a/packages/vendor/src/pages/settings/store/payment-details/index.tsx
+++ b/packages/vendor/src/pages/settings/store/payment-details/index.tsx
@@ -21,14 +21,11 @@ export const Component = () => {
<RouteDrawer.Header>
<RouteDrawer.Title asChild>
<Heading>
- {t("store.paymentDetails.edit.header", "Edit Payment Details")}
+ {t("store.paymentDetails.edit.header")}
</Heading>
</RouteDrawer.Title>
<RouteDrawer.Description className="sr-only">
- {t(
- "store.paymentDetails.edit.description",
- "Update the payment details for your store.",
- )}
+ {t("store.paymentDetails.edit.description")}
</RouteDrawer.Description>
</RouteDrawer.Header>
{!isPending && seller && <StorePaymentDetailsForm seller={seller} />}
diff --git a/packages/vendor/src/pages/settings/store/payment-details/store-payment-details-form.tsx b/packages/vendor/src/pages/settings/store/payment-details/store-payment-details-form.tsx
index ae26b6af6..fb86814ce 100644
--- a/packages/vendor/src/pages/settings/store/payment-details/store-payment-details-form.tsx
+++ b/packages/vendor/src/pages/settings/store/payment-details/store-payment-details-form.tsx
@@ -64,10 +64,7 @@ export const StorePaymentDetailsForm = ({
{
onSuccess: () => {
toast.success(
- t(
- "store.paymentDetails.edit.successToast",
- "Payment details updated",
- ),
+ t("store.paymentDetails.edit.successToast"),
);
handleSuccess();
},
@@ -91,10 +88,7 @@ export const StorePaymentDetailsForm = ({
render={({ field: { onChange, ref: _ref, ...field } }) => (
<Form.Item>
<Form.Label>
- {t(
- "store.paymentDetails.fields.countryCode",
- "Country",
- )}
+ {t("store.paymentDetails.fields.countryCode")}
</Form.Label>
<Form.Control>
<CountrySelect {...field} onChange={onChange} />
@@ -109,10 +103,7 @@ export const StorePaymentDetailsForm = ({
render={({ field }) => (
<Form.Item>
<Form.Label>
- {t(
- "store.paymentDetails.fields.holderName",
- "Account holder",
- )}
+ {t("store.paymentDetails.fields.holderName")}
</Form.Label>
<Form.Control>
<Input size="small" {...field} />
@@ -127,7 +118,7 @@ export const StorePaymentDetailsForm = ({
render={({ field }) => (
<Form.Item>
<Form.Label optional>
- {t("store.paymentDetails.fields.bankName", "Bank name")}
+ {t("store.paymentDetails.fields.bankName")}
</Form.Label>
<Form.Control>
<Input size="small" {...field} />
@@ -144,10 +135,7 @@ export const StorePaymentDetailsForm = ({
render={({ field }) => (
<Form.Item>
<Form.Label optional>
- {t(
- "store.paymentDetails.fields.routingNumber",
- "Routing number",
- )}
+ {t("store.paymentDetails.fields.routingNumber")}
</Form.Label>
<Form.Control>
<Input size="small" {...field} />
@@ -162,10 +150,7 @@ export const StorePaymentDetailsForm = ({
render={({ field }) => (
<Form.Item>
<Form.Label optional>
- {t(
- "store.paymentDetails.fields.accountNumber",
- "Account number",
- )}
+ {t("store.paymentDetails.fields.accountNumber")}
</Form.Label>
<Form.Control>
<Input size="small" {...field} />
@@ -183,7 +168,7 @@ export const StorePaymentDetailsForm = ({
render={({ field }) => (
<Form.Item>
<Form.Label optional>
- {t("store.paymentDetails.fields.iban", "IBAN")}
+ {t("store.paymentDetails.fields.iban")}
</Form.Label>
<Form.Control>
<Input size="small" {...field} />
@@ -198,7 +183,7 @@ export const StorePaymentDetailsForm = ({
render={({ field }) => (
<Form.Item>
<Form.Label optional>
- {t("store.paymentDetails.fields.bic", "BIC / SWIFT")}
+ {t("store.paymentDetails.fields.bic")}
</Form.Label>
<Form.Control>
<Input size="small" {...field} />
diff --git a/packages/vendor/src/pages/settings/store/professional-details/index.tsx b/packages/vendor/src/pages/settings/store/professional-details/index.tsx
index 41f1a8d99..48e84d21b 100644
--- a/packages/vendor/src/pages/settings/store/professional-details/index.tsx
+++ b/packages/vendor/src/pages/settings/store/professional-details/index.tsx
@@ -21,17 +21,11 @@ export const Component = () => {
<RouteDrawer.Header>
<RouteDrawer.Title asChild>
<Heading>
- {t(
- "store.professionalDetails.edit.header",
- "Edit Professional Details",
- )}
+ {t("store.professionalDetails.edit.header")}
</Heading>
</RouteDrawer.Title>
<RouteDrawer.Description className="sr-only">
- {t(
- "store.professionalDetails.edit.description",
- "Update the professional details for your store.",
- )}
+ {t("store.professionalDetails.edit.description")}
</RouteDrawer.Description>
</RouteDrawer.Header>
{!isPending && seller && (
diff --git a/packages/vendor/src/pages/settings/store/professional-details/store-professional-details-form.tsx b/packages/vendor/src/pages/settings/store/professional-details/store-professional-details-form.tsx
index 86164bad5..cb13d5d4b 100644
--- a/packages/vendor/src/pages/settings/store/professional-details/store-professional-details-form.tsx
+++ b/packages/vendor/src/pages/settings/store/professional-details/store-professional-details-form.tsx
@@ -1,5 +1,5 @@
import { zodResolver } from "@hookform/resolvers/zod";
-import { Button, Input, Switch, toast } from "@medusajs/ui";
+import { Button, Input, toast } from "@medusajs/ui";
import { useForm } from "react-hook-form";
import { useTranslation } from "react-i18next";
import * as zod from "zod";
@@ -8,31 +8,17 @@ import { Form } from "@components/common/form";
import { RouteDrawer, useRouteModal } from "@components/modals";
import { KeyboundForm } from "@components/utilities/keybound-form";
import { HttpTypes } from "@mercurjs/types";
-import {
- useUpdateSellerProfessionalDetails,
- useDeleteSellerProfessionalDetails,
-} from "@hooks/api";
+import { useUpdateSellerProfessionalDetails } from "@hooks/api";
type StoreProfessionalDetailsFormProps = {
seller: HttpTypes.StoreSellerResponse["seller"];
};
-const StoreProfessionalDetailsSchema = zod
- .object({
- is_professional: zod.boolean(),
- corporate_name: zod.string().optional().or(zod.literal("")),
- registration_number: zod.string().optional().or(zod.literal("")),
- tax_id: zod.string().optional().or(zod.literal("")),
- })
- .refine(
- (data) =>
- !data.is_professional ||
- (data.corporate_name && data.corporate_name.length > 0),
- {
- message: "Corporate name is required for professional sellers",
- path: ["corporate_name"],
- },
- );
+const StoreProfessionalDetailsSchema = zod.object({
+ corporate_name: zod.string().optional().or(zod.literal("")),
+ registration_number: zod.string().optional().or(zod.literal("")),
+ tax_id: zod.string().optional().or(zod.literal("")),
+});
export const StoreProfessionalDetailsForm = ({
seller,
@@ -43,7 +29,6 @@ export const StoreProfessionalDetailsForm = ({
const form = useForm<zod.infer<typeof StoreProfessionalDetailsSchema>>({
defaultValues: {
- is_professional: !!details,
corporate_name: details?.corporate_name ?? "",
registration_number: details?.registration_number ?? "",
tax_id: details?.tax_id ?? "",
@@ -51,46 +36,21 @@ export const StoreProfessionalDetailsForm = ({
resolver: zodResolver(StoreProfessionalDetailsSchema),
});
- const isProfessional = form.watch("is_professional");
-
const { mutateAsync, isPending } = useUpdateSellerProfessionalDetails(
seller.id,
);
- const { mutateAsync: deleteProfessionalDetails, isPending: isDeleting } =
- useDeleteSellerProfessionalDetails(seller.id);
const handleSubmit = form.handleSubmit(async (values) => {
- if (!values.is_professional) {
- await deleteProfessionalDetails(undefined, {
- onSuccess: () => {
- toast.success(
- t(
- "store.professionalDetails.edit.successToast",
- "Professional details updated",
- ),
- );
- handleSuccess();
- },
- onError: (error: Error) => {
- toast.error(error.message);
- },
- });
- return;
- }
-
await mutateAsync(
{
- corporate_name: values.corporate_name,
+ corporate_name: values.corporate_name || null,
registration_number: values.registration_number || null,
tax_id: values.tax_id || null,
},
{
onSuccess: () => {
toast.success(
- t(
- "store.professionalDetails.edit.successToast",
- "Professional details updated",
- ),
+ t("store.professionalDetails.edit.successToast"),
);
handleSuccess();
},
@@ -110,91 +70,49 @@ export const StoreProfessionalDetailsForm = ({
<RouteDrawer.Body className="flex flex-col gap-y-4 overflow-y-auto">
<Form.Field
control={form.control}
- name="is_professional"
- render={({ field: { value, onChange, ...field } }) => (
+ name="corporate_name"
+ render={({ field }) => (
+ <Form.Item>
+ <Form.Label optional>
+ {t("store.professionalDetails.fields.corporateName")}
+ </Form.Label>
+ <Form.Control>
+ <Input size="small" {...field} />
+ </Form.Control>
+ <Form.ErrorMessage />
+ </Form.Item>
+ )}
+ />
+ <Form.Field
+ control={form.control}
+ name="registration_number"
+ render={({ field }) => (
+ <Form.Item>
+ <Form.Label optional>
+ {t("store.professionalDetails.fields.registrationNumber")}
+ </Form.Label>
+ <Form.Control>
+ <Input size="small" {...field} />
+ </Form.Control>
+ <Form.ErrorMessage />
+ </Form.Item>
+ )}
+ />
+ <Form.Field
+ control={form.control}
+ name="tax_id"
+ render={({ field }) => (
<Form.Item>
- <div className="flex items-center justify-between">
- <div className="flex flex-col">
- <Form.Label>
- {t(
- "store.professionalDetails.fields.isProfessional",
- "Professional seller",
- )}
- </Form.Label>
- <Form.Hint>
- {t(
- "store.professionalDetails.fields.isProfessionalDescription",
- "Register as a business entity",
- )}
- </Form.Hint>
- </div>
- <Form.Control>
- <Switch
- checked={value}
- onCheckedChange={onChange}
- {...field}
- />
- </Form.Control>
- </div>
+ <Form.Label optional>
+ {t("store.professionalDetails.fields.taxId")}
+ </Form.Label>
+ <Form.Control>
+ <Input size="small" {...field} />
+ </Form.Control>
<Form.ErrorMessage />
</Form.Item>
)}
/>
- {isProfessional && (
- <>
- <Form.Field
- control={form.control}
- name="corporate_name"
- render={({ field }) => (
- <Form.Item>
- <Form.Label>
- {t(
- "store.professionalDetails.fields.corporateName",
- "Corporate name",
- )}
- </Form.Label>
- <Form.Control>
- <Input size="small" {...field} />
- </Form.Control>
- <Form.ErrorMessage />
- </Form.Item>
- )}
- />
- <Form.Field
- control={form.control}
- name="registration_number"
- render={({ field }) => (
- <Form.Item>
- <Form.Label optional>
- {t(
- "store.professionalDetails.fields.registrationNumber",
- "Registration number",
- )}
- </Form.Label>
- <Form.Control>
- <Input size="small" {...field} />
- </Form.Control>
- <Form.ErrorMessage />
- </Form.Item>
- )}
- />
- <Form.Field
- control={form.control}
- name="tax_id"
- render={({ field }) => (
- <Form.Item>
- <Form.Label optional>
- {t("store.professionalDetails.fields.taxId", "Tax ID")}
- </Form.Label>
- <Form.Control>
- <Input size="small" {...field} />
- </Form.Control>
- <Form.ErrorMessage />
- </Form.Item>
- )}
- />
- </>
- )}
</RouteDrawer.Body>
<RouteDrawer.Footer>
<div className="flex items-center justify-end gap-x-2">
@@ -203,7 +121,7 @@ export const StoreProfessionalDetailsForm = ({
{t("actions.cancel")}
</Button>
</RouteDrawer.Close>
- <Button type="submit" size="small" isLoading={isPending || isDeleting}>
+ <Button type="submit" size="small" isLoading={isPending}>
{t("actions.save")}
</Button>
</div>
diff --git a/packages/vendor/src/pages/settings/store/store-closure/index.tsx b/packages/vendor/src/pages/settings/store/store-closure/index.tsx
index bc21a3a09..fe504730f 100644
--- a/packages/vendor/src/pages/settings/store/store-closure/index.tsx
+++ b/packages/vendor/src/pages/settings/store/store-closure/index.tsx
@@ -21,17 +21,11 @@ export const Component = () => {
<RouteDrawer.Header>
<RouteDrawer.Title asChild>
<Heading>
- {t(
- "store.scheduledClosure.edit.header",
- "Schedule Store Closure",
- )}
+ {t("store.scheduledClosure.edit.header")}
</Heading>
</RouteDrawer.Title>
<RouteDrawer.Description className="sr-only">
- {t(
- "store.scheduledClosure.edit.description",
- "Configure the scheduled closure dates for your store.",
- )}
+ {t("store.scheduledClosure.edit.description")}
</RouteDrawer.Description>
</RouteDrawer.Header>
{!isPending && seller && <StoreClosureForm seller={seller} />}
diff --git a/packages/vendor/src/pages/settings/store/store-closure/store-closure-form.tsx b/packages/vendor/src/pages/settings/store/store-closure/store-closure-form.tsx
index e11c7d16e..9cb28e95c 100644
--- a/packages/vendor/src/pages/settings/store/store-closure/store-closure-form.tsx
+++ b/packages/vendor/src/pages/settings/store/store-closure/store-closure-form.tsx
@@ -49,10 +49,7 @@ export const StoreClosureForm = ({ seller }: StoreClosureFormProps) => {
{
onSuccess: () => {
toast.success(
- t(
- "store.scheduledClosure.edit.successToast",
- "Scheduled closure updated",
- ),
+ t("store.scheduledClosure.edit.successToast"),
);
handleSuccess();
},
@@ -75,10 +72,7 @@ export const StoreClosureForm = ({ seller }: StoreClosureFormProps) => {
return (
<Form.Item>
<Form.Label>
- {t(
- "store.scheduledClosure.fields.closedFrom",
- "Close from",
- )}
+ {t("store.scheduledClosure.fields.closedFrom")}
</Form.Label>
<Form.Control>
<DatePicker
@@ -101,16 +95,10 @@ export const StoreClosureForm = ({ seller }: StoreClosureFormProps) => {
return (
<Form.Item>
<Form.Label optional>
- {t(
- "store.scheduledClosure.fields.closedTo",
- "Close until",
- )}
+ {t("store.scheduledClosure.fields.closedTo")}
</Form.Label>
<Form.Hint>
- {t(
- "store.scheduledClosure.fields.closedToHint",
- "If empty, the store will remain closed indefinitely.",
- )}
+ {t("store.scheduledClosure.fields.closedToHint")}
</Form.Hint>
<Form.Control>
<DatePicker
diff --git a/packages/vendor/src/pages/settings/store/store-detail-page.tsx b/packages/vendor/src/pages/settings/store/store-detail-page.tsx
index c5c3dce24..ed77340ed 100644
--- a/packages/vendor/src/pages/settings/store/store-detail-page.tsx
+++ b/packages/vendor/src/pages/settings/store/store-detail-page.tsx
@@ -79,6 +79,7 @@ const Root = ({ children }: { children?: ReactNode }) => {
</Text>
</Alert>
)}
+
<TwoColumnPage data={seller} hasOutlet>
{children}
</TwoColumnPage>
diff --git a/templates/basic/packages/api/medusa-config.ts b/templates/basic/packages/api/medusa-config.ts
index 3ceb46ba9..c4f023713 100644
--- a/templates/basic/packages/api/medusa-config.ts
+++ b/templates/basic/packages/api/medusa-config.ts
@@ -19,13 +19,19 @@ module.exports = defineConfig({
cookieSecret: process.env.COOKIE_SECRET || "supersecret",
}
},
+ featureFlags: {
+ rbac: true,
+ seller_registration: true
+ },
modules: [
+ {
+ resolve: "@medusajs/medusa/rbac",
+ },
{
resolve: '@mercurjs/core-plugin/modules/admin-ui',
options: {
appDir: path.join(__dirname, '../../apps/admin'),
path: '/dashboard',
- disable: false
} as DashboardModuleOptions
},
{
@@ -33,7 +39,6 @@ module.exports = defineConfig({
options: {
appDir: path.join(__dirname, '../../apps/vendor'),
path: '/seller',
- disable: false
} as DashboardModuleOptions
},
],