Skip to content

Commit

Permalink
Merge pull request #91 from vtex-apps/feature/show-modal
Browse files Browse the repository at this point in the history
Added modal, Sellers and UI Settings
  • Loading branch information
arturmagalhaesjr authored Feb 9, 2023
2 parents 1c24049 + f2f146c commit e6e972c
Show file tree
Hide file tree
Showing 41 changed files with 1,078 additions and 165 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

### Added

- Modal to switch the company rather than AutoComplete component
- Handle the sellers on the Organization Details
- Handle the UI settings (modal, clear cart and auto approve)


## [1.19.2] - 2023-02-07

### Fixed
Expand Down
12 changes: 11 additions & 1 deletion messages/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@
"admin/b2b-organizations.organization-settings-select.toast.update-failure": "فشل تحديث الارتباط. راجع وحدة التحكم للحصول على التفاصيل.",
"admin/b2b-organizations.organization-settings-select.remove-from-binding": "إزالة من الربط",
"admin/b2b-organizations.organization-settings-select.add-to-binding": "إضافة إلى الربط",
"admin/b2b-organizations.organization-settings-autoApprove": "Approve new Organizations automatically",
"admin/b2b-organizations.organization-settings-showModal": "Use modal to switch company",
"admin/b2b-organizations.organization-settings-clearCart": "Clear cart when switching company or logging in",
"admin/b2b-organizations.organizations-admin.table.column-name.title": "الإسم",
"admin/b2b-organizations.organizations-admin.table.column-status.title": "الحالة",
"admin/b2b-organizations.organizations-admin.table.view.label": "عرض",
Expand Down Expand Up @@ -114,6 +117,7 @@
"admin/b2b-organizations.organization-details.sales-admin-title": "إدارة مستخدمي المبيعات",
"admin/b2b-organizations.organization-details.default": "عــام",
"admin/b2b-organizations.organization-details.organization-name-required": "اسم المؤسسة مطلوب.",
"admin/b2b-organizations.organization-details.sellers": "Sellers",
"admin/b2b-organizations.costCenter-details.toast.update-success": "تم تحديث مركز التكلفة بنجاح",
"admin/b2b-organizations.costCenter-details.toast.update-failure": "فشل التحديث. راجع وحدة التحكم للحصول على التفاصيل.",
"admin/b2b-organizations.costCenter-details.toast.delete-failure": "فشل الحذف. راجع وحدة التحكم للحصول على التفاصيل.",
Expand Down Expand Up @@ -296,5 +300,11 @@
"store/b2b-organizations.stop-impersonation": "إيقاف تعيين المستخدم",
"store/b2b-organizations.stop-impersonation-error": "خطأ في إيقاف تعيين المستخدم. راجع وحدة التحكم للحصول على التفاصيل.",
"store/b2b-organizations.set-current-organization": "تعيين المنظمة الحالية",
"store/b2b-organizations.set-organization-error": "خطأ في إعداد المنظمة الحالية. راجع وحدة التحكم للحصول على التفاصيل."
"store/b2b-organizations.set-organization-error": "خطأ في إعداد المنظمة الحالية. راجع وحدة التحكم للحصول على التفاصيل.",
"store/b2b-organizations.modal.select-company": "Select the company",
"store/b2b-organizations.modal.search": "Search",
"store/b2b-organizations.modal.join": "Join",
"store/b2b-organizations.change-organization": "Change Organization",
"store/b2b-organizations.current-organization": "Current Organization",
"store/b2b-organizations.organizations-found": "Organizations Found"
}
12 changes: 11 additions & 1 deletion messages/bg.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@
"admin/b2b-organizations.organization-settings-select.toast.update-failure": "Неуспешна актуализация на обвързванията. Вижте конзолата за подробности.",
"admin/b2b-organizations.organization-settings-select.remove-from-binding": "Премахване от обвързване",
"admin/b2b-organizations.organization-settings-select.add-to-binding": "Добавяне към обвързване",
"admin/b2b-organizations.organization-settings-autoApprove": "Approve new Organizations automatically",
"admin/b2b-organizations.organization-settings-showModal": "Use modal to switch company",
"admin/b2b-organizations.organization-settings-clearCart": "Clear cart when switching company or logging in",
"admin/b2b-organizations.organizations-admin.table.column-name.title": "Име",
"admin/b2b-organizations.organizations-admin.table.column-status.title": "Статус",
"admin/b2b-organizations.organizations-admin.table.view.label": "Изглед",
Expand Down Expand Up @@ -114,6 +117,7 @@
"admin/b2b-organizations.organization-details.sales-admin-title": "Управление на потребители на продажби",
"admin/b2b-organizations.organization-details.default": "Общ",
"admin/b2b-organizations.organization-details.organization-name-required": "Името на организацията е задължително.",
"admin/b2b-organizations.organization-details.sellers": "Sellers",
"admin/b2b-organizations.costCenter-details.toast.update-success": "Разходният център е актуализиран успешно",
"admin/b2b-organizations.costCenter-details.toast.update-failure": "Неуспешно актуализиране. Вижте конзолата за подробности.",
"admin/b2b-organizations.costCenter-details.toast.delete-failure": "Неуспешно изтриване. Вижте конзолата за подробности.",
Expand Down Expand Up @@ -296,5 +300,11 @@
"store/b2b-organizations.stop-impersonation": "Спиране на въплъщаването",
"store/b2b-organizations.stop-impersonation-error": "Грешка при спиране на въплъщаването. Вижте конзолата за подробности.",
"store/b2b-organizations.set-current-organization": "Задаване на текуща организация",
"store/b2b-organizations.set-organization-error": "Грешка при задаването на текуща организация. Вижте конзолата за подробности."
"store/b2b-organizations.set-organization-error": "Грешка при задаването на текуща организация. Вижте конзолата за подробности.",
"store/b2b-organizations.modal.select-company": "Select the company",
"store/b2b-organizations.modal.search": "Search",
"store/b2b-organizations.modal.join": "Join",
"store/b2b-organizations.change-organization": "Change Organization",
"store/b2b-organizations.current-organization": "Current Organization",
"store/b2b-organizations.organizations-found": "Organizations Found"
}
12 changes: 11 additions & 1 deletion messages/ca.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@
"admin/b2b-organizations.organization-settings-select.toast.update-failure": "No s'han pogut actualitzar les vinculacions. Per obtenir més informació, aneu a la consola.",
"admin/b2b-organizations.organization-settings-select.remove-from-binding": "Suprimeix-ho de la vinculació",
"admin/b2b-organizations.organization-settings-select.add-to-binding": "Afegeix-ho a la vinculació",
"admin/b2b-organizations.organization-settings-autoApprove": "Approve new Organizations automatically",
"admin/b2b-organizations.organization-settings-showModal": "Use modal to switch company",
"admin/b2b-organizations.organization-settings-clearCart": "Clear cart when switching company or logging in",
"admin/b2b-organizations.organizations-admin.table.column-name.title": "Nom",
"admin/b2b-organizations.organizations-admin.table.column-status.title": "Estat",
"admin/b2b-organizations.organizations-admin.table.view.label": "Mostra-ho",
Expand Down Expand Up @@ -114,6 +117,7 @@
"admin/b2b-organizations.organization-details.sales-admin-title": "Gestiona els usuaris de vendes",
"admin/b2b-organizations.organization-details.default": "General",
"admin/b2b-organizations.organization-details.organization-name-required": "El nom de l'organització és obligatori.",
"admin/b2b-organizations.organization-details.sellers": "Sellers",
"admin/b2b-organizations.costCenter-details.toast.update-success": "S'ha actualitzat correctament el centre de costs",
"admin/b2b-organizations.costCenter-details.toast.update-failure": "S'ha produït un error en fer l'actualització. Per obtenir-ne més informació, consulteu la consola.",
"admin/b2b-organizations.costCenter-details.toast.delete-failure": "S'ha produït un error en fer la supressió. Per obtenir-ne més informació, consulteu la consola.",
Expand Down Expand Up @@ -296,5 +300,11 @@
"store/b2b-organizations.stop-impersonation": "Atura la suplantació",
"store/b2b-organizations.stop-impersonation-error": "S'ha produït un error en aturar la suplantació. Per obtenir-ne més informació, consulteu la consola.",
"store/b2b-organizations.set-current-organization": "Estableix l'empresa actual",
"store/b2b-organizations.set-organization-error": "S'ha produït un error en establir l'empresa actual. Per obtenir més informació, aneu a la consola."
"store/b2b-organizations.set-organization-error": "S'ha produït un error en establir l'empresa actual. Per obtenir més informació, aneu a la consola.",
"store/b2b-organizations.modal.select-company": "Select the company",
"store/b2b-organizations.modal.search": "Search",
"store/b2b-organizations.modal.join": "Join",
"store/b2b-organizations.change-organization": "Change Organization",
"store/b2b-organizations.current-organization": "Current Organization",
"store/b2b-organizations.organizations-found": "Organizations Found"
}
12 changes: 11 additions & 1 deletion messages/context.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@
"admin/b2b-organizations.organization-settings-select.toast.update-failure": "admin/b2b-organizations.organization-settings-select.toast.update-failure",
"admin/b2b-organizations.organization-settings-select.remove-from-binding": "admin/b2b-organizations.organization-settings-select.remove-from-binding",
"admin/b2b-organizations.organization-settings-select.add-to-binding": "admin/b2b-organizations.organization-settings-select.add-to-binding",
"admin/b2b-organizations.organization-settings-autoApprove": "admin/b2b-organizations.organization-settings-autoApprove",
"admin/b2b-organizations.organization-settings-showModal": "admin/b2b-organizations.organization-settings-showModal",
"admin/b2b-organizations.organization-settings-clearCart": "admin/b2b-organizations.organization-settings-clearCart",
"admin/b2b-organizations.organizations-admin.table.column-name.title": "admin/b2b-organizations.organizations-admin.table.column-name.title",
"admin/b2b-organizations.organizations-admin.table.column-status.title": "admin/b2b-organizations.organizations-admin.table.column-status.title",
"admin/b2b-organizations.organizations-admin.table.view.label": "admin/b2b-organizations.organizations-admin.table.view.label",
Expand Down Expand Up @@ -114,6 +117,7 @@
"admin/b2b-organizations.organization-details.sales-admin-title": "admin/b2b-organizations.sales-admin-title",
"admin/b2b-organizations.organization-details.default": "admin/b2b-organizations.organization-details.default",
"admin/b2b-organizations.organization-details.organization-name-required": "admin/b2b-organizations.organization-details.organization-name-required",
"admin/b2b-organizations.organization-details.sellers": "admin/b2b-organizations.organization-details.sellers",
"admin/b2b-organizations.costCenter-details.toast.update-success": "admin/b2b-organizations.costCenter-details.toast.update-success",
"admin/b2b-organizations.costCenter-details.toast.update-failure": "admin/b2b-organizations.costCenter-details.toast.update-failure",
"admin/b2b-organizations.costCenter-details.toast.delete-failure": "admin/b2b-organizations.costCenter-details.toast.delete-failure",
Expand Down Expand Up @@ -296,5 +300,11 @@
"store/b2b-organizations.stop-impersonation": "store/b2b-organizations.stop-impersonation",
"store/b2b-organizations.stop-impersonation-error": "store/b2b-organizations.stop-impersonation-error",
"store/b2b-organizations.set-current-organization": "store/b2b-organizations.set-current-organization",
"store/b2b-organizations.set-organization-error": "store/b2b-organizations.set-organization-error"
"store/b2b-organizations.set-organization-error": "store/b2b-organizations.set-organization-error",
"store/b2b-organizations.modal.select-company": "store/b2b-organizations.modal.select-company",
"store/b2b-organizations.modal.search": "store/b2b-organizations.modal.search",
"store/b2b-organizations.modal.join": "store/b2b-organizations.modal.join",
"store/b2b-organizations.change-organization": "store/b2b-organizations.change-organization",
"store/b2b-organizations.current-organization": "store/b2b-organizations.current-organization",
"store/b2b-organizations.organizations-found": "store/b2b-organizations.organizations-found"
}
12 changes: 11 additions & 1 deletion messages/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@
"admin/b2b-organizations.organization-settings-select.toast.update-failure": "Aktualizace vazeb se nezdařila. Podrobnosti naleznete v konzoli.",
"admin/b2b-organizations.organization-settings-select.remove-from-binding": "Odstranit z vazby",
"admin/b2b-organizations.organization-settings-select.add-to-binding": "Přidat do vazby",
"admin/b2b-organizations.organization-settings-autoApprove": "Approve new Organizations automatically",
"admin/b2b-organizations.organization-settings-showModal": "Use modal to switch company",
"admin/b2b-organizations.organization-settings-clearCart": "Clear cart when switching company or logging in",
"admin/b2b-organizations.organizations-admin.table.column-name.title": "Název",
"admin/b2b-organizations.organizations-admin.table.column-status.title": "Stav",
"admin/b2b-organizations.organizations-admin.table.view.label": "Zobrazit",
Expand Down Expand Up @@ -114,6 +117,7 @@
"admin/b2b-organizations.organization-details.sales-admin-title": "Spravovat prodejní uživatele",
"admin/b2b-organizations.organization-details.default": "Obecné",
"admin/b2b-organizations.organization-details.organization-name-required": "Název organizace je povinný.",
"admin/b2b-organizations.organization-details.sellers": "Sellers",
"admin/b2b-organizations.costCenter-details.toast.update-success": "Nákladové středisko úspěšně aktualizováno",
"admin/b2b-organizations.costCenter-details.toast.update-failure": "Aktualizace selhala. Podrobnosti naleznete v konzoli.",
"admin/b2b-organizations.costCenter-details.toast.delete-failure": "Smazání selhalo. Podrobnosti naleznete v konzoli.",
Expand Down Expand Up @@ -296,5 +300,11 @@
"store/b2b-organizations.stop-impersonation": "Přestat se vydávat za jiného uživatele",
"store/b2b-organizations.stop-impersonation-error": "Zastavení vydávání se za jiného uživatele selhalo. Podrobnosti naleznete v konzoli.",
"store/b2b-organizations.set-current-organization": "Nastavit aktuální organizaci",
"store/b2b-organizations.set-organization-error": "Chyba nastavení aktuální organizace. Podrobnosti naleznete v konzoli."
"store/b2b-organizations.set-organization-error": "Chyba nastavení aktuální organizace. Podrobnosti naleznete v konzoli.",
"store/b2b-organizations.modal.select-company": "Select the company",
"store/b2b-organizations.modal.search": "Search",
"store/b2b-organizations.modal.join": "Join",
"store/b2b-organizations.change-organization": "Change Organization",
"store/b2b-organizations.current-organization": "Current Organization",
"store/b2b-organizations.organizations-found": "Organizations Found"
}
12 changes: 11 additions & 1 deletion messages/da.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@
"admin/b2b-organizations.organization-settings-select.toast.update-failure": "Opdatering af bindinger mislykkedes. Se konsollen for detaljer.",
"admin/b2b-organizations.organization-settings-select.remove-from-binding": "Fjern fra bindingen",
"admin/b2b-organizations.organization-settings-select.add-to-binding": "Føj til binding",
"admin/b2b-organizations.organization-settings-autoApprove": "Approve new Organizations automatically",
"admin/b2b-organizations.organization-settings-showModal": "Use modal to switch company",
"admin/b2b-organizations.organization-settings-clearCart": "Clear cart when switching company or logging in",
"admin/b2b-organizations.organizations-admin.table.column-name.title": "Navn",
"admin/b2b-organizations.organizations-admin.table.column-status.title": "Status",
"admin/b2b-organizations.organizations-admin.table.view.label": "Vis",
Expand Down Expand Up @@ -114,6 +117,7 @@
"admin/b2b-organizations.organization-details.sales-admin-title": "Administrer Salgsbrugere",
"admin/b2b-organizations.organization-details.default": "Generelt",
"admin/b2b-organizations.organization-details.organization-name-required": "Organisationens navn er påkrævet.",
"admin/b2b-organizations.organization-details.sellers": "Sellers",
"admin/b2b-organizations.costCenter-details.toast.update-success": "Omkostningscenter opdateret med succes",
"admin/b2b-organizations.costCenter-details.toast.update-failure": "Opdatering mislykkedes. Se konsollen for detaljer.",
"admin/b2b-organizations.costCenter-details.toast.delete-failure": "Sletning mislykkedes. Se konsollen for detaljer.",
Expand Down Expand Up @@ -296,5 +300,11 @@
"store/b2b-organizations.stop-impersonation": "Stop efterligning",
"store/b2b-organizations.stop-impersonation-error": "Fejl med at stoppe efterligning. Se konsol for detaljer.",
"store/b2b-organizations.set-current-organization": "Indstil den nuværende organisation",
"store/b2b-organizations.set-organization-error": "Fejl ved indstilling af nuværende organisation. Se konsol for detaljer."
"store/b2b-organizations.set-organization-error": "Fejl ved indstilling af nuværende organisation. Se konsol for detaljer.",
"store/b2b-organizations.modal.select-company": "Select the company",
"store/b2b-organizations.modal.search": "Search",
"store/b2b-organizations.modal.join": "Join",
"store/b2b-organizations.change-organization": "Change Organization",
"store/b2b-organizations.current-organization": "Current Organization",
"store/b2b-organizations.organizations-found": "Organizations Found"
}
Loading

0 comments on commit e6e972c

Please sign in to comment.