refactor: complete module-driven architecture migration
This commit completes the migration to a fully module-driven architecture: ## Models Migration - Moved all domain models from models/database/ to their respective modules: - tenancy: User, Admin, Vendor, Company, Platform, VendorDomain, etc. - cms: MediaFile, VendorTheme - messaging: Email, VendorEmailSettings, VendorEmailTemplate - core: AdminMenuConfig - models/database/ now only contains Base and TimestampMixin (infrastructure) ## Schemas Migration - Moved all domain schemas from models/schema/ to their respective modules: - tenancy: company, vendor, admin, team, vendor_domain - cms: media, image, vendor_theme - messaging: email - models/schema/ now only contains base.py and auth.py (infrastructure) ## Routes Migration - Moved admin routes from app/api/v1/admin/ to modules: - menu_config.py -> core module - modules.py -> tenancy module - module_config.py -> tenancy module - app/api/v1/admin/ now only aggregates auto-discovered module routes ## Menu System - Implemented module-driven menu system with MenuDiscoveryService - Extended FrontendType enum: PLATFORM, ADMIN, VENDOR, STOREFRONT - Added MenuItemDefinition and MenuSectionDefinition dataclasses - Each module now defines its own menu items in definition.py - MenuService integrates with MenuDiscoveryService for template rendering ## Documentation - Updated docs/architecture/models-structure.md - Updated docs/architecture/menu-management.md - Updated architecture validation rules for new exceptions ## Architecture Validation - Updated MOD-019 rule to allow base.py in models/schema/ - Created core module exceptions.py and schemas/ directory - All validation errors resolved (only warnings remain) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -8,8 +8,8 @@ dependencies, route configurations, and scheduled tasks.
|
||||
Note: This module requires the inventory module to be enabled.
|
||||
"""
|
||||
|
||||
from app.modules.base import ModuleDefinition, ScheduledTask
|
||||
from models.database.admin_menu_config import FrontendType
|
||||
from app.modules.base import MenuItemDefinition, MenuSectionDefinition, ModuleDefinition, ScheduledTask
|
||||
from app.modules.enums import FrontendType
|
||||
|
||||
|
||||
def _get_admin_router():
|
||||
@@ -52,6 +52,58 @@ marketplace_module = ModuleDefinition(
|
||||
"letzshop", # Letzshop integration
|
||||
],
|
||||
},
|
||||
# New module-driven menu definitions
|
||||
menus={
|
||||
FrontendType.ADMIN: [
|
||||
MenuSectionDefinition(
|
||||
id="marketplace",
|
||||
label_key="marketplace.menu.marketplace",
|
||||
icon="shopping-cart",
|
||||
order=60,
|
||||
items=[
|
||||
MenuItemDefinition(
|
||||
id="marketplace-letzshop",
|
||||
label_key="marketplace.menu.letzshop",
|
||||
icon="shopping-cart",
|
||||
route="/admin/marketplace/letzshop",
|
||||
order=10,
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
FrontendType.VENDOR: [
|
||||
MenuSectionDefinition(
|
||||
id="products",
|
||||
label_key="marketplace.menu.products_inventory",
|
||||
icon="download",
|
||||
order=10,
|
||||
items=[
|
||||
MenuItemDefinition(
|
||||
id="marketplace",
|
||||
label_key="marketplace.menu.marketplace_import",
|
||||
icon="download",
|
||||
route="/vendor/{vendor_code}/marketplace",
|
||||
order=30,
|
||||
),
|
||||
],
|
||||
),
|
||||
MenuSectionDefinition(
|
||||
id="sales",
|
||||
label_key="marketplace.menu.sales_orders",
|
||||
icon="external-link",
|
||||
order=20,
|
||||
items=[
|
||||
MenuItemDefinition(
|
||||
id="letzshop",
|
||||
label_key="marketplace.menu.letzshop_orders",
|
||||
icon="external-link",
|
||||
route="/vendor/{vendor_code}/letzshop",
|
||||
order=20,
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
},
|
||||
is_core=False,
|
||||
# =========================================================================
|
||||
# Self-Contained Module Configuration
|
||||
|
||||
@@ -1,122 +1,61 @@
|
||||
{
|
||||
"title": "Marktplatz-Integration",
|
||||
"description": "Letzshop Produkt- und Bestellsynchronisation",
|
||||
"products": {
|
||||
"title": "Marktplatz-Produkte",
|
||||
"subtitle": "Von Marktplätzen importierte Produkte",
|
||||
"empty": "Keine Produkte gefunden",
|
||||
"empty_search": "Keine Produkte entsprechen Ihrer Suche",
|
||||
"import": "Produkte importieren"
|
||||
},
|
||||
"import": {
|
||||
"title": "Produkte importieren",
|
||||
"subtitle": "Produkte aus Marktplatz-Feeds importieren",
|
||||
"source_url": "Feed-URL",
|
||||
"source_url_help": "URL zum Marktplatz-CSV-Feed",
|
||||
"marketplace": "Marktplatz",
|
||||
"language": "Sprache",
|
||||
"language_help": "Sprache für Produktübersetzungen",
|
||||
"batch_size": "Batch-Größe",
|
||||
"marketplace": {
|
||||
"title": "Marktplatz",
|
||||
"import": "Importieren",
|
||||
"export": "Exportieren",
|
||||
"sync": "Synchronisieren",
|
||||
"source": "Quelle",
|
||||
"source_url": "Quell-URL",
|
||||
"import_products": "Produkte importieren",
|
||||
"start_import": "Import starten",
|
||||
"cancel": "Abbrechen"
|
||||
},
|
||||
"import_jobs": {
|
||||
"title": "Import-Verlauf",
|
||||
"subtitle": "Vergangene und aktuelle Import-Jobs",
|
||||
"empty": "Keine Import-Jobs",
|
||||
"job_id": "Job-ID",
|
||||
"marketplace": "Marktplatz",
|
||||
"vendor": "Verkäufer",
|
||||
"status": "Status",
|
||||
"imported": "Importiert",
|
||||
"updated": "Aktualisiert",
|
||||
"errors": "Fehler",
|
||||
"created": "Erstellt",
|
||||
"completed": "Abgeschlossen",
|
||||
"statuses": {
|
||||
"pending": "Ausstehend",
|
||||
"processing": "In Bearbeitung",
|
||||
"completed": "Abgeschlossen",
|
||||
"completed_with_errors": "Mit Fehlern abgeschlossen",
|
||||
"failed": "Fehlgeschlagen"
|
||||
}
|
||||
"importing": "Importiere...",
|
||||
"import_complete": "Import abgeschlossen",
|
||||
"import_failed": "Import fehlgeschlagen",
|
||||
"import_history": "Import-Verlauf",
|
||||
"job_id": "Auftrags-ID",
|
||||
"started_at": "Gestartet um",
|
||||
"completed_at": "Abgeschlossen um",
|
||||
"duration": "Dauer",
|
||||
"imported_count": "Importiert",
|
||||
"error_count": "Fehler",
|
||||
"total_processed": "Gesamt verarbeitet",
|
||||
"progress": "Fortschritt",
|
||||
"no_import_jobs": "Noch keine Imports",
|
||||
"start_first_import": "Starten Sie Ihren ersten Import mit dem Formular oben"
|
||||
},
|
||||
"letzshop": {
|
||||
"title": "Letzshop-Integration",
|
||||
"subtitle": "Letzshop-Verbindung und Synchronisation verwalten",
|
||||
"credentials": {
|
||||
"title": "API-Anmeldedaten",
|
||||
"api_key": "API-Schlüssel",
|
||||
"api_key_help": "Ihr Letzshop API-Schlüssel",
|
||||
"endpoint": "API-Endpunkt",
|
||||
"test_mode": "Testmodus",
|
||||
"test_mode_help": "Wenn aktiviert, werden keine Änderungen bei Letzshop vorgenommen"
|
||||
},
|
||||
"sync": {
|
||||
"title": "Synchronisation",
|
||||
"auto_sync": "Auto-Sync",
|
||||
"auto_sync_help": "Bestellungen automatisch von Letzshop synchronisieren",
|
||||
"interval": "Sync-Intervall",
|
||||
"interval_help": "Minuten zwischen Synchronisationen",
|
||||
"last_sync": "Letzte Sync",
|
||||
"last_status": "Letzter Status",
|
||||
"sync_now": "Jetzt synchronisieren"
|
||||
},
|
||||
"carrier": {
|
||||
"title": "Versanddiensteinstellungen",
|
||||
"default_carrier": "Standard-Versanddienstleister",
|
||||
"greco": "Greco",
|
||||
"colissimo": "Colissimo",
|
||||
"xpresslogistics": "XpressLogistics",
|
||||
"label_url": "Label-URL-Präfix"
|
||||
},
|
||||
"historical": {
|
||||
"title": "Historischer Import",
|
||||
"subtitle": "Vergangene Bestellungen von Letzshop importieren",
|
||||
"start_import": "Historischen Import starten",
|
||||
"phase": "Phase",
|
||||
"confirmed": "Bestätigte Bestellungen",
|
||||
"unconfirmed": "Unbestätigte Bestellungen",
|
||||
"fetching": "Abrufen...",
|
||||
"processing": "Verarbeiten...",
|
||||
"page": "Seite",
|
||||
"fetched": "Abgerufen",
|
||||
"processed": "Verarbeitet",
|
||||
"imported": "Importiert",
|
||||
"updated": "Aktualisiert",
|
||||
"skipped": "Übersprungen"
|
||||
},
|
||||
"vendors": {
|
||||
"title": "Verkäuferverzeichnis",
|
||||
"subtitle": "Letzshop-Verkäufer durchsuchen",
|
||||
"claim": "Beanspruchen",
|
||||
"claimed": "Beansprucht",
|
||||
"unclaimed": "Nicht beansprucht",
|
||||
"last_synced": "Zuletzt synchronisiert"
|
||||
"connection": "Verbindung",
|
||||
"credentials": "Zugangsdaten",
|
||||
"api_key": "API-Schlüssel",
|
||||
"api_endpoint": "API-Endpunkt",
|
||||
"auto_sync": "Auto-Sync",
|
||||
"sync_interval": "Sync-Intervall",
|
||||
"every_hour": "Jede Stunde",
|
||||
"every_day": "Jeden Tag",
|
||||
"test_connection": "Verbindung testen",
|
||||
"save_credentials": "Zugangsdaten speichern",
|
||||
"connection_success": "Verbindung erfolgreich",
|
||||
"connection_failed": "Verbindung fehlgeschlagen",
|
||||
"last_sync": "Letzte Synchronisation",
|
||||
"sync_status": "Sync-Status",
|
||||
"import_orders": "Bestellungen importieren",
|
||||
"export_products": "Produkte exportieren",
|
||||
"no_credentials": "Konfigurieren Sie Ihren API-Schlüssel in den Einstellungen",
|
||||
"carriers": {
|
||||
"dhl": "DHL",
|
||||
"ups": "UPS",
|
||||
"fedex": "FedEx",
|
||||
"dpd": "DPD",
|
||||
"gls": "GLS",
|
||||
"post_luxembourg": "Post Luxemburg",
|
||||
"other": "Andere"
|
||||
}
|
||||
},
|
||||
"export": {
|
||||
"title": "Produkte exportieren",
|
||||
"subtitle": "Produkte im Marktplatz-Format exportieren",
|
||||
"format": "Format",
|
||||
"format_csv": "CSV",
|
||||
"format_xml": "XML",
|
||||
"download": "Export herunterladen"
|
||||
},
|
||||
"messages": {
|
||||
"import_started": "Import erfolgreich gestartet",
|
||||
"import_completed": "Import abgeschlossen",
|
||||
"import_failed": "Import fehlgeschlagen",
|
||||
"credentials_saved": "Anmeldedaten erfolgreich gespeichert",
|
||||
"sync_started": "Synchronisation gestartet",
|
||||
"sync_completed": "Synchronisation abgeschlossen",
|
||||
"sync_failed": "Synchronisation fehlgeschlagen",
|
||||
"export_ready": "Export zum Download bereit",
|
||||
"error_loading": "Fehler beim Laden der Daten"
|
||||
},
|
||||
"filters": {
|
||||
"all_marketplaces": "Alle Marktplätze",
|
||||
"all_vendors": "Alle Verkäufer",
|
||||
"search_placeholder": "Produkte suchen..."
|
||||
"no_error_details_available": "No error details available",
|
||||
"failed_to_load_error_details": "Failed to load error details",
|
||||
"copied_to_clipboard": "Copied to clipboard",
|
||||
"failed_to_copy_to_clipboard": "Failed to copy to clipboard"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,122 +1,61 @@
|
||||
{
|
||||
"title": "Intégration Marketplace",
|
||||
"description": "Synchronisation des produits et commandes Letzshop",
|
||||
"products": {
|
||||
"title": "Produits Marketplace",
|
||||
"subtitle": "Produits importés des marketplaces",
|
||||
"empty": "Aucun produit trouvé",
|
||||
"empty_search": "Aucun produit ne correspond à votre recherche",
|
||||
"import": "Importer des produits"
|
||||
},
|
||||
"import": {
|
||||
"title": "Importer des produits",
|
||||
"subtitle": "Importer des produits depuis les flux marketplace",
|
||||
"source_url": "URL du flux",
|
||||
"source_url_help": "URL du flux CSV marketplace",
|
||||
"marketplace": "Marketplace",
|
||||
"language": "Langue",
|
||||
"language_help": "Langue pour les traductions de produits",
|
||||
"batch_size": "Taille du lot",
|
||||
"start_import": "Démarrer l'import",
|
||||
"cancel": "Annuler"
|
||||
},
|
||||
"import_jobs": {
|
||||
"title": "Historique des imports",
|
||||
"subtitle": "Imports passés et en cours",
|
||||
"empty": "Aucun import",
|
||||
"job_id": "ID du job",
|
||||
"marketplace": "Marketplace",
|
||||
"vendor": "Vendeur",
|
||||
"status": "Statut",
|
||||
"imported": "Importés",
|
||||
"updated": "Mis à jour",
|
||||
"errors": "Erreurs",
|
||||
"created": "Créé",
|
||||
"completed": "Terminé",
|
||||
"statuses": {
|
||||
"pending": "En attente",
|
||||
"processing": "En cours",
|
||||
"completed": "Terminé",
|
||||
"completed_with_errors": "Terminé avec erreurs",
|
||||
"failed": "Échoué"
|
||||
}
|
||||
"marketplace": {
|
||||
"title": "Marketplace",
|
||||
"import": "Importer",
|
||||
"export": "Exporter",
|
||||
"sync": "Synchroniser",
|
||||
"source": "Source",
|
||||
"source_url": "URL source",
|
||||
"import_products": "Importer des produits",
|
||||
"start_import": "Démarrer l'importation",
|
||||
"importing": "Importation en cours...",
|
||||
"import_complete": "Importation terminée",
|
||||
"import_failed": "Échec de l'importation",
|
||||
"import_history": "Historique des importations",
|
||||
"job_id": "ID du travail",
|
||||
"started_at": "Démarré à",
|
||||
"completed_at": "Terminé à",
|
||||
"duration": "Durée",
|
||||
"imported_count": "Importés",
|
||||
"error_count": "Erreurs",
|
||||
"total_processed": "Total traité",
|
||||
"progress": "Progression",
|
||||
"no_import_jobs": "Aucune importation pour le moment",
|
||||
"start_first_import": "Lancez votre première importation avec le formulaire ci-dessus"
|
||||
},
|
||||
"letzshop": {
|
||||
"title": "Intégration Letzshop",
|
||||
"subtitle": "Gérer la connexion et la synchronisation Letzshop",
|
||||
"credentials": {
|
||||
"title": "Identifiants API",
|
||||
"api_key": "Clé API",
|
||||
"api_key_help": "Votre clé API Letzshop",
|
||||
"endpoint": "Point d'accès API",
|
||||
"test_mode": "Mode test",
|
||||
"test_mode_help": "Lorsqu'activé, aucune modification n'est effectuée sur Letzshop"
|
||||
},
|
||||
"sync": {
|
||||
"title": "Synchronisation",
|
||||
"auto_sync": "Sync automatique",
|
||||
"auto_sync_help": "Synchroniser automatiquement les commandes depuis Letzshop",
|
||||
"interval": "Intervalle de sync",
|
||||
"interval_help": "Minutes entre les synchronisations",
|
||||
"last_sync": "Dernière sync",
|
||||
"last_status": "Dernier statut",
|
||||
"sync_now": "Synchroniser maintenant"
|
||||
},
|
||||
"carrier": {
|
||||
"title": "Paramètres transporteur",
|
||||
"default_carrier": "Transporteur par défaut",
|
||||
"greco": "Greco",
|
||||
"colissimo": "Colissimo",
|
||||
"xpresslogistics": "XpressLogistics",
|
||||
"label_url": "Préfixe URL étiquette"
|
||||
},
|
||||
"historical": {
|
||||
"title": "Import historique",
|
||||
"subtitle": "Importer les commandes passées depuis Letzshop",
|
||||
"start_import": "Démarrer l'import historique",
|
||||
"phase": "Phase",
|
||||
"confirmed": "Commandes confirmées",
|
||||
"unconfirmed": "Commandes non confirmées",
|
||||
"fetching": "Récupération...",
|
||||
"processing": "Traitement...",
|
||||
"page": "Page",
|
||||
"fetched": "Récupérées",
|
||||
"processed": "Traitées",
|
||||
"imported": "Importées",
|
||||
"updated": "Mises à jour",
|
||||
"skipped": "Ignorées"
|
||||
},
|
||||
"vendors": {
|
||||
"title": "Annuaire des vendeurs",
|
||||
"subtitle": "Parcourir les vendeurs Letzshop",
|
||||
"claim": "Revendiquer",
|
||||
"claimed": "Revendiqué",
|
||||
"unclaimed": "Non revendiqué",
|
||||
"last_synced": "Dernière sync"
|
||||
"connection": "Connexion",
|
||||
"credentials": "Identifiants",
|
||||
"api_key": "Clé API",
|
||||
"api_endpoint": "Point d'accès API",
|
||||
"auto_sync": "Synchronisation automatique",
|
||||
"sync_interval": "Intervalle de synchronisation",
|
||||
"every_hour": "Toutes les heures",
|
||||
"every_day": "Tous les jours",
|
||||
"test_connection": "Tester la connexion",
|
||||
"save_credentials": "Enregistrer les identifiants",
|
||||
"connection_success": "Connexion réussie",
|
||||
"connection_failed": "Échec de la connexion",
|
||||
"last_sync": "Dernière synchronisation",
|
||||
"sync_status": "Statut de synchronisation",
|
||||
"import_orders": "Importer les commandes",
|
||||
"export_products": "Exporter les produits",
|
||||
"no_credentials": "Configurez votre clé API dans les paramètres pour commencer",
|
||||
"carriers": {
|
||||
"dhl": "DHL",
|
||||
"ups": "UPS",
|
||||
"fedex": "FedEx",
|
||||
"dpd": "DPD",
|
||||
"gls": "GLS",
|
||||
"post_luxembourg": "Post Luxembourg",
|
||||
"other": "Autre"
|
||||
}
|
||||
},
|
||||
"export": {
|
||||
"title": "Exporter les produits",
|
||||
"subtitle": "Exporter les produits au format marketplace",
|
||||
"format": "Format",
|
||||
"format_csv": "CSV",
|
||||
"format_xml": "XML",
|
||||
"download": "Télécharger l'export"
|
||||
},
|
||||
"messages": {
|
||||
"import_started": "Import démarré avec succès",
|
||||
"import_completed": "Import terminé",
|
||||
"import_failed": "Import échoué",
|
||||
"credentials_saved": "Identifiants enregistrés avec succès",
|
||||
"sync_started": "Synchronisation démarrée",
|
||||
"sync_completed": "Synchronisation terminée",
|
||||
"sync_failed": "Synchronisation échouée",
|
||||
"export_ready": "Export prêt au téléchargement",
|
||||
"error_loading": "Erreur lors du chargement des données"
|
||||
},
|
||||
"filters": {
|
||||
"all_marketplaces": "Tous les marketplaces",
|
||||
"all_vendors": "Tous les vendeurs",
|
||||
"search_placeholder": "Rechercher des produits..."
|
||||
"no_error_details_available": "No error details available",
|
||||
"failed_to_load_error_details": "Failed to load error details",
|
||||
"copied_to_clipboard": "Copied to clipboard",
|
||||
"failed_to_copy_to_clipboard": "Failed to copy to clipboard"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,122 +1,61 @@
|
||||
{
|
||||
"title": "Marketplace-Integratioun",
|
||||
"description": "Letzshop Produkt- a Bestellsynchronisatioun",
|
||||
"products": {
|
||||
"title": "Marketplace-Produkter",
|
||||
"subtitle": "Vun Marketplacen importéiert Produkter",
|
||||
"empty": "Keng Produkter fonnt",
|
||||
"empty_search": "Keng Produkter passen zu Ärer Sich",
|
||||
"import": "Produkter importéieren"
|
||||
},
|
||||
"import": {
|
||||
"title": "Produkter importéieren",
|
||||
"subtitle": "Produkter aus Marketplace-Feeds importéieren",
|
||||
"source_url": "Feed-URL",
|
||||
"source_url_help": "URL zum Marketplace-CSV-Feed",
|
||||
"marketplace": "Marketplace",
|
||||
"language": "Sprooch",
|
||||
"language_help": "Sprooch fir Produktiwwersetzungen",
|
||||
"batch_size": "Batch-Gréisst",
|
||||
"marketplace": {
|
||||
"title": "Marchéplaz",
|
||||
"import": "Import",
|
||||
"export": "Export",
|
||||
"sync": "Synchroniséieren",
|
||||
"source": "Quell",
|
||||
"source_url": "Quell URL",
|
||||
"import_products": "Produkter importéieren",
|
||||
"start_import": "Import starten",
|
||||
"cancel": "Ofbriechen"
|
||||
},
|
||||
"import_jobs": {
|
||||
"title": "Import-Verlaf",
|
||||
"subtitle": "Vergaangen an aktuell Import-Jobs",
|
||||
"empty": "Keng Import-Jobs",
|
||||
"job_id": "Job-ID",
|
||||
"marketplace": "Marketplace",
|
||||
"vendor": "Verkeefer",
|
||||
"status": "Status",
|
||||
"imported": "Importéiert",
|
||||
"updated": "Aktualiséiert",
|
||||
"errors": "Feeler",
|
||||
"created": "Erstallt",
|
||||
"completed": "Ofgeschloss",
|
||||
"statuses": {
|
||||
"pending": "Waarden",
|
||||
"processing": "Am Gaang",
|
||||
"completed": "Ofgeschloss",
|
||||
"completed_with_errors": "Mat Feeler ofgeschloss",
|
||||
"failed": "Feelgeschloen"
|
||||
}
|
||||
"importing": "Importéieren...",
|
||||
"import_complete": "Import fäerdeg",
|
||||
"import_failed": "Import feelgeschloen",
|
||||
"import_history": "Importgeschicht",
|
||||
"job_id": "Job ID",
|
||||
"started_at": "Ugefaang um",
|
||||
"completed_at": "Fäerdeg um",
|
||||
"duration": "Dauer",
|
||||
"imported_count": "Importéiert",
|
||||
"error_count": "Feeler",
|
||||
"total_processed": "Total veraarbecht",
|
||||
"progress": "Fortschrëtt",
|
||||
"no_import_jobs": "Nach keng Import Jobs",
|
||||
"start_first_import": "Start Ären éischten Import mat der Form uewendriwwer"
|
||||
},
|
||||
"letzshop": {
|
||||
"title": "Letzshop-Integratioun",
|
||||
"subtitle": "Letzshop-Verbindung a Synchronisatioun verwalten",
|
||||
"credentials": {
|
||||
"title": "API-Umeldedaten",
|
||||
"api_key": "API-Schlëssel",
|
||||
"api_key_help": "Ären Letzshop API-Schlëssel",
|
||||
"endpoint": "API-Endpunkt",
|
||||
"test_mode": "Testmodus",
|
||||
"test_mode_help": "Wann aktivéiert, ginn keng Ännerungen bei Letzshop gemaach"
|
||||
},
|
||||
"sync": {
|
||||
"title": "Synchronisatioun",
|
||||
"auto_sync": "Auto-Sync",
|
||||
"auto_sync_help": "Bestellungen automatesch vun Letzshop synchroniséieren",
|
||||
"interval": "Sync-Intervall",
|
||||
"interval_help": "Minutten tëscht Synchronisatiounen",
|
||||
"last_sync": "Lescht Sync",
|
||||
"last_status": "Leschte Status",
|
||||
"sync_now": "Elo synchroniséieren"
|
||||
},
|
||||
"carrier": {
|
||||
"title": "Versandastellungen",
|
||||
"default_carrier": "Standard-Versanddienstleeschter",
|
||||
"greco": "Greco",
|
||||
"colissimo": "Colissimo",
|
||||
"xpresslogistics": "XpressLogistics",
|
||||
"label_url": "Label-URL-Präfix"
|
||||
},
|
||||
"historical": {
|
||||
"title": "Historeschen Import",
|
||||
"subtitle": "Vergaangen Bestellungen vun Letzshop importéieren",
|
||||
"start_import": "Historeschen Import starten",
|
||||
"phase": "Phas",
|
||||
"confirmed": "Bestätegt Bestellungen",
|
||||
"unconfirmed": "Onbestätegt Bestellungen",
|
||||
"fetching": "Ofruff...",
|
||||
"processing": "Veraarbecht...",
|
||||
"page": "Säit",
|
||||
"fetched": "Ofgeruff",
|
||||
"processed": "Veraarbecht",
|
||||
"imported": "Importéiert",
|
||||
"updated": "Aktualiséiert",
|
||||
"skipped": "Iwwersprong"
|
||||
},
|
||||
"vendors": {
|
||||
"title": "Verkeeferverzeechnes",
|
||||
"subtitle": "Letzshop-Verkeefer duerchsichen",
|
||||
"claim": "Reklaméieren",
|
||||
"claimed": "Reklaméiert",
|
||||
"unclaimed": "Net reklaméiert",
|
||||
"last_synced": "Lescht synchroniséiert"
|
||||
"title": "Letzshop Integratioun",
|
||||
"connection": "Verbindung",
|
||||
"credentials": "Umeldungsdaten",
|
||||
"api_key": "API Schlëssel",
|
||||
"api_endpoint": "API Endpunkt",
|
||||
"auto_sync": "Automatesch Sync",
|
||||
"sync_interval": "Sync Intervall",
|
||||
"every_hour": "All Stonn",
|
||||
"every_day": "All Dag",
|
||||
"test_connection": "Verbindung testen",
|
||||
"save_credentials": "Umeldungsdaten späicheren",
|
||||
"connection_success": "Verbindung erfollegräich",
|
||||
"connection_failed": "Verbindung feelgeschloen",
|
||||
"last_sync": "Läschte Sync",
|
||||
"sync_status": "Sync Status",
|
||||
"import_orders": "Bestellungen importéieren",
|
||||
"export_products": "Produkter exportéieren",
|
||||
"no_credentials": "Konfiguréiert Ären API Schlëssel an den Astellungen fir unzefänken",
|
||||
"carriers": {
|
||||
"dhl": "DHL",
|
||||
"ups": "UPS",
|
||||
"fedex": "FedEx",
|
||||
"dpd": "DPD",
|
||||
"gls": "GLS",
|
||||
"post_luxembourg": "Post Lëtzebuerg",
|
||||
"other": "Anerer"
|
||||
}
|
||||
},
|
||||
"export": {
|
||||
"title": "Produkter exportéieren",
|
||||
"subtitle": "Produkter am Marketplace-Format exportéieren",
|
||||
"format": "Format",
|
||||
"format_csv": "CSV",
|
||||
"format_xml": "XML",
|
||||
"download": "Export eroflueden"
|
||||
},
|
||||
"messages": {
|
||||
"import_started": "Import erfollegräich gestart",
|
||||
"import_completed": "Import ofgeschloss",
|
||||
"import_failed": "Import feelgeschloen",
|
||||
"credentials_saved": "Umeldedaten erfollegräich gespäichert",
|
||||
"sync_started": "Synchronisatioun gestart",
|
||||
"sync_completed": "Synchronisatioun ofgeschloss",
|
||||
"sync_failed": "Synchronisatioun feelgeschloen",
|
||||
"export_ready": "Export prett zum Eroflueden",
|
||||
"error_loading": "Feeler beim Lueden vun den Daten"
|
||||
},
|
||||
"filters": {
|
||||
"all_marketplaces": "All Marketplacen",
|
||||
"all_vendors": "All Verkeefer",
|
||||
"search_placeholder": "Produkter sichen..."
|
||||
"no_error_details_available": "No error details available",
|
||||
"failed_to_load_error_details": "Failed to load error details",
|
||||
"copied_to_clipboard": "Copied to clipboard",
|
||||
"failed_to_copy_to_clipboard": "Failed to copy to clipboard"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,8 +18,8 @@ from app.api.deps import get_db, require_menu_access
|
||||
from app.core.config import settings
|
||||
from app.modules.core.utils.page_context import get_admin_context
|
||||
from app.templates_config import templates
|
||||
from models.database.admin_menu_config import FrontendType
|
||||
from models.database.user import User
|
||||
from app.modules.enums import FrontendType
|
||||
from app.modules.tenancy.models import User
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ from app.api.deps import get_current_vendor_from_cookie_or_header, get_db
|
||||
from app.modules.core.utils.page_context import get_vendor_context
|
||||
from app.modules.marketplace.services.onboarding_service import OnboardingService
|
||||
from app.templates_config import templates
|
||||
from models.database.user import User
|
||||
from app.modules.tenancy.models import User
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ from app.modules.marketplace.models import (
|
||||
)
|
||||
from app.modules.orders.models import Order, OrderItem
|
||||
from app.modules.catalog.models import Product
|
||||
from models.database.vendor import Vendor
|
||||
from app.modules.tenancy.models import Vendor
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
@@ -627,7 +627,7 @@ class LetzshopOrderService:
|
||||
vendor_lookup = {vendor_id: (vendor.name if vendor else None, vendor.vendor_code if vendor else None)}
|
||||
else:
|
||||
# Build lookup for all vendors when showing all jobs
|
||||
from models.database.vendor import Vendor
|
||||
from app.modules.tenancy.models import Vendor
|
||||
vendors = self.db.query(Vendor.id, Vendor.name, Vendor.vendor_code).all()
|
||||
vendor_lookup = {v.id: (v.name, v.vendor_code) for v in vendors}
|
||||
|
||||
|
||||
@@ -437,9 +437,9 @@ class LetzshopVendorSyncService:
|
||||
from sqlalchemy import func
|
||||
|
||||
from app.modules.tenancy.services.admin_service import admin_service
|
||||
from models.database.company import Company
|
||||
from models.database.vendor import Vendor
|
||||
from models.schema.vendor import VendorCreate
|
||||
from app.modules.tenancy.models import Company
|
||||
from app.modules.tenancy.models import Vendor
|
||||
from app.modules.tenancy.schemas.vendor import VendorCreate
|
||||
|
||||
# Get cache entry
|
||||
cache_entry = self.get_cached_vendor(letzshop_slug)
|
||||
|
||||
@@ -12,8 +12,8 @@ from app.modules.marketplace.models import (
|
||||
MarketplaceImportError,
|
||||
MarketplaceImportJob,
|
||||
)
|
||||
from models.database.user import User
|
||||
from models.database.vendor import Vendor
|
||||
from app.modules.tenancy.models import User
|
||||
from app.modules.tenancy.models import Vendor
|
||||
from app.modules.marketplace.schemas import (
|
||||
AdminMarketplaceImportJobResponse,
|
||||
MarketplaceImportJobRequest,
|
||||
|
||||
@@ -861,7 +861,7 @@ class MarketplaceProductService:
|
||||
"""
|
||||
from app.modules.catalog.models import Product
|
||||
from app.modules.catalog.models import ProductTranslation
|
||||
from models.database.vendor import Vendor
|
||||
from app.modules.tenancy.models import Vendor
|
||||
|
||||
vendor = db.query(Vendor).filter(Vendor.id == vendor_id).first()
|
||||
if not vendor:
|
||||
|
||||
@@ -31,7 +31,7 @@ from app.modules.marketplace.models import (
|
||||
OnboardingStep,
|
||||
VendorOnboarding,
|
||||
)
|
||||
from models.database.vendor import Vendor
|
||||
from app.modules.tenancy.models import Vendor
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@@ -26,15 +26,15 @@ from app.modules.messaging.services.email_service import EmailService
|
||||
from app.modules.marketplace.services.onboarding_service import OnboardingService
|
||||
from app.modules.billing.services.stripe_service import stripe_service
|
||||
from middleware.auth import AuthManager
|
||||
from models.database.company import Company
|
||||
from app.modules.tenancy.models import Company
|
||||
from app.modules.billing.models import (
|
||||
SubscriptionStatus,
|
||||
TierCode,
|
||||
TIER_LIMITS,
|
||||
VendorSubscription,
|
||||
)
|
||||
from models.database.user import User
|
||||
from models.database.vendor import Vendor, VendorUser, VendorUserType
|
||||
from app.modules.tenancy.models import User
|
||||
from app.modules.tenancy.models import Vendor, VendorUser, VendorUserType
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@@ -44,6 +44,9 @@ function adminMarketplaceProductDetail() {
|
||||
targetVendors: [],
|
||||
|
||||
async init() {
|
||||
// Load i18n translations
|
||||
await I18n.loadModule('marketplace');
|
||||
|
||||
adminMarketplaceProductDetailLog.info('Marketplace Product Detail init() called, ID:', this.productId);
|
||||
|
||||
// Guard against multiple initialization
|
||||
@@ -219,10 +222,10 @@ function adminMarketplaceProductDetail() {
|
||||
if (!text) return;
|
||||
try {
|
||||
await navigator.clipboard.writeText(text);
|
||||
Utils.showToast('Copied to clipboard', 'success');
|
||||
Utils.showToast(I18n.t('marketplace.messages.copied_to_clipboard'), 'success');
|
||||
} catch (err) {
|
||||
adminMarketplaceProductDetailLog.error('Failed to copy to clipboard:', err);
|
||||
Utils.showToast('Failed to copy to clipboard', 'error');
|
||||
Utils.showToast(I18n.t('marketplace.messages.failed_to_copy_to_clipboard'), 'error');
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@@ -11,7 +11,7 @@ from pathlib import Path
|
||||
|
||||
from app.core.celery_config import celery_app
|
||||
from app.modules.task_base import ModuleTask
|
||||
from models.database.vendor import Vendor
|
||||
from app.modules.tenancy.models import Vendor
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ from app.modules.marketplace.services.letzshop import (
|
||||
)
|
||||
from app.modules.task_base import ModuleTask
|
||||
from app.utils.csv_processor import CSVProcessor
|
||||
from models.database.vendor import Vendor
|
||||
from app.modules.tenancy.models import Vendor
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
{# Letzshop Vendor Finder Page #}
|
||||
{% extends "public/base.html" %}
|
||||
|
||||
{% block title %}{{ _("platform.find_shop.title") }} - Wizamart{% endblock %}
|
||||
{% block title %}{{ _("cms.platform.find_shop.title") }} - Wizamart{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div x-data="vendorFinderData()" class="py-16 lg:py-24">
|
||||
@@ -10,10 +10,10 @@
|
||||
{# Header #}
|
||||
<div class="text-center mb-12">
|
||||
<h1 class="text-4xl md:text-5xl font-bold text-gray-900 dark:text-white mb-4">
|
||||
{{ _("platform.find_shop.title") }}
|
||||
{{ _("cms.platform.find_shop.title") }}
|
||||
</h1>
|
||||
<p class="text-xl text-gray-600 dark:text-gray-400">
|
||||
{{ _("platform.find_shop.subtitle") }}
|
||||
{{ _("cms.platform.find_shop.subtitle") }}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
type="text"
|
||||
x-model="searchQuery"
|
||||
@keyup.enter="lookupVendor()"
|
||||
placeholder="{{ _('platform.find_shop.search_placeholder') }}"
|
||||
placeholder="{{ _('cms.platform.find_shop.search_placeholder') }}"
|
||||
class="flex-1 px-4 py-3 rounded-xl border border-gray-300 dark:border-gray-600 bg-gray-50 dark:bg-gray-900 text-gray-900 dark:text-white placeholder-gray-400 focus:ring-2 focus:ring-indigo-500 focus:border-transparent"
|
||||
/>
|
||||
<button
|
||||
@@ -38,14 +38,14 @@
|
||||
</svg>
|
||||
</template>
|
||||
<template x-if="!loading">
|
||||
<span>{{ _("platform.find_shop.search_button") }}</span>
|
||||
<span>{{ _("cms.platform.find_shop.search_button") }}</span>
|
||||
</template>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{# Examples #}
|
||||
<div class="mt-4 text-sm text-gray-500 dark:text-gray-400">
|
||||
<strong>{{ _("platform.find_shop.examples") }}</strong>
|
||||
<strong>{{ _("cms.platform.find_shop.examples") }}</strong>
|
||||
<ul class="list-disc list-inside mt-1">
|
||||
<li>https://letzshop.lu/vendors/my-shop</li>
|
||||
<li>letzshop.lu/vendors/my-shop</li>
|
||||
@@ -61,7 +61,7 @@
|
||||
<div class="p-8">
|
||||
<div class="flex items-start justify-between">
|
||||
<div>
|
||||
<p class="text-sm text-green-600 font-medium mb-1">{{ _("platform.find_shop.found") }}</p>
|
||||
<p class="text-sm text-green-600 font-medium mb-1">{{ _("cms.platform.find_shop.found") }}</p>
|
||||
<h2 class="text-2xl font-bold text-gray-900 dark:text-white" x-text="result.vendor.name"></h2>
|
||||
<a :href="result.vendor.letzshop_url" target="_blank"
|
||||
class="text-indigo-600 dark:text-indigo-400 hover:underline mt-1 inline-block"
|
||||
@@ -82,15 +82,15 @@
|
||||
<template x-if="!result.vendor.is_claimed">
|
||||
<a :href="'/signup?letzshop=' + result.vendor.slug"
|
||||
class="px-8 py-3 bg-green-600 hover:bg-green-700 text-white font-semibold rounded-xl transition-colors">
|
||||
{{ _("platform.find_shop.claim_button") }}
|
||||
{{ _("cms.platform.find_shop.claim_button") }}
|
||||
</a>
|
||||
</template>
|
||||
<template x-if="result.vendor.is_claimed">
|
||||
<div class="px-6 py-3 bg-gray-100 dark:bg-gray-700 text-gray-600 dark:text-gray-400 rounded-xl">
|
||||
<span class="inline-flex items-center">
|
||||
<span class="text-yellow-500 mr-2">{{ _("platform.find_shop.claimed_badge") }}</span>
|
||||
<span class="text-yellow-500 mr-2">{{ _("cms.platform.find_shop.claimed_badge") }}</span>
|
||||
</span>
|
||||
{{ _("platform.find_shop.already_claimed") }}
|
||||
{{ _("cms.platform.find_shop.already_claimed") }}
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
@@ -102,12 +102,12 @@
|
||||
<svg class="w-16 h-16 text-gray-400 mx-auto mb-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9.172 16.172a4 4 0 015.656 0M9 10h.01M15 10h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"/>
|
||||
</svg>
|
||||
<h3 class="text-xl font-semibold text-gray-900 dark:text-white mb-2">{{ _("platform.find_shop.not_found") }}</h3>
|
||||
<p class="text-gray-600 dark:text-gray-400" x-text="result.error || '{{ _("platform.find_shop.not_found") }}'"></p>
|
||||
<h3 class="text-xl font-semibold text-gray-900 dark:text-white mb-2">{{ _("cms.platform.find_shop.not_found") }}</h3>
|
||||
<p class="text-gray-600 dark:text-gray-400" x-text="result.error || '{{ _("cms.platform.find_shop.not_found") }}'"></p>
|
||||
|
||||
<div class="mt-6">
|
||||
<a href="/signup" class="text-indigo-600 dark:text-indigo-400 hover:underline">
|
||||
{{ _("platform.find_shop.or_signup") }} →
|
||||
{{ _("cms.platform.find_shop.or_signup") }} →
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
@@ -117,18 +117,18 @@
|
||||
|
||||
{# Help Section #}
|
||||
<div class="mt-12 text-center">
|
||||
<h3 class="text-lg font-semibold text-gray-900 dark:text-white mb-4">{{ _("platform.find_shop.need_help") }}</h3>
|
||||
<h3 class="text-lg font-semibold text-gray-900 dark:text-white mb-4">{{ _("cms.platform.find_shop.need_help") }}</h3>
|
||||
<p class="text-gray-600 dark:text-gray-400 mb-4">
|
||||
{{ _("platform.find_shop.no_account_yet") }}
|
||||
{{ _("cms.platform.find_shop.no_account_yet") }}
|
||||
</p>
|
||||
<div class="flex flex-col sm:flex-row gap-4 justify-center">
|
||||
<a href="https://letzshop.lu" target="_blank"
|
||||
class="px-6 py-3 bg-white dark:bg-gray-800 border border-gray-300 dark:border-gray-600 text-gray-700 dark:text-gray-300 font-medium rounded-xl hover:bg-gray-50 dark:hover:bg-gray-700 transition-colors">
|
||||
{{ _("platform.find_shop.create_letzshop") }}
|
||||
{{ _("cms.platform.find_shop.create_letzshop") }}
|
||||
</a>
|
||||
<a href="/signup"
|
||||
class="px-6 py-3 bg-indigo-600 hover:bg-indigo-700 text-white font-medium rounded-xl transition-colors">
|
||||
{{ _("platform.find_shop.signup_without") }}
|
||||
{{ _("cms.platform.find_shop.signup_without") }}
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user