@progressive-development/pd-order 0.6.7 → 0.6.9

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 export { PdOrderContacts } from './pd-order-contacts.js';
 export { PdOrderSummary } from './pd-order-summary.js';
+export type { PdOrderContactData, PdOrderStep } from './types.js';
 export { templates as beTemplates } from './generated/locales/be.js';
 export { templates as deTemplates } from './generated/locales/de.js';
 export { templates as enTemplates } from './generated/locales/en.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,EAAE,SAAS,IAAI,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,SAAS,IAAI,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,SAAS,IAAI,WAAW,EAAE,MAAM,2BAA2B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,YAAY,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAElE,OAAO,EAAE,SAAS,IAAI,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,SAAS,IAAI,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,SAAS,IAAI,WAAW,EAAE,MAAM,2BAA2B,CAAC"}

package/dist/pd-order-contacts.d.ts

@@ -1,4 +1,4 @@
-import { LitElement, CSSResultGroup } from 'lit';
+import { LitElement, CSSResultGroup, PropertyValues } from 'lit';
 import { PdContactData, PdContactMatch } from '@progressive-development/pd-contact';
 /**
  * Renders and manages contact input sections for order processing.
@@ -26,7 +26,6 @@ export declare class PdOrderContacts extends LitElement {
     withPayment: boolean;
     /** Aktiviert die Option zur Verwaltung von Vermieterinformationen */
     withPropertyOwner: boolean;
-    /** Aktiviert die Option zur Eingabe eines Wunschdatums für den Immobilientermin */
     withPropertyDate: boolean;
     /** Optionaler Match-Parameter zur Feldvalidierung oder Mapping-Zwecken */
     match?: PdContactMatch;
@@ -34,13 +33,13 @@ export declare class PdOrderContacts extends LitElement {
     private _ownAdminContact;
     private _isPropertyOwner;
     static styles: CSSResultGroup;
-    protected firstUpdated(): void;
-    protected updated(changed: Map<string | number | symbol, unknown>): void;
+    update(changedProps: PropertyValues<this>): void;
     protected render(): import('lit-html').TemplateResult<1>;
     private _renderEditContacts;
     private _renderSummary;
     get valid(): boolean;
     triggerValidate(): Promise<boolean>;
+    getValues(): any;
     private _getCollapseMap;
 }
 //# sourceMappingURL=pd-order-contacts.d.ts.map

