comi-logic/cfw-autumn
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into feat/new-create-customer

Browse Source
This commit is contained in:
John Yeo
2026-01-20 20:17:07 +00:00
parent fb8ffa7138 d81316c953
commit dfdf6873d7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/internal/products/productRouter.ts
View File

@@ -9,11 +9,10 @@ import { handleGetPlan } from "./handlers/handleGetPlan.js";
import { handleGetPlanDeleteInfo } from "./handlers/handleGetPlanDeleteInfo.js"; import { handleGetPlanDeleteInfo } from "./handlers/handleGetPlanDeleteInfo.js";
import { handleListPlans } from "./handlers/handleListPlans.js"; import { handleListPlans } from "./handlers/handleListPlans.js";
import { handleMigrateProductV2 } from "./handlers/handleMigrateProductV2.js"; import { handleMigrateProductV2 } from "./handlers/handleMigrateProductV2.js";
import { handlePlanHasCustomers } from "./handlers/handlePlanHasCustomers.js";
import { handleUpdatePlan } from "./handlers/handleUpdateProduct/handleUpdatePlan.js"; import { handleUpdatePlan } from "./handlers/handleUpdateProduct/handleUpdatePlan.js";
export const expressProductRouter = express.Router(); export const expressProductRouter = express.Router();
expressProductRouter.get("/:product_id/has_customers", handlePlanHasCustomers);
export const honoProductBetaRouter = new Hono<HonoEnv>(); export const honoProductBetaRouter = new Hono<HonoEnv>();
honoProductBetaRouter.get("", ...handleListPlans); honoProductBetaRouter.get("", ...handleListPlans);
@@ -37,6 +36,7 @@ honoProductRouter.delete("/:product_id", ...handleDeleteProductHono);
honoProductRouter.post("/:product_id/copy", ...handleCopyProductV2); honoProductRouter.post("/:product_id/copy", ...handleCopyProductV2);
// Info before deleting plan // Info before deleting plan
honoProductRouter.get("/:product_id/has_customers", ...handlePlanHasCustomersV2);
honoProductRouter.post( honoProductRouter.post(
"/:product_id/has_customers", "/:product_id/has_customers",
...handlePlanHasCustomersV2, ...handlePlanHasCustomersV2,

2
vite/src/views/main-sidebar/MainSidebar.tsx
View File

@@ -152,7 +152,7 @@ export const MainSidebar = () => {
icon: <CubeIcon size={16} weight="fill" />, icon: <CubeIcon size={16} weight="fill" />,
}, },
{ {
title: "Plan Features", title: "Features",
value: "features", value: "features",
icon: <LegoIcon size={16} weight="fill" />, icon: <LegoIcon size={16} weight="fill" />,
}, },