From 42d40620ec4623d49a1c3368a47b8b9bd99a9bed Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Sun, 25 Aug 2024 13:05:28 +0200 Subject: [PATCH 1/3] fix: add prefix J-00001 to manual journals increments --- .../src/database/seeds/core/20200810121809_seed_settings.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/server/src/database/seeds/core/20200810121809_seed_settings.ts b/packages/server/src/database/seeds/core/20200810121809_seed_settings.ts index 534c4b584..8e05b291d 100644 --- a/packages/server/src/database/seeds/core/20200810121809_seed_settings.ts +++ b/packages/server/src/database/seeds/core/20200810121809_seed_settings.ts @@ -15,6 +15,7 @@ export default class SeedSettings extends TenantSeeder { // Manual journals settings. { group: 'manual_journals', key: 'next_number', value: '00001' }, + { group: 'manual_journals', key: 'number_prefix', value: 'J-' }, { group: 'manual_journals', key: 'auto_increment', value: true }, // Sale invoices settings. From 768297f13799a4bead35186aafb7dd61dfe9a6c4 Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Sun, 25 Aug 2024 13:07:07 +0200 Subject: [PATCH 2/3] fix: Disable sms service until Twilo integration --- packages/webapp/src/constants/preferencesMenu.tsx | 10 +++++----- packages/webapp/src/routes/preferences.tsx | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/webapp/src/constants/preferencesMenu.tsx b/packages/webapp/src/constants/preferencesMenu.tsx index 4ff6ef989..1fc17eff2 100644 --- a/packages/webapp/src/constants/preferencesMenu.tsx +++ b/packages/webapp/src/constants/preferencesMenu.tsx @@ -54,9 +54,9 @@ export default [ disabled: false, href: '/preferences/items', }, - { - text: , - disabled: false, - href: '/preferences/sms-message', - }, + // { + // text: , + // disabled: false, + // href: '/preferences/sms-message', + // }, ]; diff --git a/packages/webapp/src/routes/preferences.tsx b/packages/webapp/src/routes/preferences.tsx index 7b72b5544..58f69f77f 100644 --- a/packages/webapp/src/routes/preferences.tsx +++ b/packages/webapp/src/routes/preferences.tsx @@ -6,7 +6,7 @@ import Roles from '../containers/Preferences/Users/Roles/RolesForm/RolesFormPage import Accountant from '@/containers/Preferences/Accountant/Accountant'; import Currencies from '@/containers/Preferences/Currencies/Currencies'; import Item from '@/containers/Preferences/Item'; -import SMSIntegration from '../containers/Preferences/SMSIntegration'; +// import SMSIntegration from '../containers/Preferences/SMSIntegration'; import DefaultRoute from '../containers/Preferences/DefaultRoute'; import Warehouses from '../containers/Preferences/Warehouses'; import Branches from '../containers/Preferences/Branches'; @@ -85,11 +85,11 @@ export default [ component: Item, exact: true, }, - { - path: `${BASE_URL}/sms-message`, - component: SMSIntegration, - exact: true, - }, + // { + // path: `${BASE_URL}/sms-message`, + // component: SMSIntegration, + // exact: true, + // }, { path: `${BASE_URL}/billing`, component: BillingPage, From 670136916f392866cb4a90c4958efa700f24dfe1 Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Sun, 25 Aug 2024 13:19:16 +0200 Subject: [PATCH 3/3] fix: Style tweaks in onboarding page --- .../containers/Setup/SetupLeftSection.module.scss | 12 ++++++------ packages/webapp/src/style/pages/Setup/SetupPage.scss | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/webapp/src/containers/Setup/SetupLeftSection.module.scss b/packages/webapp/src/containers/Setup/SetupLeftSection.module.scss index e30df69ce..a75c87a2e 100644 --- a/packages/webapp/src/containers/Setup/SetupLeftSection.module.scss +++ b/packages/webapp/src/containers/Setup/SetupLeftSection.module.scss @@ -2,9 +2,9 @@ width: 100%; margin-bottom: 2rem; background: transparent; - color: rgba(255, 255, 255, 0.75); - border: 1px solid rgb(255, 255, 255, 0.3); - padding: 10px; + color: rgba(255, 255, 255, 0.6); + border: 1px solid rgb(255, 255, 255, 0.2); + padding: 8px; font-size: 13px; font-weight: 500; border-radius: 5px; @@ -12,11 +12,11 @@ transition: border 0.15s ease-in-out, color 0.15s ease-in-out; &:hover { - color: rgba(255, 255, 255, 0.95); - border: 1px solid rgb(255, 255, 255, 0.6); + color: rgba(255, 255, 255, 0.7); + border: 1px solid rgb(255, 255, 255, 0.3); } } .demoButtonLabel{ - color: rgba(255, 255, 255, 0.75); + color: rgba(255, 255, 255, 0.5); font-size: 13px; } \ No newline at end of file diff --git a/packages/webapp/src/style/pages/Setup/SetupPage.scss b/packages/webapp/src/style/pages/Setup/SetupPage.scss index 2bfa0bfe4..d594aab2e 100644 --- a/packages/webapp/src/style/pages/Setup/SetupPage.scss +++ b/packages/webapp/src/style/pages/Setup/SetupPage.scss @@ -72,10 +72,10 @@ &__text { font-size: 18px; - opacity: 0.75; + opacity: 0.55; margin-bottom: 10px; font-weight: 200; - } + } &__organization { font-size: 16px;