+
+
+
+
-
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/i18n/de.json b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/i18n/de.json
new file mode 100644
index 000000000..42ce8147d
--- /dev/null
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/i18n/de.json
@@ -0,0 +1,44 @@
+{
+ "designer": "Designer",
+ "preview": "Kalkulations Analyse",
+ "xml_view": "XML Ansicht",
+ "json_view": "JSON Ansicht",
+ "preview_mode": "Vorschau-Modus",
+ "headline": "Überschrift",
+ "text": "Text",
+ "media": "Medien",
+ "textarea": "Textbereich",
+ "input": "Eingabefeld",
+ "select": "Auswahl",
+ "hidden": "Versteckt",
+ "row": "Zeile",
+ "id": "ID",
+ "default": "Standard",
+ "name": "Name",
+ "variant": "Variante",
+ "headline1": "Überschrift 1",
+ "headline2": "Überschrift 2",
+ "headline3": "Überschrift 3",
+ "headline4": "Überschrift 4",
+ "headline5": "Überschrift 5",
+ "headline6": "Überschrift 6",
+ "placeholder": "Platzhalter",
+ "required": "Erforderlich",
+ "min": "Min",
+ "max": "Max",
+ "min_calc": "Min Calc",
+ "max_calc": "Max Calc",
+ "add_dependency": "Abhängigkeit hinzufügen",
+ "add_column": "Spalte hinzufügen",
+ "mode": "Modus",
+ "normal": "Normal",
+ "paperdb": "PapierDB",
+ "colordb": "FarbDB",
+ "container": "Container",
+ "edit_options": "Optionen bearbeiten",
+ "add_option": "Option hinzufügen",
+ "close": "Schließen",
+ "dependencies": "Abhängigkeiten",
+ "options": "Optionen",
+ "settings": "Einstellungen"
+}
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/i18n/en.json b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/i18n/en.json
new file mode 100644
index 000000000..a156b0075
--- /dev/null
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/i18n/en.json
@@ -0,0 +1,44 @@
+{
+ "designer": "Designer",
+ "preview": "Calculation Analysis",
+ "xml_view": "XML View",
+ "json_view": "JSON View",
+ "preview_mode": "Preview Mode",
+ "headline": "Headline",
+ "text": "Text",
+ "media": "Media",
+ "textarea": "Textarea",
+ "input": "Input",
+ "select": "Select",
+ "hidden": "Hidden",
+ "row": "Row",
+ "id": "ID",
+ "default": "Default",
+ "name": "Name",
+ "variant": "Variant",
+ "headline1": "Headline 1",
+ "headline2": "Headline 2",
+ "headline3": "Headline 3",
+ "headline4": "Headline 4",
+ "headline5": "Headline 5",
+ "headline6": "Headline 6",
+ "placeholder": "Placeholder",
+ "required": "Required",
+ "min": "Min",
+ "max": "Max",
+ "min_calc": "Min Calc",
+ "max_calc": "Max Calc",
+ "add_dependency": "Add Dependency",
+ "add_column": "Add Column",
+ "mode": "Mode",
+ "normal": "Normal",
+ "paperdb": "PaperDB",
+ "colordb": "ColorDB",
+ "container": "Container",
+ "edit_options": "Edit Options",
+ "add_option": "Add Option",
+ "close": "Close",
+ "dependencies": "Dependencies",
+ "options": "Options",
+ "settings": "Settings"
+}
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/i18n/index.ts b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/i18n/index.ts
new file mode 100644
index 000000000..535f0280f
--- /dev/null
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/i18n/index.ts
@@ -0,0 +1,15 @@
+import { createI18n } from 'vue-i18n'
+import de from './de.json'
+import en from './en.json'
+
+const i18n = createI18n({
+ legacy: false,
+ locale: 'de',
+ fallbackLocale: 'en',
+ messages: {
+ de,
+ en
+ }
+})
+
+export default i18n
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/main.ts b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/main.ts
index 8c0dac5a8..1ea73ae13 100644
--- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/main.ts
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/main.ts
@@ -2,9 +2,11 @@ import { createApp } from 'vue'
import './style.css'
import { createPinia } from 'pinia'
import App from './App.vue'
+import i18n from './i18n'
const app = createApp(App)
app.use(createPinia())
+app.use(i18n)
app.mount('#app')
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/model/BaseElement.ts b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/model/BaseElement.ts
index 1a4c900c1..595b24fa9 100644
--- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/model/BaseElement.ts
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/model/BaseElement.ts
@@ -20,6 +20,10 @@ export default class BaseElement {
isFocused: boolean = false;
dependencys: Dependency[] = [];
+ hasDependencys() {
+ return this.dependencys.length > 0;
+ }
+
toJSON() {
return {
'id': this.id,
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/model/InputElement.ts b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/model/InputElement.ts
index 0b0841324..f6b948112 100644
--- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/model/InputElement.ts
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/model/InputElement.ts
@@ -7,6 +7,8 @@ export default class InputElement extends BaseElement {
name: string = ""
xmlType: string = "input"
minValue: number = 0
+ minCalc: string = ""
+ maxCalc: string = ""
maxValue: number = 0
constructor() {
@@ -22,7 +24,9 @@ export default class InputElement extends BaseElement {
'default': this.default,
'name': this.name,
'minValue': this.minValue,
+ 'minCalc': this.minCalc,
'maxValue': this.maxValue,
+ 'maxCalc': this.maxCalc,
'required': this.required
})
}
@@ -34,6 +38,8 @@ export default class InputElement extends BaseElement {
this.required = obj.required
this.placeHolder = obj.placeHolder
this.minValue = obj.minValue
+ this.minCalc = obj.minCalc
this.maxValue = obj.maxValue
+ this.maxCalc = obj.maxCalc
}
}
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/model/SelectElement.ts b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/model/SelectElement.ts
index 4a5726b35..884aa5ea5 100644
--- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/model/SelectElement.ts
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/model/SelectElement.ts
@@ -17,6 +17,17 @@ export default class SelectElement extends BaseElement {
this.options.push(option)
}
+ hasDependencys() {
+ let hasDep = this.options.reduce((result: bool, opt: Option) => {
+ if(opt.dependencys.length > 0) {
+ result = true
+ }
+ return result
+ }, false)
+
+ return hasDep || super.hasDependencys()
+ }
+
public toJSON() {
return Object.assign(
super.toJSON(),
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/stores/Items.ts b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/stores/Items.ts
index 42f20b773..5fb4db770 100644
--- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/stores/Items.ts
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/src/stores/Items.ts
@@ -2,7 +2,7 @@ import { defineStore } from 'pinia'
import BaseElement from '../model/BaseElement'
import Parser from '../lib/parser'
import {v4 as uuidv4} from 'uuid'
-import { loadJsonFromApi } from '../lib/api'
+import { loadJsonFromApi, loadPriceFromApi } from '../lib/api'
export const useElementStore = defineStore('items', {
@@ -10,12 +10,17 @@ export const useElementStore = defineStore('items', {
uuid: uuidv4(),
items: [] as BaseElement[],
activeItem: {} as BaseElement | {},
+ formulaData: [],
+ formulaError: '',
+ isFormulaLoading: false,
showProperties: false,
showDependency: false,
+ showOptions: false,
showPreview: false,
sourceDragUuid: "",
dragMode: "",
json: "",
+ xml: "",
name: uuidv4(),
}),
getters: {
@@ -24,9 +29,11 @@ export const useElementStore = defineStore('items', {
getActiveItem: (state) => state.activeItem as BaseElement,
isShowPropierties: (state) => state.showProperties,
isShowDependency: (state) => state.showDependency,
+ isShowOptions: (state) => state.showOptions,
isShowPreview: (state) => state.showPreview,
getSourceDragUuid: (state) => state.sourceDragUuid,
getDragMode: (state) => state.dragMode,
+ getFormulaData: (state) => state.formulaData,
},
actions: {
addElement(item: BaseElement) {
@@ -73,6 +80,9 @@ export const useElementStore = defineStore('items', {
setShowDependency(value: boolean) {
this.showDependency = value
},
+ setShowOptions(value: boolean) {
+ this.showOptions = value
+ },
setShowProperties(value: boolean) {
this.showProperties = value
},
@@ -140,10 +150,31 @@ export const useElementStore = defineStore('items', {
setDragMode(mode: string) {
this.dragMode = mode
},
- async loadFromApi(id: string) {
- const data = await loadJsonFromApi(id);
- this.json = data;
+ async loadConfigFromProductApi(uuid: string) {
+ const data = await loadJsonFromApi(uuid);
+ this.json = data.json;
+ this.xml = data.xml;
this.parseJSON();
+ },
+ async loadFormulaAnalyserDataFromApi(uuid: string) {
+ if (this.formulaData && this.formulaData.length > 0) {
+ return;
+ }
+ this.isFormulaLoading = true;
+ this.formulaError = '';
+ try {
+ const response = await loadPriceFromApi(uuid);
+ if (response && response.debug && response.debug.graphJson) {
+ this.formulaData = JSON.parse(response.debug.graphJson);
+ } else {
+ throw new Error('Invalid or empty response format from API.');
+ }
+ } catch (e: any) {
+ this.formulaError = `Failed to load formula data: ${e.message}`;
+ console.error(e);
+ } finally {
+ this.isFormulaLoading = false;
+ }
}
}
diff --git a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/vite.config.ts b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/vite.config.ts
index 52e1f7605..d2eb41831 100644
--- a/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/vite.config.ts
+++ b/src/new/var/plugins/Custom/PSC/FormBuilder/FormBuilderTS/vite.config.ts
@@ -29,7 +29,7 @@ export default defineConfig({
changeOrigin: true,
configure: (proxy, options) => {
proxy.on('proxyReq', (proxyReq, req, res) => {
- proxyReq.setHeader('Authorization', 'Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJpYXQiOjE3NTI1MTE3MTgsImV4cCI6MTc1MjUxNTMxOCwicm9sZXMiOlsiUk9MRV9BRE1JTiIsIlJPTEVfU0hPUF9PUEVSQVRPUiIsIlJPTEVfVVNFUiIsIlJPTEVfVVNFUiIsIlJPTEVfUFNDX0NvbGxlY3RfQ29udGFjdF9FZGl0IiwiUk9MRV9QU0NfQ29sbGVjdF9Db250YWN0X0FkZCIsIlJPTEVfUFNDX0NvbGxlY3RfQ29udGFjdF9EZWxldGUiLCJST0xFX1BTQ19Db2xsZWN0X0NvbnRhY3RfTG9jayIsIlJPTEVfUFNDX1IyX1NlbmRjbG91ZF9TaG93Il0sInVpZCI6MX0.MlNFnqbWlCbaKejkcJgnri2d4pg569vfk6TrOe32rJbyyyb0X3svfhzvCsyO9i1-XwR0frm5s2fHdeGEumCjtel9VzLLIvbmr43NhUVPA03EG17pAX4QnM-GaL9vzIeZQlrIcwSprFKz9qo6Toc1Wq0mFEjvTwHj5UR5JBIgnV7TtScIVl83XJljMUbX-NrUSoOeGn6W2SRtH_bDP47ZC-P4wtDcXcrJWM9ka1Vknn-1DQgitVLtOEsxzU7bkxPpfC_ENuRqDE8HmpPZsizF4Pt9jzfAXcPy0CviBJxvg1-tu57h164VSsnz1-K6duBMTB18afi987-dXtBc7nKJhQ');
+ proxyReq.setHeader('Authorization', 'Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJpYXQiOjE3NTI1Nzc2NzIsImV4cCI6MTc1MjU4MTI3Miwicm9sZXMiOlsiUk9MRV9BRE1JTiIsIlJPTEVfU0hPUF9PUEVSQVRPUiIsIlJPTEVfVVNFUiIsIlJPTEVfVVNFUiIsIlJPTEVfUFNDX0NvbGxlY3RfQ29udGFjdF9FZGl0IiwiUk9MRV9QU0NfQ29sbGVjdF9Db250YWN0X0FkZCIsIlJPTEVfUFNDX0NvbGxlY3RfQ29udGFjdF9EZWxldGUiLCJST0xFX1BTQ19Db2xsZWN0X0NvbnRhY3RfTG9jayIsIlJPTEVfUFNDX1IyX1NlbmRjbG91ZF9TaG93Il0sInVpZCI6MX0.ViKfV_6cSsP6UvqibTJ5zXE8F5JZWmOEhNquw5_3bpB5N7rOtTIM8ZaD5i9VfoRf2a1CaSIKAzhte_8K49bNIpMd4B8mh3ufqUIHn33L34TsiTNblKv4PlQB_FZbCgujzfP2UenrDi3SAsHd5bynZUOJNbkGzMtv2sUot-mrKJmUvchl-yvcSFw4bYfy-88hnfXJ6sCDlIU-Vd9OSChoBqD12z3Nr6fEqY-ngq7Xv315yFY9Fhg3gxu5NqyAMzN-F6QJHjUsHlo2b9oLeAo2nFZ_Cj2nAMVa6VbxAXMrj6Ogf2POr1TWtvBBaJZj4c1D5rWktkFkPLTUAStNOwMRvQ');
});
},
},
diff --git a/src/new/var/plugins/System/PSC/XmlCalc/Api/Product/Config.php b/src/new/var/plugins/System/PSC/XmlCalc/Api/Product/Config.php
index 2ef5749b5..f5f8a00c8 100644
--- a/src/new/var/plugins/System/PSC/XmlCalc/Api/Product/Config.php
+++ b/src/new/var/plugins/System/PSC/XmlCalc/Api/Product/Config.php
@@ -89,6 +89,6 @@ class Config extends AbstractController
$engine->setActiveArticle($data->xmlProduct);
}
- return $this->json($engine->generateJson());
+ return $this->json(['json' => $engine->generateJson(), 'xml' => $engine->generateXML(true)]);
}
}
diff --git a/src/new/var/plugins/System/PSC/XmlCalc/Api/Product/Design.php b/src/new/var/plugins/System/PSC/XmlCalc/Api/Product/Design.php
new file mode 100644
index 000000000..b9eca6e0f
--- /dev/null
+++ b/src/new/var/plugins/System/PSC/XmlCalc/Api/Product/Design.php
@@ -0,0 +1,96 @@
+entityManager
+ ->getRepository('PSC\Shop\EntityBundle\Entity\Product')
+ ->findOneBy(['uuid' => $data->product]);
+
+ $paperContainer = new PaperContainer();
+ $paperContainer->parse(simplexml_load_string($product->getShop()->getInstall()->getPaperContainer()));
+ $engine = new Engine();
+ $engine->setPaperRepository($this->paperDB);
+ $engine->setPaperContainer($paperContainer);
+ if ($product->getShop()->getInstall()->getCalcTemplates() && !$data->test) {
+ $engine->setTemplates('
' . $product->getShop()->getInstall()->getCalcTemplates() . '');
+ }
+ if ($product->getShop()->getInstall()->getCalcTemplatesTest() && $data->test) {
+ $engine->setTemplates('
' . $product->getShop()->getInstall()->getCalcTemplatesTest() . '');
+ }
+ $engine->loadJson($data->jsonProduct);
+ if (!$data->test) {
+ $engine->setFormulas($product->getShop()->getFormel());
+ $engine->setParameters($product->getShop()->getParameter());
+ }
+ if ($data->test) {
+ $engine->setFormulas($product->getShop()->getTestFormel());
+ $engine->setParameters($product->getShop()->getTestParameter());
+ }
+ $engine->setVariables($data->values);
+ $engine->setTax($product->getMwert());
+ if ($this->tokenStorage->getToken()) {
+ $contact = new Contact();
+ $this->contactTransformer->fromDb($contact, $this->tokenStorage->getToken()->getUser());
+ $engine->setVariable('contact.accountType', $contact->getAccountType()->value);
+ $engine->setVariable('contact.account', $contact->getAccount()->getUid());
+ }
+
+ return $this->json([
+ 'json' => $engine->generateJson(),
+ 'xml' => $engine->generateXML(true),
+ 'jsonGraph' => $engine->getCalcGraph()->generateJsonGraph(),
+ 'price' => $engine->getPrice() * 100,
+ ]);
+ }
+}
diff --git a/src/new/var/plugins/System/PSC/XmlCalc/Dto/Input/DesignInput.php b/src/new/var/plugins/System/PSC/XmlCalc/Dto/Input/DesignInput.php
new file mode 100644
index 000000000..fe5c0d001
--- /dev/null
+++ b/src/new/var/plugins/System/PSC/XmlCalc/Dto/Input/DesignInput.php
@@ -0,0 +1,37 @@
+ 100];
+}