rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-04-10 00:53:51 +02:00
Code Issues Releases Activity

Merge branch 'dev' for release 6.3.47

Browse Source
This commit is contained in:
Du Peng 2025-04-01 12:04:38 +02:00
commit 90994d539b
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -2,6 +2,10 @@
## Next release ## Next release
## v6.3.47 2025 Avril 1
- Fix a bug: unable to hide machine/space deleted in price of plan
## v6.3.46 2025 March 31 ## v6.3.46 2025 March 31
- Fix a bug: unable to cancel stripe subscription canceled - Fix a bug: unable to cancel stripe subscription canceled

2
app/frontend/src/javascript/components/plans/plan-pricing-form.tsx
View File

@ -71,7 +71,7 @@ export const PlanPricingForm = <TContext extends object>({ register, control, fo
const renderPriceElement = (price: Price, index: number) => { const renderPriceElement = (price: Price, index: number) => {
const item: Space | Machine = (price.priceable_type === 'Machine' && machines?.find(m => m.id === price.priceable_id)) || const item: Space | Machine = (price.priceable_type === 'Machine' && machines?.find(m => m.id === price.priceable_id)) ||
(price.priceable_type === 'Space' && spaces?.find(s => s.id === price.priceable_id)); (price.priceable_type === 'Space' && spaces?.find(s => s.id === price.priceable_id));
if (!item?.disabled) { if (item && !item.disabled) {
return ( return (
<div key={price.id}> <div key={price.id}>
<FormInput register={register} <FormInput register={register}

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "fab-manager", "name": "fab-manager",
"version": "6.3.46", "version": "6.3.47",
"description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.", "description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.",
"keywords": [ "keywords": [
"fablab", "fablab",