QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-18 22:00:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/develop' into develop

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2024-08-25 14:18:04 +02:00
parent a916e8a0cb a56f560036
commit 1eaac9d691
5 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/server/src/database/seeds/core/20200810121809_seed_settings.ts
View File

@@ -15,6 +15,7 @@ export default class SeedSettings extends TenantSeeder {
// Manual journals settings. // Manual journals settings.
{ group: 'manual_journals', key: 'next_number', value: '00001' }, { group: 'manual_journals', key: 'next_number', value: '00001' },
{ group: 'manual_journals', key: 'number_prefix', value: 'J-' },
{ group: 'manual_journals', key: 'auto_increment', value: true }, { group: 'manual_journals', key: 'auto_increment', value: true },
// Sale invoices settings. // Sale invoices settings.

10
packages/webapp/src/constants/preferencesMenu.tsx
View File

@@ -54,9 +54,9 @@ export default [
disabled: false, disabled: false,
href: '/preferences/items', href: '/preferences/items',
}, },
{ // {
text: <T id={'sms_integration.label'} />, // text: <T id={'sms_integration.label'} />,
disabled: false, // disabled: false,
href: '/preferences/sms-message', // href: '/preferences/sms-message',
}, // },
]; ];

12
packages/webapp/src/containers/Setup/SetupLeftSection.module.scss
View File

@@ -2,9 +2,9 @@
width: 100%; width: 100%;
margin-bottom: 2rem; margin-bottom: 2rem;
background: transparent; background: transparent;
color: rgba(255, 255, 255, 0.75); color: rgba(255, 255, 255, 0.6);
border: 1px solid rgb(255, 255, 255, 0.3); border: 1px solid rgb(255, 255, 255, 0.2);
padding: 10px; padding: 8px;
font-size: 13px; font-size: 13px;
font-weight: 500; font-weight: 500;
border-radius: 5px; border-radius: 5px;
@@ -12,11 +12,11 @@
transition: border 0.15s ease-in-out, color 0.15s ease-in-out; transition: border 0.15s ease-in-out, color 0.15s ease-in-out;
&:hover { &:hover {
color: rgba(255, 255, 255, 0.95); color: rgba(255, 255, 255, 0.7);
border: 1px solid rgb(255, 255, 255, 0.6); border: 1px solid rgb(255, 255, 255, 0.3);
} }
} }
.demoButtonLabel{ .demoButtonLabel{
color: rgba(255, 255, 255, 0.75); color: rgba(255, 255, 255, 0.5);
font-size: 13px; font-size: 13px;
} }

12
packages/webapp/src/routes/preferences.tsx
View File

@@ -6,7 +6,7 @@ import Roles from '../containers/Preferences/Users/Roles/RolesForm/RolesFormPage
import Accountant from '@/containers/Preferences/Accountant/Accountant'; import Accountant from '@/containers/Preferences/Accountant/Accountant';
import Currencies from '@/containers/Preferences/Currencies/Currencies'; import Currencies from '@/containers/Preferences/Currencies/Currencies';
import Item from '@/containers/Preferences/Item'; 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 DefaultRoute from '../containers/Preferences/DefaultRoute';
import Warehouses from '../containers/Preferences/Warehouses'; import Warehouses from '../containers/Preferences/Warehouses';
import Branches from '../containers/Preferences/Branches'; import Branches from '../containers/Preferences/Branches';
@@ -85,11 +85,11 @@ export default [
component: Item, component: Item,
exact: true, exact: true,
}, },
{ // {
path: `${BASE_URL}/sms-message`, // path: `${BASE_URL}/sms-message`,
component: SMSIntegration, // component: SMSIntegration,
exact: true, // exact: true,
}, // },
{ {
path: `${BASE_URL}/billing`, path: `${BASE_URL}/billing`,
component: BillingPage, component: BillingPage,

4
packages/webapp/src/style/pages/Setup/SetupPage.scss
View File

@@ -72,10 +72,10 @@
&__text { &__text {
font-size: 18px; font-size: 18px;
opacity: 0.75; opacity: 0.55;
margin-bottom: 10px; margin-bottom: 10px;
font-weight: 200; font-weight: 200;
} }
&__organization { &__organization {
font-size: 16px; font-size: 16px;