diff --git a/README.md b/README.md index 6df207d..fb3a58b 100644 --- a/README.md +++ b/README.md @@ -59,13 +59,14 @@ Check out the [deployment documentation](https://nuxt.com/docs/getting-started/d A browser-based application for Bitrix24. ## Required Scopes + The following permissions must be enabled in the application settings: * `crm` — access to CRM entities. * `user_brief` — access to basic user profile data. ## Configuration -When registering the application in the Bitrix24 Partner Portal or as a local app, use the following endpoints: +When registering the application in the Bitrix24 Partner Portal or as a local app, use the following endpoints: | Parameter | URL | | :--- | :--- | @@ -73,8 +74,9 @@ When registering the application in the Bitrix24 Partner Portal or as a local ap | **Installation URL** | `https://your-app.example.com/install` | ## Getting Started -1. Open your **Bitrix24 account**. -2. Go to **Applications** -> **Add Application**. + +1. Open your **Bitrix24**. +2. Go to **Applications** -> **Add Application** 3. Select **Local Application** 4. Fill in the URLs provided above and check the required **Scopes**. 5. Click **Save** and open the app. diff --git a/app/components/home/HomeChart.client.vue b/app/components/home/HomeChart.client.vue index 56b768a..560f5cc 100644 --- a/app/components/home/HomeChart.client.vue +++ b/app/components/home/HomeChart.client.vue @@ -36,7 +36,7 @@ const xTicks = (i: number) => { } const isOneCurrency = computed(() => { - return currencyListData.value.length < 2 + return currencyListData.value.length === 1 }) const firstCurrency = computed(() => { diff --git a/app/composables/useDealStats/api.ts b/app/composables/useDealStats/api.ts index 68c6117..104f228 100644 --- a/app/composables/useDealStats/api.ts +++ b/app/composables/useDealStats/api.ts @@ -40,7 +40,7 @@ const mapStatus: Record = { * @param b24 - B24Frame instance for executing queries * @param start - Interval start (time is set to 00:00:00) * @param end - Interval end (time is set to 23:59:59) - * @param defLocale - Default locale + * @param defaultCurrency - Default locale * @param cb - Optional callback called after processing each page of data * @returns Object with aggregated deal data * diff --git a/app/composables/useDealStats/index.ts b/app/composables/useDealStats/index.ts index 321de69..6901482 100644 --- a/app/composables/useDealStats/index.ts +++ b/app/composables/useDealStats/index.ts @@ -30,11 +30,15 @@ const _useDealStats = () => { const { locale } = useI18n() const range = shallowRef({ - start: sub(new Date(), { days: 7 }), + start: sub(new Date(), { months: 6 }), end: new Date() }) - const period = ref('daily') + /** + * @see periodsData + * @see app/components/home/HomeDateRangePicker.vue:14 + */ + const period = ref('weekly') const stats = ref([]) const chart = ref([]) const sales = ref([]) diff --git a/package.json b/package.json index 77060bf..863aac7 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,8 @@ "dependencies": { "@bitrix24/b24icons-vue": "^2.0.7", "@bitrix24/b24ui-nuxt": "^2.5.2", - "@bitrix24/b24jssdk": "^1.0.4", - "@bitrix24/b24jssdk-nuxt": "^1.0.4", + "@bitrix24/b24jssdk": "^1.0.5", + "@bitrix24/b24jssdk-nuxt": "^1.0.5", "@internationalized/date": "^3.12.0", "@tanstack/table-core": "^8.21.3", "@tanstack/vue-table": "^8.21.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 930df52..26109b0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,11 +12,11 @@ importers: specifier: ^2.0.7 version: 2.0.7(vue@3.5.30(typescript@6.0.2)) '@bitrix24/b24jssdk': - specifier: ^1.0.4 - version: 1.0.4 + specifier: ^1.0.5 + version: 1.0.5 '@bitrix24/b24jssdk-nuxt': - specifier: ^1.0.4 - version: 1.0.4(magicast@0.5.2) + specifier: ^1.0.5 + version: 1.0.5(magicast@0.5.2) '@bitrix24/b24ui-nuxt': specifier: ^2.5.2 version: 2.5.2(@tiptap/extensions@3.20.4(@tiptap/core@3.20.4(@tiptap/pm@3.20.4))(@tiptap/pm@3.20.4))(@tiptap/y-tiptap@3.0.2(prosemirror-model@1.25.4)(prosemirror-state@1.4.4)(prosemirror-view@1.41.7)(y-protocols@1.0.7(yjs@13.6.30))(yjs@13.6.30))(axios@1.13.6)(change-case@5.4.4)(embla-carousel@8.6.0)(magicast@0.5.2)(tailwindcss@4.2.2)(typescript@6.0.2)(vite@7.3.1(@types/node@25.5.0)(jiti@2.6.1)(lightningcss@1.32.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.2))(vue-router@4.6.4(vue@3.5.30(typescript@6.0.2)))(vue@3.5.30(typescript@6.0.2))(yjs@13.6.30)(zod@4.3.6) @@ -244,11 +244,11 @@ packages: peerDependencies: vue: ^3.5.24 - '@bitrix24/b24jssdk-nuxt@1.0.4': - resolution: {integrity: sha512-nVCschvGM4LZCGVc02bFT3XJZahIGrjyT2il4ADdNRuJeCRyjLEWBkersUbD6eyh6BMyf4qbvznk2LR2mjRmaw==} + '@bitrix24/b24jssdk-nuxt@1.0.5': + resolution: {integrity: sha512-pAD54dqj236PZVoOkTlZ3GVGmgWvnnJIAL1ba7E1FglJ9PcvtCYZmuEo+N/hOXbXGwx2a3nadPj9sintyy3xzw==} - '@bitrix24/b24jssdk@1.0.4': - resolution: {integrity: sha512-iBxpOlu1OIxOfzLh9sV32YHRWATxKADNK+6Ed7pkiCkw7YmPCZ7Mi6292GqqLYdjAbyz+v5QNxHLjbDj5uEDRQ==} + '@bitrix24/b24jssdk@1.0.5': + resolution: {integrity: sha512-rbgijvAF7aaqUxr3DQjSqj7sYLvZ7MMM084fbdyjX5omgU/X7EGZFZgccQPWm3HORkDt2KzOCQKNVAu512Q06Q==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} '@bitrix24/b24ui-nuxt@2.5.2': @@ -6363,9 +6363,9 @@ snapshots: dependencies: vue: 3.5.30(typescript@6.0.2) - '@bitrix24/b24jssdk-nuxt@1.0.4(magicast@0.5.2)': + '@bitrix24/b24jssdk-nuxt@1.0.5(magicast@0.5.2)': dependencies: - '@bitrix24/b24jssdk': 1.0.4 + '@bitrix24/b24jssdk': 1.0.5 '@nuxt/kit': 4.4.2(magicast@0.5.2) axios: 1.13.6 luxon: 3.7.2 @@ -6374,7 +6374,7 @@ snapshots: - debug - magicast - '@bitrix24/b24jssdk@1.0.4': + '@bitrix24/b24jssdk@1.0.5': dependencies: '@types/luxon': 3.7.1 axios: 1.13.6