diff --git a/bin/backend/controls/ErpUserData.css b/bin/backend/controls/ErpUserData.css new file mode 100644 index 0000000000000000000000000000000000000000..02bb55ac3d2ca070ca729b6f2b4754155f8bcb97 --- /dev/null +++ b/bin/backend/controls/ErpUserData.css @@ -0,0 +1,13 @@ +.erp-user-settings-customer-button { + padding: 20px; +} + +.erp-user-settings-customer-button span { + font-size: 16px; +} + +.erp-user-settings-customer-button .fa { + font-size: 40px; + width: 100% +} + diff --git a/bin/backend/controls/ErpUserData.js b/bin/backend/controls/ErpUserData.js index afab59ad81e590be296ab0f2b093c74c8f2c465b..61bf550b3a0ab6bcf0638ac8a085b59489164c95 100644 --- a/bin/backend/controls/ErpUserData.js +++ b/bin/backend/controls/ErpUserData.js @@ -5,7 +5,9 @@ define('package/quiqqer/erp/bin/backend/controls/ErpUserData', [ 'qui/QUI', - 'qui/controls/Control' + 'qui/controls/Control', + + 'css!package/quiqqer/erp/bin/backend/controls/ErpUserData.css' ], function (QUI, QUIControl) { "use strict"; @@ -15,17 +17,9 @@ define('package/quiqqer/erp/bin/backend/controls/ErpUserData', [ Extends: QUIControl, Type : 'package/quiqqer/erp/bin/backend/controls/ErpUserData', - Binds: [ - 'checkAddressVatField' - ], - initialize: function (options) { this.parent(options); - this.$AddressSelect = null; - this.$ChUID = null; - this.$EuVatId = null; - this.addEvents({ onImport: this.$onImport }); @@ -35,50 +29,27 @@ define('package/quiqqer/erp/bin/backend/controls/ErpUserData', [ * @event: on import */ $onImport: function () { - var self = this; - - this.$AddressSelect = this.getElm().getElement('[name="quiqqer.erp.address"]'); - this.$ChUID = this.getElm().getElement('[name="quiqqer.erp.chUID"]'); - this.$EuVatId = this.getElm().getElement('[name="quiqqer.erp.euVatId"]'); - - this.$AddressSelect.addEvent('change', this.checkAddressVatField); - this.$AddressSelect.addEvent('load', function () { - var Instance = QUI.Controls.getById(self.$AddressSelect.get('data-quiid')); - Instance.addEvent('load', self.checkAddressVatField); + var self = this; + var Panel = QUI.Controls.getById( + self.getElm().getParent('.qui-panel').get('data-quiid') + ); + + this.getElm().addEvent('click', function (e) { + e.stop(); + + require([ + 'package/quiqqer/customer/bin/backend/controls/customer/Panel', + 'utils/Panels' + ], function (CustomerPanel, Utils) { + Utils.openPanelInTasks( + new CustomerPanel({ + userId: Panel.getUser().getId() + }) + ); + }); }); - this.checkAddressVatField(); - }, - - /** - * which vat field should be shown - */ - checkAddressVatField: function () { - var value = this.$AddressSelect.value; - var Option = this.$AddressSelect.getElement('[value="' + value + '"]'); - - this.$EuVatId.getParent('tr').setStyle('display', ''); - this.$ChUID.getParent('tr').setStyle('display', 'none'); - - if (!Option) { - return; - } - - var address = Option.innerText; - address = address.trim(); - address = address.split(','); - - var country = address.pop(); - country = country.trim(); - - if (country === 'CH') { - this.$EuVatId.getParent('tr').setStyle('display', 'none'); - this.$ChUID.getParent('tr').setStyle('display', ''); - } else { - this.$EuVatId.getParent('tr').setStyle('display', ''); - this.$ChUID.getParent('tr').setStyle('display', 'none'); - } + this.getElm().set('disabled', false); } - }); }); diff --git a/locale.xml b/locale.xml index 6365343ca9b99fb9040c565acc21066e410899b7..181ee1554b70b9f3307c988b3d3685213535610d 100644 --- a/locale.xml +++ b/locale.xml @@ -549,6 +549,14 @@ <![CDATA[The document cannot be sent by e-mail because the recipient e-mail address is invalid.]]></en> </locale> + <locale name="user.category.title"> + <de><![CDATA[Kundendaten]]></de> + <en><![CDATA[Customer data]]></en> + </locale> + <locale name="user.settings.customer.button"> + <de><![CDATA[Kundendaten öffnen]]></de> + <en><![CDATA[Open customer panel]]></en> + </locale> </groups> <groups name="quiqqer/erp" datatype="js"> diff --git a/template/user/erpSettings.html b/template/user/erpSettings.html index de4e7ca4752e5dd9b840c5bd3e0b75f5b5b2f18d..f6d84bbd80e6d8d55fc5d542f8bc868dae9dcb76 100644 --- a/template/user/erpSettings.html +++ b/template/user/erpSettings.html @@ -1,86 +1,7 @@ -<table class="data-table data-table-flexbox" - data-qui="package/quiqqer/erp/bin/backend/controls/ErpUserData" +<button disabled + data-qui="package/quiqqer/erp/bin/backend/controls/ErpUserData" + class="qui-button erp-user-settings-customer-button" > - <tr> - <th> - {locale group="quiqqer/erp" var="user.settings.title"} - </th> - </tr> - <tr> - <td> - <label class="field-container"> - <span class="field-container-item" style="width: 150px"> - {locale group="quiqqer/erp" var="user.settings.userNettoStatus"} - </span> - - {assign var=isNetto value=QUI\ERP\Utils\User::getBruttoNettoUserStatus($User)} - {assign var=bruttoSelected value=''} - {assign var=nettoSelected value=''} - - {if $isNetto !== 1} - {assign var=bruttoSelected value='selected="selected"'} - {/if} - - {if $isNetto} - {assign var=nettoSelected value='selected="selected"'} - {/if} - - <select name="quiqqer.erp.isNettoUser" class="field-container-field"> - <option value="2" {$bruttoSelected}> - {locale group="quiqqer/erp" var="user.settings.userNettoStatus.brutto"} - </option> - <option value="1" {$nettoSelected}> - {locale group="quiqqer/erp" var="user.settings.userNettoStatus.netto"} - </option> - </select> - </label> - </td> - </tr> - <tr style="display: none"> - <td> - <label class="field-container"> - <span class="field-container-item" style="width: 150px"> - {locale group="quiqqer/erp" var="user.settings.euVatId"} - </span> - <input type="text" name="quiqqer.erp.euVatId" class="field-container-field" - data-qui="package/quiqqer/erp/bin/backend/controls/settings/VatIdCheck" - /> - </label> - </td> - </tr> - <tr style="display: none"> - <td> - <label class="field-container"> - <span class="field-container-item" style="width: 150px"> - {locale group="quiqqer/erp" var="quiqqer.erp.chUID"} - </span> - <input type="text" name="quiqqer.erp.chUID" class="field-container-field"/> - </label> - </td> - </tr> - <tr> - <td> - <label class="field-container"> - <span class="field-container-item" style="width: 150px"> - {locale group="quiqqer/erp" var="user.settings.taxId"} - </span> - <input type="text" name="quiqqer.erp.taxId" class="field-container-field"/> - </label> - </td> - </tr> - <tr> - <td> - <label class="field-container"> - <span class="field-container-item" style="width: 150px"> - {locale group="quiqqer/erp" var="user.settings.address"} - </span> - <select type="text" - name="quiqqer.erp.address" - class="field-container-field" - data-qui="controls/users/address/Select" - data-value="{$User->getAttribute('quiqqer.erp.address')}" - ></select> - </label> - </td> - </tr> -</table> + <span class="fa fa-user"></span> + <span>{locale group="quiqqer/erp" var="user.settings.customer.button"}</span> +</button> diff --git a/user.xml b/user.xml index 868d7f6c49cb5d1e705cbdcfa77bda051ffe6270..8dfbad02ccbbc1c27c25231b33749d45259cf9a1 100644 --- a/user.xml +++ b/user.xml @@ -12,7 +12,9 @@ <window> <tab name="ERP"> - <text>Shop</text> + <text> + <locale group="quiqqer/erp" var="user.category.title"/> + </text> <image>fa fa-shopping-bag</image> <template>OPT_DIR/quiqqer/erp/template/user/erpSettings.html</template> </tab>