package/dist/pd-order-contacts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pd-order-contacts.d.ts","sourceRoot":"","sources":["../src/pd-order-contacts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAsB,cAAc,EAAE,MAAM,KAAK,CAAC;AAIrE,OAAO,uDAAuD,CAAC;AAC/D,OAAO,iDAAiD,CAAC;AACzD,OAAO,gDAAgD,CAAC;AACxD,OAAO,+CAA+C,CAAC;AAGvD,OAAO,EACL,aAAa,EACb,cAAc,EACf,MAAM,qCAAqC,CAAC;AAE7C;;;;;;GAMG;AACH,qBAEa,eAAgB,SAAQ,UAAU;IAC7C,gEAAgE;IAEhE,OAAO,UAAS;IAEhB,uDAAuD;IAEvD,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM;IAE1C,6EAA6E;IAE7E,cAAc,EAAE,MAAM,EAAE,CAAM;IAE9B,uCAAuC;IAEvC,YAAY,CAAC,EAAE,aAAa,CAAC;IAE7B,0CAA0C;IAE1C,cAAc,CAAC,EAAE,aAAa,CAAC;IAE/B,mCAAmC;IAEnC,YAAY,CAAC,EAAE,aAAa,CAAC;IAE7B,8CAA8C;IAE9C,eAAe,CAAC,EAAE,aAAa,CAAC;IAEhC,0DAA0D;IAE1D,WAAW,UAAS;IAEpB,qEAAqE;IAErE,iBAAiB,UAAS;IAE1B,mFAAmF;IAEnF,gBAAgB,UAAS;IAEzB,0EAA0E;IAE1E,KAAK,CAAC,EAAE,cAAc,CAAC;IAGvB,OAAO,CAAC,kBAAkB,CAAS;IAGnC,OAAO,CAAC,gBAAgB,CAAS;IAGjC,OAAO,CAAC,gBAAgB,CAAS;IAEjC,OAAgB,MAAM,EAAE,cAAc,CAgDpC;IAGF,SAAS,CAAC,YAAY,IAAI,IAAI;IAS9B,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAYxE,SAAS,CAAC,MAAM;IAIhB,OAAO,CAAC,mBAAmB;IAuJ3B,OAAO,CAAC,cAAc;IA+CtB,IAAW,KAAK,YAQf;IAEY,eAAe,IAAI,OAAO,CAAC,OAAO,CAAC;IAgBhD,OAAO,CAAC,eAAe;CAoBxB"}
+{"version":3,"file":"pd-order-contacts.d.ts","sourceRoot":"","sources":["../src/pd-order-contacts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAIV,cAAc,EACd,cAAc,EACf,MAAM,KAAK,CAAC;AAIb,OAAO,uDAAuD,CAAC;AAC/D,OAAO,iDAAiD,CAAC;AACzD,OAAO,gDAAgD,CAAC;AACxD,OAAO,+CAA+C,CAAC;AAKvD,OAAO,EAEL,aAAa,EACb,cAAc,EACf,MAAM,qCAAqC,CAAC;AAE7C;;;;;;GAMG;AACH,qBAEa,eAAgB,SAAQ,UAAU;IAC7C,gEAAgE;IAEhE,OAAO,UAAS;IAEhB,uDAAuD;IAEvD,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM;IAE1C,6EAA6E;IAE7E,cAAc,EAAE,MAAM,EAAE,CAAM;IAE9B,uCAAuC;IAEvC,YAAY,CAAC,EAAE,aAAa,CAAC;IAE7B,0CAA0C;IAE1C,cAAc,CAAC,EAAE,aAAa,CAAC;IAE/B,mCAAmC;IAEnC,YAAY,CAAC,EAAE,aAAa,CAAC;IAE7B,8CAA8C;IAE9C,eAAe,CAAC,EAAE,aAAa,CAAC;IAEhC,0DAA0D;IAE1D,WAAW,UAAS;IAEpB,qEAAqE;IAErE,iBAAiB,UAAS;IAG1B,gBAAgB,UAAS;IAEzB,0EAA0E;IAE1E,KAAK,CAAC,EAAE,cAAc,CAAC;IAGvB,OAAO,CAAC,kBAAkB,CAAS;IAGnC,OAAO,CAAC,gBAAgB,CAAS;IAGjC,OAAO,CAAC,gBAAgB,CAAS;IAEjC,OAAgB,MAAM,EAAE,cAAc,CAgDpC;IAEO,MAAM,CAAC,YAAY,EAAE,cAAc,CAAC,IAAI,CAAC,GAAG,IAAI;IAazD,SAAS,CAAC,MAAM;IAIhB,OAAO,CAAC,mBAAmB;IA4J3B,OAAO,CAAC,cAAc;IA+CtB,IAAI,KAAK,IAAI,OAAO,CASnB;IAEY,eAAe,IAAI,OAAO,CAAC,OAAO,CAAC;IAkCzC,SAAS;IAWhB,OAAO,CAAC,eAAe;CAoBxB"}

package/dist/pd-order-contacts.js

@@ -29,162 +29,158 @@ let PdOrderContacts = class extends LitElement {
     this._ownAdminContact = false;
     this._isPropertyOwner = false;
   }
-  // TODO: Remove if pd-collapse-group kann handle dynamic added collapse boxes
-  firstUpdated() {
-    this.addEventListener("toggle-accordion", (e) => {
-      var _a;
-      const origin = e.composedPath()[0];
-      (_a = this.shadowRoot) == null ? void 0 : _a.querySelectorAll("pd-collapse").forEach((el) => {
-        if (el !== origin) el.close();
-      });
-    });
-  }
-  updated(changed) {
-    if (changed.has("billingContact")) {
+  update(changedProps) {
+    if (changedProps.has("billingContact")) {
       this._ownBillingContact = !!this.billingContact;
     }
-    if (changed.has("adminContact")) {
+    if (changedProps.has("adminContact")) {
       this._ownAdminContact = !!this.adminContact;
     }
-    if (changed.has("propertyContact")) {
+    if (changedProps.has("propertyContact")) {
       this._isPropertyOwner = !!this.propertyContact;
     }
+    super.update(changedProps);
   }
   render() {
     return this.summary ? this._renderSummary() : this._renderEditContacts();
   }
   _renderEditContacts() {
     return html`
-      <!-- <pd-collapse-group> -->
-
-      <pd-collapse id="orderContactCollapseId" active>
-        <div slot="header">
-          ${this.contactTitle.orderInputContact ?? msg("Adresse", { id: "pd.order.contacts.orderContact.inputHeader" })}
-        </div>
-        <pd-contact
-          id="orderContactId"
-          class="collapse-contact"
-          slot="content"
-          .requiredFields=${this.requiredFields}
-          .contact=${this.orderContact}
-          .match=${this.match}
-          ?withPropertyDate=${!this._isPropertyOwner && this.withPropertyDate}
-        ></pd-contact>
-      </pd-collapse>
+      <pd-collapse-group>
+        <pd-collapse id="orderContactCollapseId">
+          <div slot="header">
+            ${this.contactTitle.orderInputContact ?? msg("Adresse", {
+      id: "pd.order.contacts.orderContact.inputHeader"
+    })}
+          </div>
+          <pd-contact
+            id="orderContactId"
+            class="collapse-contact"
+            slot="content"
+            .requiredFields=${this.requiredFields}
+            .contact=${this.orderContact}
+            .match=${this.match}
+            ?withPropertyDate=${!this._isPropertyOwner && this.withPropertyDate}
+          ></pd-contact>
+        </pd-collapse>
 
-      ${this.withPayment ? html`
-            <pd-collapse id="billingContactCollapseId">
-              <div slot="header">
-                ${this.contactTitle.billingInputContact ?? msg("Rechnungsadresse (optional)", {
+        ${this.withPayment ? html`
+              <pd-collapse id="billingContactCollapseId">
+                <div slot="header">
+                  ${this.contactTitle.billingInputContact ?? msg("Rechnungsadresse (optional)", {
       id: "pd.order.contacts.billingContact.inputHeader"
     })}
-              </div>
-              <div slot="content">
-                ${this._ownBillingContact ? html`
-                      <p>
-                        <a @click=${() => this._ownBillingContact = false}
-                          >${msg(
+                </div>
+                <div slot="content">
+                  ${this._ownBillingContact ? html`
+                        <p>
+                          <a @click=${() => this._ownBillingContact = false}
+                            >${msg(
       "Kundenadresse als Rechnungsadresse verwenden"
     )}</a
-                        >
-                      </p>
-                      <pd-contact
-                        id="billingContactId"
-                        class="collapse-contact"
-                        .requiredFields=${this.requiredFields}
-                        .contact=${this.billingContact}
-                      ></pd-contact>
-                    ` : html`
-                      <p>
-                        ${msg("Rechnungsadresse entspricht der Kundenadresse.")}
-                      </p>
-                      <p>
-                        <a @click=${() => this._ownBillingContact = true}
-                          >${msg("Neue Rechnungsadresse hinzufügen")}</a
-                        >
-                      </p>
-                    `}
-              </div>
-            </pd-collapse>
-          ` : nothing}
-      ${this.withPropertyOwner ? html`
-            <div class="property-owner-box">
-              <pd-checkbox
-                id="isPropertyOwnerId"
-                .initValue=${this._isPropertyOwner}
-                @pd-form-element-change=${(e) => this._isPropertyOwner = e.detail.value === "true"}
-              >
-                ${msg("Ist der Kunde Vermieter?", {
+                          >
+                        </p>
+                        <pd-contact
+                          id="billingContactId"
+                          class="collapse-contact"
+                          .requiredFields=${this.requiredFields}
+                          .contact=${this.billingContact}
+                        ></pd-contact>
+                      ` : html`
+                        <p>
+                          ${msg(
+      "Rechnungsadresse entspricht der Kundenadresse."
+    )}
+                        </p>
+                        <p>
+                          <a @click=${() => this._ownBillingContact = true}
+                            >${msg("Neue Rechnungsadresse hinzufügen")}</a
+                          >
+                        </p>
+                      `}
+                </div>
+              </pd-collapse>
+            ` : nothing}
+        ${this.withPropertyOwner ? html`
+              <div class="property-owner-box">
+                <pd-checkbox
+                  id="isPropertyOwnerId"
+                  initValue=${this._isPropertyOwner}
+                  @pd-form-element-change="${(e) => {
+      this._isPropertyOwner = e.detail.value === "true";
+    }}"
+                >
+                  ${msg("Ist der Kunde Vermieter?", {
       id: "pd.order.contacts.propertyContact.checkBox"
     })}
-              </pd-checkbox>
+                </pd-checkbox>
 
-              ${this._isPropertyOwner ? html`
-                    <pd-collapse
-                      id="propertyContactCollapseId"
-                      style="padding-top: 20px;"
-                    >
-                      <div slot="header">
-                        ${this.contactTitle.propertyInputContact ?? msg("Adresse der Immobilie")}
-                      </div>
-                      <div slot="content">
-                        <pd-contact
-                          id="propertyContactId"
-                          class="collapse-contact"
-                          .requiredFields=${[
+                ${this._isPropertyOwner ? html`
+                      <pd-collapse
+                        id="propertyContactCollapseId"
+                        style="padding-top: 20px;"
+                      >
+                        <div slot="header">
+                          ${this.contactTitle.propertyInputContact ?? msg("Adresse der Immobilie")}
+                        </div>
+                        <div slot="content">
+                          <pd-contact
+                            id="propertyContactId"
+                            class="collapse-contact"
+                            .requiredFields=${[
       "street",
       "streetNr",
       "zip",
       "city"
     ]}
-                          .inputFields=${["street", "city", "additionalHint"]}
-                          .contact=${this.propertyContact}
-                          ?withPropertyDate=${this.withPropertyDate}
-                        ></pd-contact>
-                      </div>
-                    </pd-collapse>
+                            .inputFields=${["street", "city", "additionalHint"]}
+                            .contact=${this.propertyContact}
+                            ?withPropertyDate=${this.withPropertyDate}
+                          ></pd-contact>
+                        </div>
+                      </pd-collapse>
 
-                    <pd-collapse id="adminContactCollapseId">
-                      <div slot="header">
-                        ${this.contactTitle.adminInputContact ?? msg("Adresse der Verwaltung (optional)")}
-                      </div>
-                      <div slot="content">
-                        ${this._ownAdminContact ? html`
-                              <p>
-                                <a
-                                  @click=${() => this._ownAdminContact = false}
-                                  >${msg(
+                      <pd-collapse id="adminContactCollapseId">
+                        <div slot="header">
+                          ${this.contactTitle.adminInputContact ?? msg("Adresse der Verwaltung (optional)")}
+                        </div>
+                        <div slot="content">
+                          ${this._ownAdminContact ? html`
+                                <p>
+                                  <a
+                                    @click=${() => this._ownAdminContact = false}
+                                    >${msg(
       "Kundenadresse als Verwaltungsadresse verwenden"
     )}</a
-                                >
-                              </p>
-                              <pd-contact
-                                id="adminContactId"
-                                class="collapse-contact"
-                                .requiredFields=${this.requiredFields}
-                                .contact=${this.adminContact}
-                              ></pd-contact>
-                            ` : html`
-                              <p>
-                                ${msg(
+                                  >
+                                </p>
+                                <pd-contact
+                                  id="adminContactId"
+                                  class="collapse-contact"
+                                  .requiredFields=${this.requiredFields}
+                                  .contact=${this.adminContact}
+                                ></pd-contact>
+                              ` : html`
+                                <p>
+                                  ${msg(
       "Verwaltungsadresse entspricht der Kundenadresse."
     )}
-                              </p>
-                              <p>
-                                <a
-                                  @click=${() => this._ownAdminContact = true}
-                                  >${msg(
+                                </p>
+                                <p>
+                                  <a
+                                    @click=${() => this._ownAdminContact = true}
+                                    >${msg(
       "Neue Verwaltungsadresse hinzufügen"
     )}</a
-                                >
-                              </p>
-                            `}
-                      </div>
-                    </pd-collapse>
-                  ` : nothing}
-            </div>
-          ` : nothing}
-      <!-- </pd-collapse-group> -->
+                                  >
+                                </p>
+                              `}
+                        </div>
+                      </pd-collapse>
+                    ` : nothing}
+              </div>
+            ` : nothing}
+      </pd-collapse-group>
     `;
   }
   _renderSummary() {
@@ -222,24 +218,51 @@ let PdOrderContacts = class extends LitElement {
     `;
   }
   get valid() {
-    var _a, _b;
-    let isValid = false;
+    var _a;
     for (const { id, collapse, condition = true } of this._getCollapseMap()) {
       if (!condition) continue;
-      isValid += (_b = (_a = this.shadowRoot) == null ? void 0 : _a.getElementById(id)) == null ? void 0 : _b.triggerValidate().valid;
+      const element = (_a = this.shadowRoot) == null ? void 0 : _a.getElementById(id);
+      if (!(element == null ? void 0 : element.valid)) {
+        return false;
+      }
     }
-    return isValid;
+    return true;
   }
   async triggerValidate() {
     var _a, _b;
-    const promises = [];
-    for (const { id, collapse, condition = true } of this._getCollapseMap()) {
+    let firstInvalidCollapseId = null;
+    const collapseMap = this._getCollapseMap();
+    console.log("Map: ", collapseMap);
+    for (const { id, collapse, condition = true } of collapseMap) {
       if (!condition) continue;
-      promises.push(
-        (_b = (_a = this.shadowRoot) == null ? void 0 : _a.getElementById(id)) == null ? void 0 : _b.triggerValidate()
+      const element = (_a = this.shadowRoot) == null ? void 0 : _a.getElementById(id);
+      if (!element) continue;
+      const result = await element.triggerValidate();
+      console.log("PdContact triggerValidate: ", result);
+      if (!result && !firstInvalidCollapseId) {
+        firstInvalidCollapseId = collapse;
+      }
+    }
+    if (firstInvalidCollapseId) {
+      console.log("PdContact open failed: ", firstInvalidCollapseId);
+      const collapseEl = (_b = this.shadowRoot) == null ? void 0 : _b.getElementById(
+        firstInvalidCollapseId
       );
+      if (collapseEl) {
+        collapseEl.active = true;
+      }
+      return false;
+    }
+    return true;
+  }
+  getValues() {
+    var _a, _b;
+    const contactValues = {};
+    for (const { id, collapse, condition = true } of this._getCollapseMap()) {
+      if (!condition) continue;
+      contactValues[id] = (_b = (_a = this.shadowRoot) == null ? void 0 : _a.getElementById(id)) == null ? void 0 : _b.getValues();
     }
-    return Promise.all(promises).then((resArr) => !resArr.some((result) => !result)).catch((e) => false);
+    return contactValues;
   }
   _getCollapseMap() {
     return [

package/dist/pd-order-summary.d.ts

@@ -1,5 +1,5 @@
-import { LitElement, CSSResultGroup } from 'lit';
-import { PdOrderData, PdOrderStep } from './types.js';
+import { LitElement, CSSResultGroup, TemplateResult } from 'lit';
+import { PdOrderStep } from './types.js';
 /**
  * Komponente zur Darstellung der Bestellübersicht
  *
@@ -23,13 +23,16 @@ export declare class PdOrderSummary extends LitElement {
     /**
      * Die vollständigen Bestelldaten inklusive Postleitzahl, Kontakten und Preisinformationen.
      */
-    order?: PdOrderData;
+    order?: any;
+    private _agreeForm;
     static styles: CSSResultGroup;
     firstUpdated(): void;
-    render(): import('lit-html').TemplateResult<1>;
-    private _validateForm;
-    private _getBookingSummary;
-    private _getContactsSummary;
+    render(): TemplateResult<1>;
+    get valid(): boolean;
+    triggerValidate(): Promise<boolean>;
+    protected _mapOrderStepSummary(step: PdOrderStep, index: number): TemplateResult;
+    protected _renderCustomOrderStepSummary(step: PdOrderStep, index: number): TemplateResult | null;
+    protected _getContactsSummary(index: number, step: PdOrderStep): TemplateResult<1>;
     private _openTermsAndConditions;
 }
 //# sourceMappingURL=pd-order-summary.d.ts.map

package/dist/pd-order-summary.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pd-order-summary.d.ts","sourceRoot":"","sources":["../src/pd-order-summary.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAa,cAAc,EAAE,MAAM,KAAK,CAAC;AAK5D,OAAO,+CAA+C,CAAC;AACvD,OAAO,kDAAkD,CAAC;AAC1D,OAAO,qDAAqD,CAAC;AAC7D,OAAO,+CAA+C,CAAC;AAEvD,OAAO,iDAAiD,CAAC;AACzD,OAAO,6CAA6C,CAAC;AACrD,OAAO,qDAAqD,CAAC;AAO7D,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,wBAAwB,CAAC;AAEhC;;;;;GAKG;AACH,qBAEa,cAAe,SAAQ,UAAU;IAC5C;;;OAGG;IAEH,UAAU,EAAE,WAAW,EAAE,CAAM;IAE/B;;OAEG;IAEH,WAAW,UAAS;IAEpB;;OAEG;IAEH,aAAa,UAAS;IAEtB;;OAEG;IAEH,KAAK,CAAC,EAAE,WAAW,CAAC;IAEpB,OAAgB,MAAM,EAAE,cAAc,CAqDpC;IAEO,YAAY,IAAI,IAAI;IAcpB,MAAM;IA0Ef,OAAO,CAAC,aAAa;IAQrB,OAAO,CAAC,kBAAkB;IAkB1B,OAAO,CAAC,mBAAmB;IAuB3B,OAAO,CAAC,uBAAuB;CAOhC"}
+{"version":3,"file":"pd-order-summary.d.ts","sourceRoot":"","sources":["../src/pd-order-summary.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAa,cAAc,EAAE,cAAc,EAAE,MAAM,KAAK,CAAC;AAI5E,OAAO,qDAAqD,CAAC;AAC7D,OAAO,+CAA+C,CAAC;AACvD,OAAO,+CAA+C,CAAC;AAEvD,OAAO,iDAAiD,CAAC;AACzD,OAAO,6CAA6C,CAAC;AACrD,OAAO,qDAAqD,CAAC;AAO7D,OAAO,EAAsB,WAAW,EAAE,MAAM,YAAY,CAAC;AAE7D,OAAO,wBAAwB,CAAC;AAGhC;;;;;GAKG;AACH,qBAEa,cAAe,SAAQ,UAAU;IAC5C;;;OAGG;IAEH,UAAU,EAAE,WAAW,EAAE,CAAM;IAE/B;;OAEG;IAEH,WAAW,UAAS;IAEpB;;OAEG;IAEH,aAAa,UAAS;IAEtB;;OAEG;IAEH,KAAK,CAAC,EAAE,GAAG,CAAC;IAGZ,OAAO,CAAC,UAAU,CAAmB;IAErC,OAAgB,MAAM,EAAE,cAAc,CAqDpC;IAEO,YAAY,IAAI,IAAI;IAYpB,MAAM;IA0Df,IAAI,KAAK,YAER;IAEY,eAAe,IAAI,OAAO,CAAC,OAAO,CAAC;IA6BhD,SAAS,CAAC,oBAAoB,CAC5B,IAAI,EAAE,WAAW,EACjB,KAAK,EAAE,MAAM,GACZ,cAAc;IAkBjB,SAAS,CAAC,6BAA6B,CACrC,IAAI,EAAE,WAAW,EACjB,KAAK,EAAE,MAAM,GACZ,cAAc,GAAG,IAAI;IAUxB,SAAS,CAAC,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW;IAoB9D,OAAO,CAAC,uBAAuB;CAOhC"}

package/dist/pd-order-summary.js

@@ -1,11 +1,9 @@
 import { css, LitElement, html } from "lit";
-import { property, customElement } from "lit/decorators.js";
+import { property, query, customElement } from "lit/decorators.js";
 import { localized, msg } from "@lit/localize";
-import { format } from "fecha";
-import "@progressive-development/pd-forms/pd-checkbox";
-import "@progressive-development/pd-forms/pd-radio-group";
 import "@progressive-development/pd-forms/pd-form-container";
 import "@progressive-development/pd-forms/pd-form-row";
+import "@progressive-development/pd-forms/pd-checkbox";
 import "@progressive-development/pd-price/pd-pricetable";
 import "@progressive-development/pd-dialog/pd-popup";
 import "@progressive-development/pd-content/pd-edit-content";
@@ -38,32 +36,15 @@ let PdOrderSummary = class extends LitElement {
         })
       );
     });
-    this.addEventListener("validate-form", this._validateForm);
   }
   render() {
     if (!this.order) return html`<p>No order is set</p>`;
     return html`
       <h3>${msg("Übersicht", { id: "pd.order.summary.title" })}</h3>
       <div class="edit-summary-container">
-        ${this.orderSteps.map((step, index) => {
-      switch (step.key) {
-        case "zip":
-        case "booking":
-          return this._getBookingSummary(index + 1, step);
-        case "contacts":
-          return this._getContactsSummary(index + 1, step);
-        default:
-          return html`
-                <pd-edit-content
-                  contentTitle="${step.name}"
-                  stepNumber="${index + 1}"
-                  .data="${step.data}"
-                >
-                  <slot name="${step.key}"></slot>
-                </pd-edit-content>
-              `;
-      }
-    })}
+        ${this.orderSteps.map(
+      (step, index) => this._mapOrderStepSummary(step, index)
+    )}
       </div>
 
       ${this.order.priceData ? html`
@@ -108,42 +89,74 @@ let PdOrderSummary = class extends LitElement {
           ` : ""}
     `;
   }
-  _validateForm(e) {
-    var _a, _b;
-    if (e.detail && !e.detail.singleElement && this.withAgreement) {
-      (_b = (_a = this.shadowRoot) == null ? void 0 : _a.getElementById("submitSummaryFormId")) == null ? void 0 : _b.dispatchEvent(new CustomEvent("validate-form", { detail: e.detail }));
-    }
+  get valid() {
+    var _a;
+    return !this.withAgreement || ((_a = this._agreeForm) == null ? void 0 : _a.valid) === true;
   }
-  _getBookingSummary(index, step) {
-    var _a, _b;
-    const date = ((_a = this.order) == null ? void 0 : _a.selectedDate) ? format(this.order.selectedDate, "DD/MM/YYYY") : void 0;
-    const bookingData = [{ name: "Postcode:", val: (_b = this.order) == null ? void 0 : _b.zip }];
-    if (date) {
-      bookingData.push({ name: "Datum van herstelling:", val: date });
+  async triggerValidate() {
+    var _a;
+    return (_a = this._agreeForm) == null ? void 0 : _a.triggerValidate();
+  }
+  /*
+    For Booking:
+    case "zip":
+    case "booking":
+      return this._getBookingSummary(index + 1, step);
+  
+    private _getBookingSummary(index: number, step: PdOrderStep) {
+      const date = this.order?.selectedDate
+        ? format(this.order.selectedDate, "DD/MM/YYYY")
+        : undefined;
+      const bookingData = [{ name: "Postcode:", val: this.order?.zip }];
+      if (date) {
+        bookingData.push({ name: "Datum van herstelling:", val: date });
+      }
+  
+      return html`
+        <pd-edit-content
+          contentTitle="${step.name}"
+          stepNumber="${index}"
+          .data="${bookingData}"
+        ></pd-edit-content>
+      `;
+    }
+    */
+  _mapOrderStepSummary(step, index) {
+    const custom = this._renderCustomOrderStepSummary(step, index);
+    if (custom) {
+      return custom;
     }
     return html`
       <pd-edit-content
         contentTitle="${step.name}"
-        stepNumber="${index}"
-        .data="${bookingData}"
-      ></pd-edit-content>
+        stepNumber="${index + 1}"
+        .data="${step.data}"
+      >
+        <slot name="${step.key}"></slot>
+      </pd-edit-content>
     `;
   }
+  _renderCustomOrderStepSummary(step, index) {
+    switch (step.key) {
+      case "contacts":
+        return this._getContactsSummary(index + 1, step);
+      default:
+        return null;
+    }
+  }
+  // ?editDisabled="${this.order?.withLogin}" => Alter code, von ticomi-web
   _getContactsSummary(index, step) {
-    var _a, _b;
+    var _a;
+    const contactData = (_a = this.order) == null ? void 0 : _a.contacts;
     return html`
-      <pd-edit-content
-        contentTitle="${step.name}"
-        stepNumber="${index}"
-        ?editDisabled="${(_a = this.order) == null ? void 0 : _a.withLogin}"
-      >
-        ${((_b = this.order) == null ? void 0 : _b.contacts) ? html`
+      <pd-edit-content contentTitle="${step.name}" stepNumber="${index}">
+        ${contactData ? html`
               <pd-order-contacts
                 ?withPayment="${this.withPayment}"
-                .orderContact="${this.order.contacts.orderContact}"
-                .billingContact="${this.order.contacts.billingContact}"
-                .adminContact="${this.order.contacts.adminContact}"
-                .propertyContact="${this.order.contacts.propertyContact}"
+                .orderContact="${contactData.orderContact}"
+                .billingContact="${contactData.billingContact}"
+                .adminContact="${contactData.adminContact}"
+                .propertyContact="${contactData.propertyContact}"
                 summary
               ></pd-order-contacts>
             ` : ""}
@@ -225,6 +238,9 @@ __decorateClass([
 __decorateClass([
   property({ type: Object })
 ], PdOrderSummary.prototype, "order", 2);
+__decorateClass([
+  query("#submitSummaryFormId")
+], PdOrderSummary.prototype, "_agreeForm", 2);
 PdOrderSummary = __decorateClass([
   customElement("pd-order-summary"),
   localized()

package/dist/stories/pd-order-contacts.stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pd-order-contacts.stories.d.ts","sourceRoot":"","sources":["../../src/stories/pd-order-contacts.stories.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAE/D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,sBAAsB,CAAC;wBAMzB,IAAI,CAAC,eAAe,CAAC;AAJ1B,wBAI2B;AAqE3B,eAAO,MAAM,OAAO,0BAAoB,CAAC;AAKzC,eAAO,MAAM,gBAAgB,0BAAoB,CAAC;AAMlD,eAAO,MAAM,cAAc,0BAAoB,CAAC;AAgBhD,eAAO,MAAM,WAAW,0BAAoB,CAAC;AAM7C,eAAO,MAAM,mBAAmB,0BAAoB,CAAC;AAOrD,eAAO,MAAM,4BAA4B,0BAAoB,CAAC;AAQ9D,eAAO,MAAM,QAAQ,0BAAoB,CAAC;AAM1C,eAAO,MAAM,eAAe,0BAAoB,CAAC;AAOjD,eAAO,MAAM,uBAAuB,0BAAoB,CAAC;AASzD,eAAO,MAAM,MAAM,0BAAoB,CAAC;AAQxC,eAAO,MAAM,eAAe,0BAAoB,CAAC;AAWjD,eAAO,MAAM,sBAAsB,0BAAoB,CAAC"}
+{"version":3,"file":"pd-order-contacts.stories.d.ts","sourceRoot":"","sources":["../../src/stories/pd-order-contacts.stories.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAE/D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,sBAAsB,CAAC;wBAMzB,IAAI,CAAC,eAAe,CAAC;AAJ1B,wBAI2B;AA8E3B,eAAO,MAAM,OAAO,0BAAoB,CAAC;AAKzC,eAAO,MAAM,gBAAgB,0BAAoB,CAAC;AAMlD,eAAO,MAAM,cAAc,0BAAoB,CAAC;AAiBhD,eAAO,MAAM,WAAW,0BAAoB,CAAC;AAM7C,eAAO,MAAM,mBAAmB,0BAAoB,CAAC;AAOrD,eAAO,MAAM,4BAA4B,0BAAoB,CAAC;AAQ9D,eAAO,MAAM,QAAQ,0BAAoB,CAAC;AAM1C,eAAO,MAAM,eAAe,0BAAoB,CAAC;AAOjD,eAAO,MAAM,uBAAuB,0BAAoB,CAAC;AASzD,eAAO,MAAM,MAAM,0BAAoB,CAAC;AAQxC,eAAO,MAAM,eAAe,0BAAoB,CAAC;AAWjD,eAAO,MAAM,sBAAsB,0BAAoB,CAAC"}

package/dist/stories/pd-order-summary.stories.d.ts

@@ -1,12 +1,12 @@
 import { Meta, StoryFn } from '@storybook/web-components';
-import { PdOrderSummary } from '../pd-order-summary.js';
-declare const _default: Meta<PdOrderSummary>;
+import { TestSummary } from './test-impl/test-summary.js';
+declare const _default: Meta<TestSummary>;
 export default _default;
-export declare const OrderSummary: StoryFn<PdOrderSummary & {
+export declare const OrderSummary: StoryFn<TestSummary & {
     orderContact: any;
     billingContact?: any;
 }>;
-export declare const OrderSummaryEmptyBilling: StoryFn<PdOrderSummary & {
+export declare const OrderSummaryEmptyBilling: StoryFn<TestSummary & {
     orderContact: any;
     billingContact?: any;
 }>;

package/dist/stories/pd-order-summary.stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pd-order-summary.stories.d.ts","sourceRoot":"","sources":["../../src/stories/pd-order-summary.stories.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAI/D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAGxD,OAAO,wBAAwB,CAAC;wBAM3B,IAAI,CAAC,cAAc,CAAC;AAJzB,wBAI0B;AA6E1B,eAAO,MAAM,YAAY;kBA3CP,GAAG;qBACA,GAAG;EA0CqB,CAAC;AAuB9C,eAAO,MAAM,wBAAwB;kBAlEnB,GAAG;qBACA,GAAG;EAiEiC,CAAC"}
+{"version":3,"file":"pd-order-summary.stories.d.ts","sourceRoot":"","sources":["../../src/stories/pd-order-summary.stories.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAI/D,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,6BAA6B,CAAC;wBAMhC,IAAI,CAAC,WAAW,CAAC;AAJtB,wBAIuB;AA0EvB,eAAO,MAAM,YAAY;kBAxCP,GAAG;qBACA,GAAG;EAuCqB,CAAC;AAuB9C,eAAO,MAAM,wBAAwB;kBA/DnB,GAAG;qBACA,GAAG;EA8DiC,CAAC"}

package/dist/stories/test-impl/test-summary.d.ts

@@ -0,0 +1,8 @@
+import { TemplateResult } from 'lit';
+import { PdOrderSummary } from '../../pd-order-summary';
+import { PdOrderStep } from '../../types';
+export declare class TestSummary extends PdOrderSummary {
+    _renderCustomOrderStepSummary(step: PdOrderStep, index: number): TemplateResult | null;
+    private _getBookingSummary;
+}
+//# sourceMappingURL=test-summary.d.ts.map

package/dist/stories/test-impl/test-summary.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"test-summary.d.ts","sourceRoot":"","sources":["../../../src/stories/test-impl/test-summary.ts"],"names":[],"mappings":"AACA,OAAO,EAAQ,cAAc,EAAE,MAAM,KAAK,CAAC;AAI3C,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,qBACa,WAAY,SAAQ,cAAc;IACpC,6BAA6B,CACpC,IAAI,EAAE,WAAW,EACjB,KAAK,EAAE,MAAM,GACZ,cAAc,GAAG,IAAI;IAYxB,OAAO,CAAC,kBAAkB;CAiB3B"}

package/dist/types.d.ts

@@ -10,21 +10,10 @@ export interface PdOrderStep {
         val: string;
     }[];
 }
-export interface PdOrderData {
-    /** Die vom Nutzer ausgewählte Postleitzahl */
-    zip?: string;
-    /** Das vom Nutzer gewählte Datum, z.B. für einen Servicetermin */
-    selectedDate?: Date;
-    /** Gibt an, ob ein Benutzerlogin vorliegt (steuert z.B. Bearbeitbarkeit) */
-    withLogin?: boolean;
-    /** Optionale Kontaktinformationen für alle Kontaktrollen */
-    contacts?: {
-        orderContact?: PdContactData;
-        billingContact?: PdContactData;
-        adminContact?: PdContactData;
-        propertyContact?: PdContactData;
-    };
-    /** Preisstruktur für die Bestellung */
-    priceData?: unknown;
+export interface PdOrderContactData {
+    orderContact?: PdContactData;
+    billingContact?: PdContactData;
+    adminContact?: PdContactData;
+    propertyContact?: PdContactData;
 }
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAEpE,MAAM,WAAW,WAAW;IAC1B,qEAAqE;IACrE,GAAG,EAAE,MAAM,CAAC;IACZ,uDAAuD;IACvD,IAAI,EAAE,MAAM,CAAC;IACb,oDAAoD;IACpD,IAAI,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CACxC;AAED,MAAM,WAAW,WAAW;IAC1B,8CAA8C;IAC9C,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,kEAAkE;IAClE,YAAY,CAAC,EAAE,IAAI,CAAC;IACpB,4EAA4E;IAC5E,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,4DAA4D;IAC5D,QAAQ,CAAC,EAAE;QACT,YAAY,CAAC,EAAE,aAAa,CAAC;QAC7B,cAAc,CAAC,EAAE,aAAa,CAAC;QAC/B,YAAY,CAAC,EAAE,aAAa,CAAC;QAC7B,eAAe,CAAC,EAAE,aAAa,CAAC;KACjC,CAAC;IACF,uCAAuC;IACvC,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAEpE,MAAM,WAAW,WAAW;IAC1B,qEAAqE;IACrE,GAAG,EAAE,MAAM,CAAC;IACZ,uDAAuD;IACvD,IAAI,EAAE,MAAM,CAAC;IACb,oDAAoD;IACpD,IAAI,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CACxC;AAED,MAAM,WAAW,kBAAkB;IACjC,YAAY,CAAC,EAAE,aAAa,CAAC;IAC7B,cAAc,CAAC,EAAE,aAAa,CAAC;IAC/B,YAAY,CAAC,EAAE,aAAa,CAAC;IAC7B,eAAe,CAAC,EAAE,aAAa,CAAC;CACjC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@progressive-development/pd-order",
-  "version": "0.6.7",
+  "version": "0.6.9",
   "description": "Progressive Development Order Component",
   "author": "PD Progressive Development",
   "license": "SEE LICENSE IN LICENSE",
@@ -41,10 +41,10 @@
   "dependencies": {
     "@lit/localize": "^0.12.2",
     "@progressive-development/pd-calendar": "^0.6.7",
-    "@progressive-development/pd-contact": "^0.6.8",
-    "@progressive-development/pd-content": "^0.7.1",
-    "@progressive-development/pd-dialog": "^0.6.9",
-    "@progressive-development/pd-forms": "^0.7.2",
+    "@progressive-development/pd-contact": "^0.6.10",
+    "@progressive-development/pd-content": "^0.7.2",
+    "@progressive-development/pd-dialog": "^0.6.10",
+    "@progressive-development/pd-forms": "^0.7.3",
     "@progressive-development/pd-price": "^0.6.3",
     "@progressive-development/pd-shared-styles": "^0.2.5",
     "fecha": "^4.2.3",