feat(tenancy): add merchant team CRUD with multi-store hub view
The merchant team page was read-only. Now merchant owners can invite, edit roles, and remove team members across all their stores from a single hub view. Architecture: No new models — delegates to existing store_team_service. Members are deduplicated across stores with per-store role badges. New: - 5 API endpoints: GET team (member-centric), GET store roles, POST invite (multi-store), PUT update role, DELETE remove member - merchant-team.js Alpine component with invite/edit/remove modals - Full CRUD template with stats cards, store filter, member table - 7 Pydantic schemas for merchant team request/response - 2 service methods: validate_store_ownership, get_merchant_team_members - 25 new i18n keys across 4 tenancy locales + 1 core common key Tests: 434 tenancy tests passing, arch-check green. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -12,20 +12,45 @@
|
||||
"team": "Team"
|
||||
},
|
||||
"team": {
|
||||
"title": "Team",
|
||||
"members": "Mitglieder",
|
||||
"actions": "Aktionen",
|
||||
"active": "Aktiv",
|
||||
"add_member": "Mitglied hinzufügen",
|
||||
"all_stores": "Alle Filialen",
|
||||
"edit_member": "Mitglied bearbeiten",
|
||||
"editor": "Bearbeiter",
|
||||
"email": "E-Mail",
|
||||
"email_placeholder": "E-Mail-Adresse eingeben",
|
||||
"error_title": "Fehler beim Laden des Teams",
|
||||
"first_name": "Vorname",
|
||||
"invite_first_member": "Laden Sie Ihr erstes Teammitglied ein",
|
||||
"invite_member": "Mitglied einladen",
|
||||
"invitation_accepted": "Einladung angenommen",
|
||||
"invitation_sent": "Einladung gesendet",
|
||||
"last_name": "Nachname",
|
||||
"loading_team": "Team wird geladen...",
|
||||
"manage_members_description": "Teammitglieder über alle Filialen verwalten",
|
||||
"manager": "Manager",
|
||||
"member": "Mitglied",
|
||||
"member_stores": "Filialen des Mitglieds",
|
||||
"members": "Mitglieder",
|
||||
"no_members_description": "Laden Sie Teammitglieder ein um Ihre Filialen zu verwalten",
|
||||
"no_members_title": "Noch keine Teammitglieder",
|
||||
"no_role": "Keine Rolle",
|
||||
"owner": "Inhaber",
|
||||
"pending_invitations": "Ausstehende Einladungen",
|
||||
"permissions": "Berechtigungen",
|
||||
"remove_confirmation": "Sind Sie sicher, dass Sie entfernen möchten",
|
||||
"remove_from_all_stores": "Aus allen Filialen entfernen",
|
||||
"remove_member": "Mitglied entfernen",
|
||||
"role": "Rolle",
|
||||
"owner": "Inhaber",
|
||||
"manager": "Manager",
|
||||
"editor": "Bearbeiter",
|
||||
"viewer": "Betrachter",
|
||||
"permissions": "Berechtigungen",
|
||||
"pending_invitations": "Ausstehende Einladungen",
|
||||
"invitation_sent": "Einladung gesendet",
|
||||
"invitation_accepted": "Einladung angenommen"
|
||||
"select_stores": "Filialen auswählen",
|
||||
"send_invitation": "Einladung senden",
|
||||
"status": "Status",
|
||||
"store_roles": "Filialrollen",
|
||||
"stores_and_roles": "Filialen & Rollen",
|
||||
"title": "Team",
|
||||
"total_members": "Mitglieder gesamt",
|
||||
"viewer": "Betrachter"
|
||||
},
|
||||
"messages": {
|
||||
"business_info_saved": "Business info saved",
|
||||
|
||||
@@ -12,20 +12,45 @@
|
||||
"team": "Team"
|
||||
},
|
||||
"team": {
|
||||
"title": "Team",
|
||||
"members": "Members",
|
||||
"actions": "Actions",
|
||||
"active": "Active",
|
||||
"add_member": "Add Member",
|
||||
"all_stores": "All Stores",
|
||||
"edit_member": "Edit Member",
|
||||
"editor": "Editor",
|
||||
"email": "Email",
|
||||
"email_placeholder": "Enter email address",
|
||||
"error_title": "Error loading team",
|
||||
"first_name": "First Name",
|
||||
"invite_first_member": "Invite your first team member",
|
||||
"invite_member": "Invite Member",
|
||||
"invitation_accepted": "Invitation Accepted",
|
||||
"invitation_sent": "Invitation Sent",
|
||||
"last_name": "Last Name",
|
||||
"loading_team": "Loading team...",
|
||||
"manage_members_description": "Manage team members across all your stores",
|
||||
"manager": "Manager",
|
||||
"member": "Member",
|
||||
"member_stores": "Member's stores",
|
||||
"members": "Members",
|
||||
"no_members_description": "Invite team members to help manage your stores",
|
||||
"no_members_title": "No team members yet",
|
||||
"no_role": "No role",
|
||||
"owner": "Owner",
|
||||
"pending_invitations": "Pending Invitations",
|
||||
"permissions": "Permissions",
|
||||
"remove_confirmation": "Are you sure you want to remove",
|
||||
"remove_from_all_stores": "Remove from all stores",
|
||||
"remove_member": "Remove Member",
|
||||
"role": "Role",
|
||||
"owner": "Owner",
|
||||
"manager": "Manager",
|
||||
"editor": "Editor",
|
||||
"viewer": "Viewer",
|
||||
"permissions": "Permissions",
|
||||
"pending_invitations": "Pending Invitations",
|
||||
"invitation_sent": "Invitation Sent",
|
||||
"invitation_accepted": "Invitation Accepted"
|
||||
"select_stores": "Select Stores",
|
||||
"send_invitation": "Send Invitation",
|
||||
"status": "Status",
|
||||
"store_roles": "Store Roles",
|
||||
"stores_and_roles": "Stores & Roles",
|
||||
"title": "Team",
|
||||
"total_members": "Total Members",
|
||||
"viewer": "Viewer"
|
||||
},
|
||||
"messages": {
|
||||
"business_info_saved": "Business info saved",
|
||||
|
||||
@@ -12,20 +12,45 @@
|
||||
"team": "Équipe"
|
||||
},
|
||||
"team": {
|
||||
"title": "Équipe",
|
||||
"members": "Membres",
|
||||
"actions": "Actions",
|
||||
"active": "Actifs",
|
||||
"add_member": "Ajouter un membre",
|
||||
"all_stores": "Tous les magasins",
|
||||
"edit_member": "Modifier le membre",
|
||||
"editor": "Éditeur",
|
||||
"email": "E-mail",
|
||||
"email_placeholder": "Saisir l'adresse e-mail",
|
||||
"error_title": "Erreur lors du chargement",
|
||||
"first_name": "Prénom",
|
||||
"invite_first_member": "Invitez votre premier membre",
|
||||
"invite_member": "Inviter un membre",
|
||||
"invitation_accepted": "Invitation acceptée",
|
||||
"invitation_sent": "Invitation envoyée",
|
||||
"last_name": "Nom de famille",
|
||||
"loading_team": "Chargement de l'équipe...",
|
||||
"manage_members_description": "Gérer les membres de l'équipe sur tous vos magasins",
|
||||
"manager": "Gestionnaire",
|
||||
"member": "Membre",
|
||||
"member_stores": "Magasins du membre",
|
||||
"members": "Membres",
|
||||
"no_members_description": "Invitez des membres pour gérer vos magasins",
|
||||
"no_members_title": "Aucun membre encore",
|
||||
"no_role": "Aucun rôle",
|
||||
"owner": "Propriétaire",
|
||||
"pending_invitations": "Invitations en attente",
|
||||
"permissions": "Permissions",
|
||||
"remove_confirmation": "Êtes-vous sûr de vouloir supprimer",
|
||||
"remove_from_all_stores": "Supprimer de tous les magasins",
|
||||
"remove_member": "Retirer un membre",
|
||||
"role": "Rôle",
|
||||
"owner": "Propriétaire",
|
||||
"manager": "Gestionnaire",
|
||||
"editor": "Éditeur",
|
||||
"viewer": "Lecteur",
|
||||
"permissions": "Permissions",
|
||||
"pending_invitations": "Invitations en attente",
|
||||
"invitation_sent": "Invitation envoyée",
|
||||
"invitation_accepted": "Invitation acceptée"
|
||||
"select_stores": "Sélectionner les magasins",
|
||||
"send_invitation": "Envoyer l'invitation",
|
||||
"status": "Statut",
|
||||
"store_roles": "Rôles par magasin",
|
||||
"stores_and_roles": "Magasins et rôles",
|
||||
"title": "Équipe",
|
||||
"total_members": "Membres totaux",
|
||||
"viewer": "Lecteur"
|
||||
},
|
||||
"messages": {
|
||||
"business_info_saved": "Business info saved",
|
||||
|
||||
@@ -12,20 +12,45 @@
|
||||
"team": "Team"
|
||||
},
|
||||
"team": {
|
||||
"title": "Team",
|
||||
"members": "Memberen",
|
||||
"actions": "Aktiounen",
|
||||
"active": "Aktiv",
|
||||
"add_member": "Member derbäisetzen",
|
||||
"all_stores": "All Geschäfter",
|
||||
"edit_member": "Member änneren",
|
||||
"editor": "Editeur",
|
||||
"email": "E-Mail",
|
||||
"email_placeholder": "E-Mail-Adress aginn",
|
||||
"error_title": "Feeler beim Lueden vum Team",
|
||||
"first_name": "Virnumm",
|
||||
"invite_first_member": "Invitéiert Äert éischt Teammember",
|
||||
"invite_member": "Member invitéieren",
|
||||
"invitation_accepted": "Invitatioun ugeholl",
|
||||
"invitation_sent": "Invitatioun geschéckt",
|
||||
"last_name": "Nonumm",
|
||||
"loading_team": "Team gëtt gelueden...",
|
||||
"manage_members_description": "Teammemberen iwwer all Geschäfter verwalten",
|
||||
"manager": "Manager",
|
||||
"member": "Member",
|
||||
"member_stores": "Geschäfter vum Member",
|
||||
"members": "Memberen",
|
||||
"no_members_description": "Invitéiert Teammemberen fir Är Geschäfter ze verwalten",
|
||||
"no_members_title": "Nach keng Teammemberen",
|
||||
"no_role": "Keng Roll",
|
||||
"owner": "Proprietär",
|
||||
"pending_invitations": "Aussteesend Invitatiounen",
|
||||
"permissions": "Rechter",
|
||||
"remove_confirmation": "Sidd Dir sécher, datt Dir ewechhuele wëllt",
|
||||
"remove_from_all_stores": "Vun all Geschäfter ewechhuelen",
|
||||
"remove_member": "Member ewechhuelen",
|
||||
"role": "Roll",
|
||||
"owner": "Proprietär",
|
||||
"manager": "Manager",
|
||||
"editor": "Editeur",
|
||||
"viewer": "Betruechter",
|
||||
"permissions": "Rechter",
|
||||
"pending_invitations": "Aussteesend Invitatiounen",
|
||||
"invitation_sent": "Invitatioun geschéckt",
|
||||
"invitation_accepted": "Invitatioun ugeholl"
|
||||
"select_stores": "Geschäfter wielen",
|
||||
"send_invitation": "Invitatioun schécken",
|
||||
"status": "Status",
|
||||
"store_roles": "Geschäftsrollen",
|
||||
"stores_and_roles": "Geschäfter & Rollen",
|
||||
"title": "Team",
|
||||
"total_members": "Memberen total",
|
||||
"viewer": "Betruechter"
|
||||
},
|
||||
"messages": {
|
||||
"business_info_saved": "Business info saved",
|
||||
|
||||
@@ -168,11 +168,127 @@ async def merchant_team_overview(
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""
|
||||
Get team members across all stores owned by the merchant.
|
||||
Get team members across all merchant stores (member-centric view).
|
||||
|
||||
Returns a list of stores with their team members grouped by store.
|
||||
Returns deduplicated members with per-store role info.
|
||||
"""
|
||||
return merchant_store_service.get_merchant_team_overview(db, merchant.id)
|
||||
return merchant_store_service.get_merchant_team_members(db, merchant.id)
|
||||
|
||||
|
||||
@_account_router.get("/team/stores/{store_id}/roles")
|
||||
async def merchant_team_store_roles(
|
||||
store_id: int,
|
||||
current_user: UserContext = Depends(get_current_merchant_api),
|
||||
merchant=Depends(get_merchant_for_current_user),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""Get available roles for a specific store."""
|
||||
from app.modules.tenancy.services.store_team_service import store_team_service
|
||||
|
||||
merchant_store_service.validate_store_ownership(db, merchant.id, store_id)
|
||||
roles = store_team_service.get_store_roles(db, store_id)
|
||||
return {"roles": roles, "total": len(roles)}
|
||||
|
||||
|
||||
@_account_router.post("/team/invite")
|
||||
async def merchant_team_invite(
|
||||
data: "MerchantTeamInvite",
|
||||
current_user: UserContext = Depends(get_current_merchant_api),
|
||||
merchant=Depends(get_merchant_for_current_user),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""Invite a member to one or more merchant stores."""
|
||||
from app.modules.tenancy.schemas.team import (
|
||||
MerchantTeamInviteResponse,
|
||||
MerchantTeamInviteResult,
|
||||
)
|
||||
from app.modules.tenancy.services.store_team_service import store_team_service
|
||||
|
||||
# Get the User ORM object (service needs it as inviter)
|
||||
inviter = merchant_store_service.get_user(db, current_user.id)
|
||||
|
||||
results = []
|
||||
for store_id in data.store_ids:
|
||||
try:
|
||||
store = merchant_store_service.validate_store_ownership(
|
||||
db, merchant.id, store_id
|
||||
)
|
||||
store_team_service.invite_team_member(
|
||||
db,
|
||||
store=store,
|
||||
inviter=inviter,
|
||||
email=data.email,
|
||||
role_name=data.role_name,
|
||||
)
|
||||
results.append(MerchantTeamInviteResult(
|
||||
store_id=store.id,
|
||||
store_name=store.name,
|
||||
success=True,
|
||||
))
|
||||
except Exception as e:
|
||||
results.append(MerchantTeamInviteResult(
|
||||
store_id=store_id,
|
||||
store_name=getattr(e, "store_name", str(store_id)),
|
||||
success=False,
|
||||
error=str(e),
|
||||
))
|
||||
|
||||
success_count = sum(1 for r in results if r.success)
|
||||
if success_count == len(results):
|
||||
message = f"Invitation sent to {data.email} for {success_count} store(s)"
|
||||
elif success_count > 0:
|
||||
message = f"Invitation partially sent ({success_count}/{len(results)} stores)"
|
||||
else:
|
||||
message = "Invitation failed for all stores"
|
||||
|
||||
return MerchantTeamInviteResponse(
|
||||
message=message,
|
||||
email=data.email,
|
||||
results=results,
|
||||
)
|
||||
|
||||
|
||||
@_account_router.put("/team/stores/{store_id}/members/{user_id}")
|
||||
async def merchant_team_update_role(
|
||||
store_id: int,
|
||||
user_id: int,
|
||||
role_name: str = Query(..., description="New role name"),
|
||||
current_user: UserContext = Depends(get_current_merchant_api),
|
||||
merchant=Depends(get_merchant_for_current_user),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""Update a member's role in a specific store."""
|
||||
from app.modules.tenancy.services.store_team_service import store_team_service
|
||||
|
||||
store = merchant_store_service.validate_store_ownership(db, merchant.id, store_id)
|
||||
store_team_service.update_member_role(
|
||||
db,
|
||||
store=store,
|
||||
user_id=user_id,
|
||||
new_role_name=role_name,
|
||||
actor_user_id=current_user.id,
|
||||
)
|
||||
return {"message": "Role updated successfully"}
|
||||
|
||||
|
||||
@_account_router.delete("/team/stores/{store_id}/members/{user_id}", status_code=204)
|
||||
async def merchant_team_remove_member(
|
||||
store_id: int,
|
||||
user_id: int,
|
||||
current_user: UserContext = Depends(get_current_merchant_api),
|
||||
merchant=Depends(get_merchant_for_current_user),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""Remove a member from a specific store."""
|
||||
from app.modules.tenancy.services.store_team_service import store_team_service
|
||||
|
||||
store = merchant_store_service.validate_store_ownership(db, merchant.id, store_id)
|
||||
store_team_service.remove_team_member(
|
||||
db,
|
||||
store=store,
|
||||
user_id=user_id,
|
||||
actor_user_id=current_user.id,
|
||||
)
|
||||
|
||||
|
||||
@_account_router.get("/profile", response_model=MerchantPortalProfileResponse)
|
||||
|
||||
@@ -118,6 +118,12 @@ from app.modules.tenancy.schemas.team import (
|
||||
InvitationAccept,
|
||||
InvitationAcceptResponse,
|
||||
InvitationResponse,
|
||||
MerchantTeamInvite,
|
||||
MerchantTeamInviteResponse,
|
||||
MerchantTeamMemberResponse,
|
||||
MerchantTeamMemberStoreInfo,
|
||||
MerchantTeamOverviewResponse,
|
||||
MerchantTeamStoreInfo,
|
||||
PermissionCheckRequest,
|
||||
PermissionCheckResponse,
|
||||
RoleBase,
|
||||
|
||||
@@ -315,3 +315,89 @@ class TeamErrorResponse(BaseModel):
|
||||
error_code: str
|
||||
message: str
|
||||
details: dict | None = None
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# Merchant Team Schemas (Hub View)
|
||||
# ============================================================================
|
||||
|
||||
|
||||
class MerchantTeamMemberStoreInfo(BaseModel):
|
||||
"""A member's role/status in one specific store."""
|
||||
|
||||
store_id: int
|
||||
store_name: str
|
||||
store_code: str
|
||||
role_name: str | None = None
|
||||
role_id: int | None = None
|
||||
is_active: bool = True
|
||||
is_pending: bool = False
|
||||
|
||||
|
||||
class MerchantTeamMemberResponse(BaseModel):
|
||||
"""A team member aggregated across all merchant stores."""
|
||||
|
||||
user_id: int
|
||||
email: EmailStr
|
||||
first_name: str | None = None
|
||||
last_name: str | None = None
|
||||
full_name: str
|
||||
stores: list[MerchantTeamMemberStoreInfo] = Field(default_factory=list)
|
||||
is_owner: bool = False
|
||||
|
||||
|
||||
class MerchantTeamStoreInfo(BaseModel):
|
||||
"""Compact store info for the merchant team overview."""
|
||||
|
||||
id: int
|
||||
name: str
|
||||
code: str
|
||||
|
||||
|
||||
class MerchantTeamOverviewResponse(BaseModel):
|
||||
"""Merchant team overview with member-centric view."""
|
||||
|
||||
merchant_name: str
|
||||
stores: list[MerchantTeamStoreInfo]
|
||||
members: list[MerchantTeamMemberResponse]
|
||||
total_members: int
|
||||
total_active: int
|
||||
total_pending: int
|
||||
|
||||
|
||||
class MerchantTeamInvite(BaseModel):
|
||||
"""Schema for inviting a member to merchant stores."""
|
||||
|
||||
email: EmailStr
|
||||
first_name: str | None = Field(None, max_length=100)
|
||||
last_name: str | None = Field(None, max_length=100)
|
||||
store_ids: list[int] = Field(..., min_length=1, description="Store IDs to invite to")
|
||||
role_name: str = Field("staff", description="Role name for all selected stores")
|
||||
|
||||
@field_validator("role_name")
|
||||
@classmethod
|
||||
def validate_role_name(cls, v):
|
||||
"""Validate role name is in allowed presets."""
|
||||
allowed_roles = ["manager", "staff", "support", "viewer", "marketing"]
|
||||
if v.lower() not in allowed_roles:
|
||||
raise ValueError(
|
||||
f"Role name must be one of: {', '.join(allowed_roles)}"
|
||||
)
|
||||
return v.lower()
|
||||
|
||||
|
||||
class MerchantTeamInviteResult(BaseModel):
|
||||
"""Per-store invite result."""
|
||||
|
||||
store_id: int
|
||||
store_name: str
|
||||
success: bool
|
||||
error: str | None = None
|
||||
|
||||
|
||||
class MerchantTeamInviteResponse(BaseModel):
|
||||
"""Response for merchant team invite (multi-store)."""
|
||||
|
||||
message: str
|
||||
email: EmailStr
|
||||
results: list[MerchantTeamInviteResult]
|
||||
|
||||
@@ -431,6 +431,119 @@ class MerchantStoreService:
|
||||
}
|
||||
|
||||
|
||||
def get_user(self, db: Session, user_id: int):
|
||||
"""Get a User ORM object by ID."""
|
||||
from app.modules.tenancy.models import User
|
||||
|
||||
return db.query(User).filter(User.id == user_id).first()
|
||||
|
||||
def validate_store_ownership(
|
||||
self, db: Session, merchant_id: int, store_id: int
|
||||
) -> Store:
|
||||
"""
|
||||
Validate that a store belongs to the merchant.
|
||||
|
||||
Returns the Store object if valid, raises exception otherwise.
|
||||
"""
|
||||
store = (
|
||||
db.query(Store)
|
||||
.filter(Store.id == store_id, Store.merchant_id == merchant_id)
|
||||
.first()
|
||||
)
|
||||
if not store:
|
||||
from app.modules.tenancy.exceptions import StoreNotFoundException
|
||||
|
||||
raise StoreNotFoundException(store_id, identifier_type="id")
|
||||
return store
|
||||
|
||||
def get_merchant_team_members(self, db: Session, merchant_id: int) -> dict:
|
||||
"""
|
||||
Get team members across all merchant stores in a member-centric view.
|
||||
|
||||
Deduplicates users across stores and aggregates per-store role info.
|
||||
"""
|
||||
from app.modules.tenancy.models.store import StoreUser
|
||||
|
||||
merchant = db.query(Merchant).filter(Merchant.id == merchant_id).first()
|
||||
if not merchant:
|
||||
raise MerchantNotFoundException(merchant_id)
|
||||
|
||||
stores = (
|
||||
db.query(Store)
|
||||
.filter(Store.merchant_id == merchant_id)
|
||||
.order_by(Store.name)
|
||||
.all()
|
||||
)
|
||||
|
||||
# Build member-centric view: keyed by user_id
|
||||
members_map: dict[int, dict] = {}
|
||||
store_list = []
|
||||
|
||||
for store in stores:
|
||||
store_list.append({
|
||||
"id": store.id,
|
||||
"name": store.name,
|
||||
"code": store.store_code,
|
||||
})
|
||||
|
||||
store_users = (
|
||||
db.query(StoreUser)
|
||||
.filter(StoreUser.store_id == store.id)
|
||||
.all()
|
||||
)
|
||||
|
||||
for su in store_users:
|
||||
user = su.user
|
||||
if not user:
|
||||
continue
|
||||
|
||||
uid = user.id
|
||||
is_pending = su.invitation_accepted_at is None and su.invitation_token is not None
|
||||
|
||||
if uid not in members_map:
|
||||
members_map[uid] = {
|
||||
"user_id": uid,
|
||||
"email": user.email,
|
||||
"first_name": user.first_name,
|
||||
"last_name": user.last_name,
|
||||
"full_name": f"{user.first_name or ''} {user.last_name or ''}".strip() or user.email,
|
||||
"stores": [],
|
||||
"is_owner": uid == merchant.owner_user_id,
|
||||
}
|
||||
|
||||
members_map[uid]["stores"].append({
|
||||
"store_id": store.id,
|
||||
"store_name": store.name,
|
||||
"store_code": store.store_code,
|
||||
"role_name": su.role.name if su.role else None,
|
||||
"role_id": su.role_id,
|
||||
"is_active": su.is_active,
|
||||
"is_pending": is_pending,
|
||||
})
|
||||
|
||||
members = list(members_map.values())
|
||||
# Owner first, then alphabetical
|
||||
members.sort(key=lambda m: (not m["is_owner"], m["full_name"].lower()))
|
||||
|
||||
total_active = sum(
|
||||
1 for m in members
|
||||
if any(s["is_active"] and not s["is_pending"] for s in m["stores"])
|
||||
)
|
||||
total_pending = sum(
|
||||
1 for m in members
|
||||
if any(s["is_pending"] for s in m["stores"])
|
||||
)
|
||||
|
||||
return {
|
||||
"merchant_name": merchant.name,
|
||||
"stores": store_list,
|
||||
"members": members,
|
||||
"total_members": len(members),
|
||||
"total_active": total_active,
|
||||
"total_pending": total_pending,
|
||||
}
|
||||
|
||||
|
||||
# Singleton instance
|
||||
merchant_store_service = MerchantStoreService()
|
||||
|
||||
|
||||
309
app/modules/tenancy/static/merchant/js/merchant-team.js
Normal file
309
app/modules/tenancy/static/merchant/js/merchant-team.js
Normal file
@@ -0,0 +1,309 @@
|
||||
// static/merchant/js/merchant-team.js
|
||||
/**
|
||||
* Merchant team management page logic
|
||||
* Manage team members across stores, invitations, and roles
|
||||
*/
|
||||
|
||||
const merchantTeamLog = window.LogConfig.createLogger('merchantTeam');
|
||||
|
||||
merchantTeamLog.info('Loading...');
|
||||
|
||||
function merchantTeam() {
|
||||
merchantTeamLog.info('merchantTeam() called');
|
||||
|
||||
return {
|
||||
// Inherit base layout state
|
||||
...data(),
|
||||
|
||||
// Set page identifier
|
||||
currentPage: 'team',
|
||||
|
||||
// Team data
|
||||
members: [],
|
||||
stores: [],
|
||||
stats: { total_members: 0, total_active: 0, total_pending: 0 },
|
||||
|
||||
// Loading states
|
||||
loading: false,
|
||||
error: null,
|
||||
saving: false,
|
||||
|
||||
// Filters
|
||||
storeFilter: '',
|
||||
|
||||
// Modal states
|
||||
showInviteModal: false,
|
||||
showEditModal: false,
|
||||
showRemoveModal: false,
|
||||
selectedMember: null,
|
||||
|
||||
// Invite form
|
||||
inviteForm: {
|
||||
email: '',
|
||||
first_name: '',
|
||||
last_name: '',
|
||||
store_ids: [],
|
||||
role_name: 'staff',
|
||||
},
|
||||
|
||||
// Role options (preset)
|
||||
roleOptions: [
|
||||
{ value: 'manager', label: 'Manager' },
|
||||
{ value: 'staff', label: 'Staff' },
|
||||
{ value: 'support', label: 'Support' },
|
||||
{ value: 'viewer', label: 'Viewer' },
|
||||
{ value: 'marketing', label: 'Marketing' },
|
||||
],
|
||||
|
||||
async init() {
|
||||
// Load i18n translations
|
||||
await I18n.loadModule('tenancy');
|
||||
|
||||
merchantTeamLog.info('Team init() called');
|
||||
|
||||
// Guard against multiple initialization
|
||||
if (window._merchantTeamInitialized) {
|
||||
merchantTeamLog.warn('Already initialized, skipping');
|
||||
return;
|
||||
}
|
||||
window._merchantTeamInitialized = true;
|
||||
|
||||
// Call parent init first
|
||||
const parentInit = data().init;
|
||||
if (parentInit) {
|
||||
await parentInit.call(this);
|
||||
}
|
||||
|
||||
// Load dynamic menu
|
||||
this.loadMenuConfig();
|
||||
|
||||
try {
|
||||
await this.loadTeamData();
|
||||
} catch (error) {
|
||||
merchantTeamLog.error('Init failed:', error);
|
||||
this.error = 'Failed to initialize team page';
|
||||
}
|
||||
|
||||
merchantTeamLog.info('Team initialization complete');
|
||||
},
|
||||
|
||||
/**
|
||||
* Load team data (members, stores, stats)
|
||||
*/
|
||||
async loadTeamData() {
|
||||
this.loading = true;
|
||||
this.error = null;
|
||||
|
||||
try {
|
||||
const response = await apiClient.get('/merchants/account/team');
|
||||
|
||||
this.members = response.members || [];
|
||||
this.stores = response.stores || [];
|
||||
this.stats = {
|
||||
total_members: response.total_members || 0,
|
||||
total_active: response.total_active || 0,
|
||||
total_pending: response.total_pending || 0,
|
||||
};
|
||||
|
||||
merchantTeamLog.info('Loaded team data:', this.members.length, 'members,', this.stores.length, 'stores');
|
||||
} catch (error) {
|
||||
merchantTeamLog.error('Failed to load team data:', error);
|
||||
this.error = error.message || 'Failed to load team data';
|
||||
} finally {
|
||||
this.loading = false;
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Filter members by store
|
||||
*/
|
||||
get filteredMembers() {
|
||||
if (!this.storeFilter) {
|
||||
return this.members;
|
||||
}
|
||||
const storeId = parseInt(this.storeFilter);
|
||||
return this.members.filter(member =>
|
||||
member.stores && member.stores.some(s => s.store_id === storeId)
|
||||
);
|
||||
},
|
||||
|
||||
/**
|
||||
* Open invite modal with reset form
|
||||
*/
|
||||
openInviteModal() {
|
||||
this.inviteForm = {
|
||||
email: '',
|
||||
first_name: '',
|
||||
last_name: '',
|
||||
store_ids: this.stores.map(s => s.id),
|
||||
role_name: 'staff',
|
||||
};
|
||||
this.showInviteModal = true;
|
||||
},
|
||||
|
||||
/**
|
||||
* Toggle store in invite form store_ids
|
||||
*/
|
||||
toggleStoreSelection(storeId) {
|
||||
const idx = this.inviteForm.store_ids.indexOf(storeId);
|
||||
if (idx > -1) {
|
||||
this.inviteForm.store_ids.splice(idx, 1);
|
||||
} else {
|
||||
this.inviteForm.store_ids.push(storeId);
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Send invitation
|
||||
*/
|
||||
async sendInvitation() {
|
||||
if (!this.inviteForm.email) {
|
||||
Utils.showToast(I18n.t('tenancy.messages.email_is_required'), 'error');
|
||||
return;
|
||||
}
|
||||
|
||||
if (this.inviteForm.store_ids.length === 0) {
|
||||
Utils.showToast(I18n.t('tenancy.messages.select_at_least_one_store'), 'error');
|
||||
return;
|
||||
}
|
||||
|
||||
this.saving = true;
|
||||
try {
|
||||
await apiClient.post('/merchants/account/team/invite', this.inviteForm);
|
||||
|
||||
Utils.showToast(I18n.t('tenancy.messages.invitation_sent_successfully'), 'success');
|
||||
merchantTeamLog.info('Invitation sent to:', this.inviteForm.email);
|
||||
|
||||
this.showInviteModal = false;
|
||||
await this.loadTeamData();
|
||||
} catch (error) {
|
||||
merchantTeamLog.error('Failed to send invitation:', error);
|
||||
Utils.showToast(error.message || 'Failed to send invitation', 'error');
|
||||
} finally {
|
||||
this.saving = false;
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Open edit modal for a member
|
||||
*/
|
||||
openEditModal(member) {
|
||||
this.selectedMember = JSON.parse(JSON.stringify(member));
|
||||
this.showEditModal = true;
|
||||
},
|
||||
|
||||
/**
|
||||
* Update member role for a specific store
|
||||
*/
|
||||
async updateMemberRole(storeId, userId, roleName) {
|
||||
this.saving = true;
|
||||
try {
|
||||
await apiClient.put(
|
||||
`/merchants/account/team/stores/${storeId}/members/${userId}?role_name=${encodeURIComponent(roleName)}`
|
||||
);
|
||||
|
||||
Utils.showToast(I18n.t('tenancy.messages.team_member_updated'), 'success');
|
||||
merchantTeamLog.info('Updated member role:', userId, 'store:', storeId, 'role:', roleName);
|
||||
|
||||
this.showEditModal = false;
|
||||
this.selectedMember = null;
|
||||
await this.loadTeamData();
|
||||
} catch (error) {
|
||||
merchantTeamLog.error('Failed to update member role:', error);
|
||||
Utils.showToast(error.message || 'Failed to update member role', 'error');
|
||||
} finally {
|
||||
this.saving = false;
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Open remove confirmation modal
|
||||
*/
|
||||
openRemoveModal(member) {
|
||||
this.selectedMember = JSON.parse(JSON.stringify(member));
|
||||
this.showRemoveModal = true;
|
||||
},
|
||||
|
||||
/**
|
||||
* Remove member from a specific store
|
||||
*/
|
||||
async removeMember(storeId, userId) {
|
||||
this.saving = true;
|
||||
try {
|
||||
await apiClient.delete(`/merchants/account/team/stores/${storeId}/members/${userId}`);
|
||||
|
||||
Utils.showToast(I18n.t('tenancy.messages.team_member_removed'), 'success');
|
||||
merchantTeamLog.info('Removed member:', userId, 'from store:', storeId);
|
||||
|
||||
this.showRemoveModal = false;
|
||||
this.selectedMember = null;
|
||||
await this.loadTeamData();
|
||||
} catch (error) {
|
||||
merchantTeamLog.error('Failed to remove member:', error);
|
||||
Utils.showToast(error.message || 'Failed to remove member', 'error');
|
||||
} finally {
|
||||
this.saving = false;
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Remove member from all stores
|
||||
*/
|
||||
async removeFromAllStores(member) {
|
||||
if (!member || !member.stores || member.stores.length === 0) return;
|
||||
|
||||
this.saving = true;
|
||||
try {
|
||||
for (const store of member.stores) {
|
||||
await apiClient.delete(
|
||||
`/merchants/account/team/stores/${store.store_id}/members/${member.user_id}`
|
||||
);
|
||||
}
|
||||
|
||||
Utils.showToast(I18n.t('tenancy.messages.team_member_removed'), 'success');
|
||||
merchantTeamLog.info('Removed member from all stores:', member.user_id);
|
||||
|
||||
this.showRemoveModal = false;
|
||||
this.selectedMember = null;
|
||||
await this.loadTeamData();
|
||||
} catch (error) {
|
||||
merchantTeamLog.error('Failed to remove member from all stores:', error);
|
||||
Utils.showToast(error.message || 'Failed to remove member', 'error');
|
||||
} finally {
|
||||
this.saving = false;
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Get initials for avatar display
|
||||
*/
|
||||
getInitials(member) {
|
||||
const first = member.first_name || member.email?.charAt(0) || '';
|
||||
const last = member.last_name || '';
|
||||
return (first.charAt(0) + last.charAt(0)).toUpperCase() || '?';
|
||||
},
|
||||
|
||||
/**
|
||||
* Get member status based on their store memberships
|
||||
*/
|
||||
getMemberStatus(member) {
|
||||
if (!member.stores || member.stores.length === 0) return 'inactive';
|
||||
if (member.stores.some(s => s.is_pending)) return 'pending';
|
||||
if (member.stores.some(s => s.is_active)) return 'active';
|
||||
return 'inactive';
|
||||
},
|
||||
|
||||
/**
|
||||
* Format date for display
|
||||
*/
|
||||
formatDate(dateStr) {
|
||||
if (!dateStr) return '-';
|
||||
const locale = window.STORE_CONFIG?.locale || 'en-GB';
|
||||
return new Date(dateStr).toLocaleDateString(locale, {
|
||||
year: 'numeric',
|
||||
month: 'short',
|
||||
day: 'numeric'
|
||||
});
|
||||
}
|
||||
};
|
||||
}
|
||||
@@ -1,140 +1,379 @@
|
||||
{# app/modules/tenancy/templates/tenancy/merchant/team.html #}
|
||||
{% extends "merchant/base.html" %}
|
||||
{% from 'shared/macros/headers.html' import page_header_flex %}
|
||||
{% from 'shared/macros/alerts.html' import loading_state, error_state %}
|
||||
{% from 'shared/macros/tables.html' import table_wrapper, table_header %}
|
||||
{% from 'shared/macros/modals.html' import modal, confirm_modal %}
|
||||
|
||||
{% block title %}{{ _("tenancy.team.title") }}{% endblock %}
|
||||
{% block title %}{{ _('tenancy.team.title') }}{% endblock %}
|
||||
{% block alpine_data %}merchantTeam(){% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div x-data="merchantTeam()">
|
||||
|
||||
<!-- Page Header -->
|
||||
<div class="mb-8">
|
||||
<div class="flex items-center justify-between">
|
||||
<!-- Header with Invite button -->
|
||||
{% call page_header_flex(title=_('tenancy.team.title'), subtitle=_('tenancy.team.manage_members_description')) %}
|
||||
<button @click="openInviteModal()"
|
||||
class="flex items-center px-4 py-2 text-sm font-medium leading-5 text-white transition-colors duration-150 bg-purple-600 border border-transparent rounded-lg hover:bg-purple-700 focus:outline-none focus:shadow-outline-purple">
|
||||
<span x-html="$icon('user-plus', 'w-4 h-4 mr-2')"></span>
|
||||
{{ _('tenancy.team.invite_member') }}
|
||||
</button>
|
||||
{% endcall %}
|
||||
|
||||
<!-- Loading State -->
|
||||
{{ loading_state(_('tenancy.team.loading_team'), 'loading') }}
|
||||
|
||||
<!-- Error State -->
|
||||
{{ error_state(_('tenancy.team.error_title'), 'error', 'error && !loading') }}
|
||||
|
||||
<!-- Main Content (visible when not loading) -->
|
||||
<div x-show="!loading" x-cloak>
|
||||
|
||||
<!-- Stats Cards -->
|
||||
<div class="grid grid-cols-1 md:grid-cols-3 gap-4 mb-6">
|
||||
<!-- Total Members -->
|
||||
<div class="flex items-center p-4 bg-white dark:bg-gray-800 rounded-lg shadow-xs border border-gray-200 dark:border-gray-700">
|
||||
<div class="p-3 mr-4 text-purple-500 bg-purple-100 rounded-full dark:text-purple-100 dark:bg-purple-500">
|
||||
<span x-html="$icon('users', 'w-5 h-5')"></span>
|
||||
</div>
|
||||
<div>
|
||||
<h2 class="text-2xl font-bold text-gray-900 dark:text-white">{{ _("tenancy.team.title") }}</h2>
|
||||
<p class="mt-1 text-sm text-gray-500 dark:text-gray-400">
|
||||
{{ _("tenancy.team.members") }}
|
||||
<span x-show="data" class="font-medium" x-text="`(${data?.total_members || 0})`"></span>
|
||||
</p>
|
||||
<p class="mb-1 text-sm font-medium text-gray-600 dark:text-gray-400">{{ _('tenancy.team.total_members') }}</p>
|
||||
<p class="text-lg font-semibold text-gray-700 dark:text-gray-200" x-text="stats.total_members"></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Active -->
|
||||
<div class="flex items-center p-4 bg-white dark:bg-gray-800 rounded-lg shadow-xs border border-gray-200 dark:border-gray-700">
|
||||
<div class="p-3 mr-4 text-green-500 bg-green-100 rounded-full dark:text-green-100 dark:bg-green-500">
|
||||
<span x-html="$icon('check-circle', 'w-5 h-5')"></span>
|
||||
</div>
|
||||
<div>
|
||||
<p class="mb-1 text-sm font-medium text-gray-600 dark:text-gray-400">{{ _('tenancy.team.active') }}</p>
|
||||
<p class="text-lg font-semibold text-gray-700 dark:text-gray-200" x-text="stats.total_active"></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Pending -->
|
||||
<div class="flex items-center p-4 bg-white dark:bg-gray-800 rounded-lg shadow-xs border border-gray-200 dark:border-gray-700">
|
||||
<div class="p-3 mr-4 text-orange-500 bg-orange-100 rounded-full dark:text-orange-100 dark:bg-orange-500">
|
||||
<span x-html="$icon('clock', 'w-5 h-5')"></span>
|
||||
</div>
|
||||
<div>
|
||||
<p class="mb-1 text-sm font-medium text-gray-600 dark:text-gray-400">{{ _('tenancy.team.pending_invitations') }}</p>
|
||||
<p class="text-lg font-semibold text-gray-700 dark:text-gray-200" x-text="stats.total_pending"></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Error -->
|
||||
<div x-show="error" x-cloak class="mb-6 p-4 bg-red-50 dark:bg-red-900/20 border border-red-200 dark:border-red-800 rounded-lg">
|
||||
<p class="text-sm text-red-800 dark:text-red-200" x-text="error"></p>
|
||||
<!-- Store Filter -->
|
||||
<div class="mb-4" x-show="stores.length > 1">
|
||||
<select x-model="storeFilter"
|
||||
class="px-3 py-2 text-sm text-gray-700 dark:text-gray-300 bg-white dark:bg-gray-800 border border-gray-300 dark:border-gray-600 rounded-lg focus:border-purple-400 focus:outline-none focus:ring focus:ring-purple-300 dark:focus:ring-purple-600">
|
||||
<option value="">{{ _('tenancy.team.all_stores') }}</option>
|
||||
<template x-for="store in stores" :key="store.id">
|
||||
<option :value="store.id" x-text="store.name"></option>
|
||||
</template>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<!-- Loading -->
|
||||
<div x-show="loading" class="text-center py-12 text-gray-500 dark:text-gray-400">
|
||||
<svg class="inline w-6 h-6 animate-spin mr-2" fill="none" viewBox="0 0 24 24">
|
||||
<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
|
||||
<path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4z"></path>
|
||||
</svg>
|
||||
{{ _("common.loading") }}
|
||||
<!-- Members Table -->
|
||||
<div x-show="filteredMembers.length > 0">
|
||||
{% call table_wrapper() %}
|
||||
{{ table_header([_('tenancy.team.member'), _('tenancy.team.stores_and_roles'), _('tenancy.team.status'), _('tenancy.team.actions')]) }}
|
||||
<tbody class="bg-white divide-y dark:divide-gray-700 dark:bg-gray-800">
|
||||
<template x-for="member in filteredMembers" :key="member.user_id">
|
||||
<tr class="text-gray-700 dark:text-gray-400 hover:bg-gray-50 dark:hover:bg-gray-700">
|
||||
<!-- Member: Avatar + Name + Email -->
|
||||
<td class="px-4 py-3">
|
||||
<div class="flex items-center text-sm">
|
||||
<div class="relative w-8 h-8 mr-3 rounded-full flex-shrink-0">
|
||||
<div class="flex items-center justify-center w-full h-full rounded-full"
|
||||
:class="getMemberStatus(member) === 'active' ? 'bg-purple-100 dark:bg-purple-900 text-purple-600 dark:text-purple-300' : 'bg-gray-200 dark:bg-gray-700 text-gray-500 dark:text-gray-400'">
|
||||
<span class="text-xs font-semibold" x-text="getInitials(member)"></span>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<p class="font-semibold text-gray-800 dark:text-gray-200">
|
||||
<span x-text="member.first_name || ''"></span>
|
||||
<span x-text="member.last_name || ''"></span>
|
||||
<span x-show="!member.first_name && !member.last_name" x-text="member.email"></span>
|
||||
</p>
|
||||
<p class="text-xs text-gray-600 dark:text-gray-400" x-text="member.email"
|
||||
x-show="member.first_name || member.last_name"></p>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
|
||||
<!-- Stores & Roles -->
|
||||
<td class="px-4 py-3">
|
||||
<div class="flex flex-wrap gap-1">
|
||||
<template x-for="store in member.stores" :key="store.store_id">
|
||||
<span class="px-2 py-1 text-xs rounded-full bg-gray-100 dark:bg-gray-700 text-gray-700 dark:text-gray-300">
|
||||
<span class="font-medium" x-text="store.store_name"></span>:
|
||||
<span x-text="store.role_name || '{{ _('tenancy.team.no_role') }}'"></span>
|
||||
</span>
|
||||
</template>
|
||||
</div>
|
||||
</td>
|
||||
|
||||
<!-- Status -->
|
||||
<td class="px-4 py-3 text-sm">
|
||||
<template x-if="member.is_owner">
|
||||
<span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-purple-100 text-purple-800 dark:bg-purple-900 dark:text-purple-200">
|
||||
<span x-html="$icon('shield-check', 'w-3 h-3 mr-1')"></span>
|
||||
{{ _('tenancy.team.owner') }}
|
||||
</span>
|
||||
</template>
|
||||
<template x-if="!member.is_owner && getMemberStatus(member) === 'pending'">
|
||||
<span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-orange-100 text-orange-800 dark:bg-orange-900 dark:text-orange-200">
|
||||
{{ _('common.pending') }}
|
||||
</span>
|
||||
</template>
|
||||
<template x-if="!member.is_owner && getMemberStatus(member) === 'active'">
|
||||
<span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200">
|
||||
{{ _('common.active') }}
|
||||
</span>
|
||||
</template>
|
||||
<template x-if="!member.is_owner && getMemberStatus(member) === 'inactive'">
|
||||
<span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-gray-100 text-gray-800 dark:bg-gray-700 dark:text-gray-200">
|
||||
{{ _('common.inactive') }}
|
||||
</span>
|
||||
</template>
|
||||
</td>
|
||||
|
||||
<!-- Actions -->
|
||||
<td class="px-4 py-3 text-sm">
|
||||
<template x-if="member.is_owner">
|
||||
<span class="inline-flex items-center px-2 py-1 text-xs text-purple-600 dark:text-purple-400">
|
||||
<span x-html="$icon('shield-check', 'w-4 h-4')"></span>
|
||||
</span>
|
||||
</template>
|
||||
<template x-if="!member.is_owner">
|
||||
<div class="flex items-center gap-2">
|
||||
<button @click="openEditModal(member)"
|
||||
class="p-1.5 text-gray-500 hover:text-purple-600 dark:text-gray-400 dark:hover:text-purple-400 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-lg transition-colors"
|
||||
:title="$t('tenancy.team.edit_member')">
|
||||
<span x-html="$icon('pencil', 'w-4 h-4')"></span>
|
||||
</button>
|
||||
<button @click="openRemoveModal(member)"
|
||||
class="p-1.5 text-gray-500 hover:text-red-600 dark:text-gray-400 dark:hover:text-red-400 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-lg transition-colors"
|
||||
:title="$t('tenancy.team.remove_member')">
|
||||
<span x-html="$icon('trash', 'w-4 h-4')"></span>
|
||||
</button>
|
||||
</div>
|
||||
</template>
|
||||
</td>
|
||||
</tr>
|
||||
</template>
|
||||
</tbody>
|
||||
{% endcall %}
|
||||
</div>
|
||||
|
||||
<!-- Store Teams -->
|
||||
<div x-show="!loading && data" x-cloak class="space-y-6">
|
||||
<template x-for="store in data?.stores || []" :key="store.store_id">
|
||||
<div class="bg-white dark:bg-gray-800 rounded-lg shadow-xs border border-gray-200 dark:border-gray-700 overflow-hidden">
|
||||
<!-- Store Header -->
|
||||
<div class="px-6 py-4 border-b border-gray-200 dark:border-gray-700 flex items-center justify-between">
|
||||
<div class="flex items-center gap-3">
|
||||
<span x-html="$icon('shopping-bag', 'w-5 h-5 text-gray-400')"></span>
|
||||
<div>
|
||||
<h3 class="text-lg font-semibold text-gray-900 dark:text-white" x-text="store.store_name"></h3>
|
||||
<p class="text-xs text-gray-400 font-mono" x-text="store.store_code"></p>
|
||||
</div>
|
||||
<span class="px-2 py-0.5 text-xs font-medium rounded-full"
|
||||
:class="store.is_active ? 'bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200' : 'bg-gray-100 text-gray-600 dark:bg-gray-700 dark:text-gray-400'"
|
||||
x-text="store.is_active ? '{{ _("common.active") }}' : '{{ _("common.inactive") }}'">
|
||||
</span>
|
||||
<!-- Empty State -->
|
||||
<div x-show="!loading && filteredMembers.length === 0" x-cloak
|
||||
class="text-center py-12 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700">
|
||||
<span x-html="$icon('user-group', 'w-12 h-12 text-gray-300 dark:text-gray-600 mx-auto')"></span>
|
||||
<h3 class="mt-4 text-sm font-medium text-gray-900 dark:text-gray-200">{{ _('tenancy.team.no_members_title') }}</h3>
|
||||
<p class="mt-1 text-sm text-gray-500 dark:text-gray-400">{{ _('tenancy.team.no_members_description') }}</p>
|
||||
<button @click="openInviteModal()"
|
||||
class="mt-4 inline-flex items-center px-4 py-2 text-sm font-medium text-white bg-purple-600 border border-transparent rounded-lg hover:bg-purple-700 focus:outline-none focus:shadow-outline-purple">
|
||||
<span x-html="$icon('user-plus', 'w-4 h-4 mr-2')"></span>
|
||||
{{ _('tenancy.team.invite_first_member') }}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<!-- ==================== INVITE MODAL ==================== -->
|
||||
{% call modal('inviteModal', _('tenancy.team.invite_member'), 'showInviteModal', size='md', show_footer=false) %}
|
||||
<form @submit.prevent="sendInvitation()" class="space-y-4">
|
||||
<!-- Email -->
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
|
||||
{{ _('tenancy.team.email') }} <span class="text-red-500">*</span>
|
||||
</label>
|
||||
<input type="email" x-model="inviteForm.email" required
|
||||
class="w-full px-3 py-2 text-sm text-gray-700 dark:text-gray-300 bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-lg focus:border-purple-400 focus:outline-none focus:ring focus:ring-purple-300 dark:focus:ring-purple-600"
|
||||
placeholder="{{ _('tenancy.team.email_placeholder') }}">
|
||||
</div>
|
||||
|
||||
<!-- First Name / Last Name -->
|
||||
<div class="grid grid-cols-2 gap-4">
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
|
||||
{{ _('tenancy.team.first_name') }}
|
||||
</label>
|
||||
<input type="text" x-model="inviteForm.first_name"
|
||||
class="w-full px-3 py-2 text-sm text-gray-700 dark:text-gray-300 bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-lg focus:border-purple-400 focus:outline-none focus:ring focus:ring-purple-300 dark:focus:ring-purple-600"
|
||||
placeholder="{{ _('tenancy.team.first_name') }}">
|
||||
</div>
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
|
||||
{{ _('tenancy.team.last_name') }}
|
||||
</label>
|
||||
<input type="text" x-model="inviteForm.last_name"
|
||||
class="w-full px-3 py-2 text-sm text-gray-700 dark:text-gray-300 bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-lg focus:border-purple-400 focus:outline-none focus:ring focus:ring-purple-300 dark:focus:ring-purple-600"
|
||||
placeholder="{{ _('tenancy.team.last_name') }}">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Store Selection -->
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
|
||||
{{ _('tenancy.team.select_stores') }}
|
||||
</label>
|
||||
<div class="space-y-2 max-h-40 overflow-y-auto border border-gray-200 dark:border-gray-600 rounded-lg p-3">
|
||||
<template x-for="store in stores" :key="store.id">
|
||||
<label class="flex items-center gap-2 cursor-pointer">
|
||||
<input type="checkbox"
|
||||
:value="store.id"
|
||||
:checked="inviteForm.store_ids.includes(store.id)"
|
||||
@change="toggleStoreSelection(store.id)"
|
||||
class="w-4 h-4 text-purple-600 border-gray-300 rounded focus:ring-purple-500 dark:border-gray-600 dark:bg-gray-700">
|
||||
<span class="text-sm text-gray-700 dark:text-gray-300" x-text="store.name"></span>
|
||||
<span class="text-xs text-gray-400 font-mono" x-text="store.code"></span>
|
||||
</label>
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Role -->
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
|
||||
{{ _('tenancy.team.role') }}
|
||||
</label>
|
||||
<select x-model="inviteForm.role_name"
|
||||
class="w-full px-3 py-2 text-sm text-gray-700 dark:text-gray-300 bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-lg focus:border-purple-400 focus:outline-none focus:ring focus:ring-purple-300 dark:focus:ring-purple-600">
|
||||
<template x-for="role in roleOptions" :key="role.value">
|
||||
<option :value="role.value" x-text="role.label"></option>
|
||||
</template>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<!-- Submit -->
|
||||
<div class="flex items-center justify-end gap-3 pt-4 border-t border-gray-200 dark:border-gray-700">
|
||||
<button type="button" @click="showInviteModal = false"
|
||||
class="px-4 py-2 text-sm font-medium text-gray-700 dark:text-gray-300 bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-lg hover:bg-gray-50 dark:hover:bg-gray-600 transition-colors">
|
||||
{{ _('common.cancel') }}
|
||||
</button>
|
||||
<button type="submit" :disabled="saving"
|
||||
class="flex items-center px-4 py-2 text-sm font-medium text-white bg-purple-600 border border-transparent rounded-lg hover:bg-purple-700 focus:outline-none focus:shadow-outline-purple disabled:opacity-50 disabled:cursor-not-allowed transition-colors">
|
||||
<span x-show="saving" x-html="$icon('spinner', 'w-4 h-4 mr-2')"></span>
|
||||
<span x-show="!saving" x-html="$icon('paper-airplane', 'w-4 h-4 mr-2')"></span>
|
||||
<span x-text="saving ? '{{ _('common.sending') }}...' : '{{ _('tenancy.team.send_invitation') }}'"></span>
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
{% endcall %}
|
||||
|
||||
<!-- ==================== EDIT MODAL ==================== -->
|
||||
{% call modal('editModal', _('tenancy.team.edit_member'), 'showEditModal', size='md', show_footer=false) %}
|
||||
<div x-show="selectedMember" class="space-y-4">
|
||||
<!-- Member info (read-only) -->
|
||||
<div class="flex items-center gap-3 pb-4 border-b border-gray-200 dark:border-gray-700">
|
||||
<div class="w-10 h-10 rounded-full bg-purple-100 dark:bg-purple-900 flex items-center justify-center">
|
||||
<span class="text-sm font-semibold text-purple-600 dark:text-purple-300"
|
||||
x-text="selectedMember ? getInitials(selectedMember) : ''"></span>
|
||||
</div>
|
||||
<div>
|
||||
<p class="font-medium text-gray-900 dark:text-white">
|
||||
<span x-text="selectedMember?.first_name || ''"></span>
|
||||
<span x-text="selectedMember?.last_name || ''"></span>
|
||||
<span x-show="!selectedMember?.first_name && !selectedMember?.last_name"
|
||||
x-text="selectedMember?.email"></span>
|
||||
</p>
|
||||
<p class="text-sm text-gray-500 dark:text-gray-400" x-text="selectedMember?.email"
|
||||
x-show="selectedMember?.first_name || selectedMember?.last_name"></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Per-store role management -->
|
||||
<div class="space-y-3">
|
||||
<h4 class="text-sm font-medium text-gray-700 dark:text-gray-300">{{ _('tenancy.team.store_roles') }}</h4>
|
||||
<template x-for="store in selectedMember?.stores || []" :key="store.store_id">
|
||||
<div class="flex items-center justify-between p-3 bg-gray-50 dark:bg-gray-700/50 rounded-lg">
|
||||
<div>
|
||||
<p class="text-sm font-medium text-gray-800 dark:text-gray-200" x-text="store.store_name"></p>
|
||||
<p class="text-xs text-gray-400 font-mono" x-text="store.store_code"></p>
|
||||
</div>
|
||||
<div class="flex items-center gap-2">
|
||||
<span class="text-sm text-gray-500 dark:text-gray-400"
|
||||
x-text="`${store.member_count} {{ _("tenancy.team.members").lower() }}`"></span>
|
||||
<a :href="`/store/${store.store_code}/team`"
|
||||
class="inline-flex items-center px-3 py-1.5 text-xs font-medium text-indigo-600 dark:text-indigo-400 bg-indigo-50 dark:bg-indigo-900/30 rounded-md hover:bg-indigo-100 dark:hover:bg-indigo-900/50 transition-colors">
|
||||
<span x-html="$icon('external-link', 'w-3.5 h-3.5 mr-1')"></span>
|
||||
{{ _("common.view") }}
|
||||
</a>
|
||||
<select x-model="store.role_name"
|
||||
class="px-2 py-1 text-sm text-gray-700 dark:text-gray-300 bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-md focus:border-purple-400 focus:outline-none">
|
||||
<template x-for="role in roleOptions" :key="role.value">
|
||||
<option :value="role.value" x-text="role.label"></option>
|
||||
</template>
|
||||
</select>
|
||||
<button @click="updateMemberRole(store.store_id, selectedMember.user_id, store.role_name)"
|
||||
:disabled="saving"
|
||||
class="px-3 py-1 text-xs font-medium text-white bg-purple-600 rounded-md hover:bg-purple-700 disabled:opacity-50 disabled:cursor-not-allowed transition-colors">
|
||||
<span x-show="saving" x-html="$icon('spinner', 'w-3 h-3')"></span>
|
||||
<span x-show="!saving">{{ _('common.update') }}</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
|
||||
<!-- Members List -->
|
||||
<div class="divide-y divide-gray-100 dark:divide-gray-700">
|
||||
<!-- Owner Row -->
|
||||
<div class="px-6 py-3 flex items-center gap-4 bg-gray-50/50 dark:bg-gray-700/30">
|
||||
<div class="w-8 h-8 rounded-full bg-indigo-100 dark:bg-indigo-900 flex items-center justify-center flex-shrink-0">
|
||||
<span x-html="$icon('shield-check', 'w-4 h-4 text-indigo-600 dark:text-indigo-400')"></span>
|
||||
</div>
|
||||
<div class="flex-1 min-w-0">
|
||||
<p class="text-sm font-medium text-gray-900 dark:text-white" x-text="data?.owner_email || '{{ _("tenancy.team.owner") }}'"></p>
|
||||
</div>
|
||||
<span class="px-2 py-0.5 text-xs font-medium bg-indigo-100 dark:bg-indigo-900 text-indigo-800 dark:text-indigo-200 rounded-full">{{ _("tenancy.team.owner") }}</span>
|
||||
</div>
|
||||
|
||||
<!-- Team Members -->
|
||||
<template x-for="member in store.members" :key="member.id">
|
||||
<div class="px-6 py-3 flex items-center gap-4">
|
||||
<div class="w-8 h-8 rounded-full bg-gray-100 dark:bg-gray-700 flex items-center justify-center flex-shrink-0">
|
||||
<span x-html="$icon('user', 'w-4 h-4 text-gray-500 dark:text-gray-400')"></span>
|
||||
</div>
|
||||
<div class="flex-1 min-w-0">
|
||||
<p class="text-sm font-medium text-gray-900 dark:text-white">
|
||||
<span x-text="member.first_name || ''"></span>
|
||||
<span x-text="member.last_name || ''"></span>
|
||||
<span x-show="!member.first_name && !member.last_name" x-text="member.email"></span>
|
||||
</p>
|
||||
<p class="text-xs text-gray-500 dark:text-gray-400" x-text="member.email"
|
||||
x-show="member.first_name || member.last_name"></p>
|
||||
</div>
|
||||
<span class="px-2 py-0.5 text-xs font-medium rounded-full"
|
||||
:class="member.is_active ? 'bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200' : 'bg-yellow-100 text-yellow-800 dark:bg-yellow-900 dark:text-yellow-200'"
|
||||
x-text="member.is_active ? (member.role_name || '{{ _("tenancy.team.members") }}') : '{{ _("common.pending") }}'">
|
||||
</span>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<!-- Empty State -->
|
||||
<template x-if="store.members.length === 0">
|
||||
<div class="px-6 py-6 text-center text-sm text-gray-400 dark:text-gray-500">
|
||||
{{ _("tenancy.team.title") }} - {{ _("common.none") }}
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<!-- Empty State: No Stores -->
|
||||
<template x-if="data && data.stores.length === 0">
|
||||
<div class="text-center py-12 bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700">
|
||||
<span x-html="$icon('user-group', 'w-12 h-12 text-gray-300 dark:text-gray-600 mx-auto')"></span>
|
||||
<p class="mt-4 text-sm text-gray-500 dark:text-gray-400">{{ _("common.not_available") }}</p>
|
||||
</div>
|
||||
</template>
|
||||
<!-- Close button -->
|
||||
<div class="flex justify-end pt-4 border-t border-gray-200 dark:border-gray-700">
|
||||
<button @click="showEditModal = false"
|
||||
class="px-4 py-2 text-sm font-medium text-gray-700 dark:text-gray-300 bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-lg hover:bg-gray-50 dark:hover:bg-gray-600 transition-colors">
|
||||
{{ _('common.close') }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endcall %}
|
||||
|
||||
<!-- ==================== REMOVE MODAL ==================== -->
|
||||
{% call modal('removeModal', _('tenancy.team.remove_member'), 'showRemoveModal', size='sm', show_footer=false) %}
|
||||
<div x-show="selectedMember" class="space-y-4">
|
||||
<!-- Warning -->
|
||||
<div class="flex items-start gap-3 p-3 bg-red-50 dark:bg-red-900/20 border border-red-200 dark:border-red-800 rounded-lg">
|
||||
<span x-html="$icon('exclamation', 'w-5 h-5 text-red-600 dark:text-red-400 flex-shrink-0 mt-0.5')"></span>
|
||||
<p class="text-sm text-red-800 dark:text-red-200">
|
||||
{{ _('tenancy.team.remove_confirmation') }}
|
||||
<strong x-text="(selectedMember?.first_name || '') + ' ' + (selectedMember?.last_name || selectedMember?.email || '')"></strong>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<!-- Store list -->
|
||||
<div class="space-y-2">
|
||||
<p class="text-sm font-medium text-gray-700 dark:text-gray-300">{{ _('tenancy.team.member_stores') }}:</p>
|
||||
<template x-for="store in selectedMember?.stores || []" :key="store.store_id">
|
||||
<div class="flex items-center justify-between p-2 bg-gray-50 dark:bg-gray-700/50 rounded-lg">
|
||||
<div class="flex items-center gap-2">
|
||||
<span x-html="$icon('shopping-bag', 'w-4 h-4 text-gray-400')"></span>
|
||||
<span class="text-sm text-gray-700 dark:text-gray-300" x-text="store.store_name"></span>
|
||||
<span class="text-xs text-gray-400" x-text="'(' + (store.role_name || '{{ _('tenancy.team.no_role') }}') + ')'"></span>
|
||||
</div>
|
||||
<button @click="removeMember(store.store_id, selectedMember.user_id)"
|
||||
:disabled="saving"
|
||||
class="px-2 py-1 text-xs font-medium text-red-600 hover:text-red-800 dark:text-red-400 dark:hover:text-red-300 hover:bg-red-50 dark:hover:bg-red-900/30 rounded transition-colors disabled:opacity-50">
|
||||
{{ _('common.remove') }}
|
||||
</button>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
|
||||
<!-- Actions -->
|
||||
<div class="flex items-center justify-between pt-4 border-t border-gray-200 dark:border-gray-700">
|
||||
<button @click="showRemoveModal = false"
|
||||
class="px-4 py-2 text-sm font-medium text-gray-700 dark:text-gray-300 bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-lg hover:bg-gray-50 dark:hover:bg-gray-600 transition-colors">
|
||||
{{ _('common.cancel') }}
|
||||
</button>
|
||||
<button @click="removeFromAllStores(selectedMember)"
|
||||
:disabled="saving"
|
||||
x-show="selectedMember?.stores?.length > 1"
|
||||
class="flex items-center px-4 py-2 text-sm font-medium text-white bg-red-600 border border-transparent rounded-lg hover:bg-red-700 focus:outline-none disabled:opacity-50 disabled:cursor-not-allowed transition-colors">
|
||||
<span x-show="saving" x-html="$icon('spinner', 'w-4 h-4 mr-2')"></span>
|
||||
<span x-show="!saving" x-html="$icon('trash', 'w-4 h-4 mr-2')"></span>
|
||||
{{ _('tenancy.team.remove_from_all_stores') }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
{% endcall %}
|
||||
|
||||
{% endblock %}
|
||||
|
||||
{% block extra_scripts %}
|
||||
<script>
|
||||
function merchantTeam() {
|
||||
return {
|
||||
loading: true,
|
||||
error: null,
|
||||
data: null,
|
||||
|
||||
async init() {
|
||||
try {
|
||||
this.data = await apiClient.get('/merchants/account/team');
|
||||
} catch (e) {
|
||||
this.error = e.message || 'Failed to load team data';
|
||||
} finally {
|
||||
this.loading = false;
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
</script>
|
||||
<script defer src="{{ url_for('tenancy_static', path='merchant/js/merchant-team.js') }}"></script>
|
||||
{% endblock %}
|
||||
|
||||
Reference in New Issue
Block a user