fix: subscription middleware

bigcapitalhq · Aug 25, 2024 · f698569 · f698569
1 parent ee2d8d3
commit f698569
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 22 deletions.
diff --git a/packages/server/src/api/middleware/TenancyMiddleware.ts b/packages/server/src/api/middleware/TenancyMiddleware.ts
@@ -9,7 +9,6 @@ export default async (req: Request, res: Response, next: NextFunction) => {
     req.headers['organization-id'] || req.query.organization;
 
   const notFoundOrganization = () => {
-    Logger.info('[tenancy_middleware] organization id not found.');
     return res.boom.unauthorized('Organization identication not found.', {
       errors: [{ type: 'ORGANIZATION.ID.NOT.FOUND', code: 100 }],
     });
@@ -28,7 +27,6 @@ export default async (req: Request, res: Response, next: NextFunction) => {
   }
   // When user tenant not match the given organization id.
   if (tenant.id !== req.user.tenantId) {
-    Logger.info('[tenancy_middleware] authorized user not match org. tenant.');
     return res.boom.unauthorized();
   }
   tenantDependencyInjection(req, tenant);

diff --git 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.

diff --git a/packages/server/src/system/migrations/20240714101229_seed_monthly_subscription_plans.js b/packages/server/src/system/migrations/20240714101229_seed_monthly_subscription_plans.js
@@ -9,8 +9,8 @@ exports.up = function (knex) {
       currency: 'USD',
       invoice_period: 1,
       invoice_interval: 'month',
-      lemon_variant_id: '446152',
-      // lemon_variant_id: '450016',
+      // lemon_variant_id: '446152',
+      lemon_variant_id: '450016',
     },
     {
       name: 'Capital Basic (Annually)',
@@ -20,8 +20,8 @@ exports.up = function (knex) {
       currency: 'USD',
       invoice_period: 1,
       invoice_interval: 'year',
-      lemon_variant_id: '446153',
-      // lemon_variant_id: '450018',
+      // lemon_variant_id: '446153',
+      lemon_variant_id: '450018',
     },
 
     // # Capital Essential
@@ -33,8 +33,8 @@ exports.up = function (knex) {
       currency: 'USD',
       invoice_period: 1,
       invoice_interval: 'month',
-      lemon_variant_id: '446155',
-      // lemon_variant_id: '450028',
+      // lemon_variant_id: '446155',
+      lemon_variant_id: '450028',
     },
     {
       name: 'Capital Essential (Annually)',
@@ -43,8 +43,8 @@ exports.up = function (knex) {
       active: true,
       invoice_period: 1,
       invoice_interval: 'year',
-      lemon_variant_id: '446156',
-      // lemon_variant_id: '450029',
+      // lemon_variant_id: '446156',
+      lemon_variant_id: '450029',
     },
 
     // # Capital Plus
@@ -55,8 +55,8 @@ exports.up = function (knex) {
       active: true,
       invoice_period: 1,
       invoice_interval: 'month',
-      lemon_variant_id: '446165',
-      // lemon_variant_id: '450031',
+      // lemon_variant_id: '446165',
+      lemon_variant_id: '450031',
     },
     {
       name: 'Capital Plus (Annually)',
@@ -65,8 +65,8 @@ exports.up = function (knex) {
       active: true,
       invoice_period: 1,
       invoice_interval: 'year',
-      lemon_variant_id: '446164',
-      // lemon_variant_id: '450032',
+      // lemon_variant_id: '446164',
+      lemon_variant_id: '450032',
     },
 
     // # Capital Big
@@ -77,8 +77,8 @@ exports.up = function (knex) {
       active: true,
       invoice_period: 1,
       invoice_interval: 'month',
-      lemon_variant_id: '446167',
-      // lemon_variant_id: '450024',
+      // lemon_variant_id: '446167',
+      lemon_variant_id: '450024',
     },
     {
       name: 'Capital Big (Annually)',
@@ -87,8 +87,8 @@ exports.up = function (knex) {
       active: true,
       invoice_period: 1,
       invoice_interval: 'year',
-      lemon_variant_id: '446168',
-      // lemon_variant_id: '450025',
+      // lemon_variant_id: '446168',
+      lemon_variant_id: '450025',
     },
   ]);
 };

diff --git a/packages/webapp/src/constants/subscriptionModels.tsx b/packages/webapp/src/constants/subscriptionModels.tsx
@@ -48,10 +48,10 @@ export const SubscriptionPlans = [
     monthlyPriceLabel: 'Per month',
     annuallyPrice: '$15',
     annuallyPriceLabel: 'Per month',
-    monthlyVariantId: '446152',
-    // monthlyVariantId: '450016',
-    annuallyVariantId: '446153',
-    // annuallyVariantId: '450018',
+    // monthlyVariantId: '446152',
+    monthlyVariantId: '450016',
+    // annuallyVariantId: '446153',
+    annuallyVariantId: '450018',
   },
   {
     name: 'Capital Essential',