From e5840a6fabacd121671b664eadb66c8be64da22b Mon Sep 17 00:00:00 2001 From: Mike O'Donnell Date: Tue, 15 Sep 2015 19:56:20 -0600 Subject: [PATCH] 0.2.7 --- LICENSE | 337 +------ License.md | 168 ---- Readme.md | 2 +- public/index.html | 4 +- .../app/account/controllers/account-ctrl.js | 43 +- public/js/app/account/templates/account.html | 267 +++--- .../js/app/account/templates/addresses.html | 24 +- .../account/templates/editUser-dialog.html | 84 ++ .../app/auth/templates/password-update.html | 42 +- public/js/app/cart/services/cart-service.js | 4 + public/js/app/cart/templates/cart-costs.html | 17 +- .../controllers/confirmation-ctrl.js | 2 + .../controllers/browse-products-ctrl.js | 20 +- .../app/products/services/category-service.js | 6 +- .../search/controllers/search-list-ctrl.js | 8 +- public/js/app/shared/i18n/lang/de.js | 865 +++++++++++------- public/js/app/shared/i18n/lang/en.js | 4 +- public/js/app/shared/services/global-data.js | 5 + public/js/app/shared/site-config.js | 2 +- public/js/app/shared/templates/footer.html | 2 +- public/less/_account.less | 142 ++- public/less/_overwrites.less | 10 +- test/e2e/protractor-utils.js | 3 +- test/unit/account/account-ctrl-spec.js | 20 +- .../products/browse-products-ctrl-spec.js | 6 +- test/unit/products/category-svc-spec.js | 4 +- 26 files changed, 1064 insertions(+), 1027 deletions(-) delete mode 100644 License.md create mode 100644 public/js/app/account/templates/editUser-dialog.html diff --git a/LICENSE b/LICENSE index cc141c59a..3f4f94920 100644 --- a/LICENSE +++ b/LICENSE @@ -212,74 +212,9 @@ SUBCOMPONENTS This project includes the following subcomponents that are subject to seperate license terms. Your use of these subcomponents is subject to separate license terms applicable to each subcomponent. -Component: angular-translate -Licensor: Pascal Precht -Website: https://github.com/angular-translate/bower-angular-translate -License: MIT - -Component: Venturerocket / angular-stripe-js -Licensor: Venturocket, Inc. -Website: https://github.com/Venturocket/angular-stripe-js -License: MIT - -Component: yamm3 -Licensor: German Morales -Website: https://github.com/geedmo/yamm3 -License: MIT - -Component: algoliasearch -Licensor: Algolia Team -Website: https://github.com/algolia/algoliasearch-client-js -License: MIT - -Component: angular-touch -Licensor: Angular Core Team -Website: https://github.com/angular/bower-angular-touch -License: MIT - -Component: angular-sanitize -Licensor: Angular Core Team -Website: https://github.com/angular/bower-angular-sanitize -License: MIT - -Component: angular-ui-select +Component: angular-ui-bootstrap Licensor: Angular UI -Website: https://github.com/angular-ui/ui-select -License: MIT - -Component: angular-directive.g-signin -Licensor: Jerad Bitner -Website: https://github.com/sirkitree/angular-directive.g-signin -License: MIT - -Component: angular-xeditable -Licensor: Vitaliy Potapov -Website: https://github.com/vitalets/angular-xeditable -License: MIT - -Component: angular-bootstrap -Licensor: Angular UI -Website: https://github.com/angular-ui/bootstrap-bower -License: MIT - -Component: angular-cookie -Licensor: Ivan Pusic -Website: https://github.com/ivpusic/angular-cookie -License: MIT - -Component: spin.js -Licensor: Felix Gnass -Website: https://github.com/fgnass/spin.js -License: MIT - -Component: lodash -Licensor: -Website: https://github.com/lodash/lodash -License: MIT - -Component: restangular -Licensor: Martin Gontovnikas -Website: https://github.com/mgonto/restangular +Website: https://angular-ui.github.io/bootstrap/ License: MIT Component: bootstrap @@ -287,29 +222,9 @@ Licensor: Twitter, Inc. Website: http://getbootstrap.com/ License: MIT -Component: ngInfiniteScroll -Licensor: Brandon Tilley -Website: https://github.com/sroze/ngInfiniteScroll -License: MIT - -Component: angular-mocks -Licensor: Angular Core Team -Website: https://github.com/angular/bower-angular-mocks -License: MIT - -Component: angular-ui-router -Licensor: Angular UI -Website: https://github.com/angular-ui/ui-router -License: MIT - -Component: angular-resource -Licensor: Angular Core Team -Website: https://github.com/angular/bower-angular-resource -License: MIT - -Component: angular -Licensor: Angular Core Team -Website: https://angularjs.org/ +Component: img-touch-canvas +Licensor: Romain BEAUDON +Website: https://github.com/rombdn/img-touch-canvas/ License: MIT Component: jquery @@ -317,240 +232,30 @@ Licensor: jQuery Foundation and other contributors Website: http://jquery.com/ License: MIT -Component: protractor-screenshot-reporter -Licensor: Manuel Alabor -Website: https://github.com/swissmanu/protractor-screenshot-reporter +Component: jquery-fullscreen-plugin +Licensor: Klaus Reimer +Website: https://github.com/kayahr/jquery-fullscreen-plugin License: MIT -Component: protractor -Licensor: Julie Ralph -Website: https://github.com/angular/protractor +Component: jQuery-menu-aim +Licensor: Ben Kamens +Website: https://github.com/kamens/jQuery-menu-aim License: MIT -Component: phantomjs -Licensor: Dan Pupius -Website: https://github.com/Medium/phantomjs -License: Apache-2.0 - -Component: phantomcss -Licensor: James Cryer / Huddle -Website: https://github.com/Huddle/PhantomCSS +Component: jquery-throttle-debounce +Licensor: Ben Alman +Website: http://benalman.com/projects/jquery-throttle-debounce-plugin/ License: MIT -Component: karma-script-launcher -Licensor: Vojta Jina -Website: https://github.com/karma-runner/karma-script-launcher +Component: OwlCarousel +Licensor: Owl +Website: http://owlgraphic.com/owlcarousel/ License: MIT -Component: karma-phantomjs-launcher -Licensor: Vojta Jina -Website: https://github.com/karma-runner/karma-phantomjs-launcher -License: MIT - -Component: karma-junit-reporter -Licensor: Vojta Jina -Website: https://github.com/karma-runner/karma-junit-reporter -License: MIT - -Component: karma-jasmine -Licensor: Vojta Jina -Website: https://github.com/karma-runner/karma-jasmine -License: MIT - -Component: karma-html2js-preprocessor -Licensor: Vojta Jina -Website: https://github.com/karma-runner/karma-html2js-preprocessor -License: MIT - -Component: karma-firefox-launcher -Licensor: Vojta Jina -Website: https://github.com/karma-runner/karma-firefox-launcher -License: MIT - -Component: karma-coverage -Licensor: SATO taichi -Website: https://github.com/karma-runner/karma-coverage -License: MIT - -Component: karma-coffee-preprocessor -Licensor: Vojta Jina -Website: https://github.com/karma-runner/karma-coffee-preprocessor -License: MIT - -Component: karma-chrome-launcher -Licensor: Vijta Jina -Website: https://github.com/karma-runner/karma-chrome-launcher -License: MIT - -Component: karma -Licensor: Vojta Jína -Website: http://karma-runner.github.io/0.13/index.html -License: MIT - -Component: jasmine-reporters -Licensor: Ben Loveridge -Website: https://github.com/larrymyers/jasmine-reporters -License: MIT - -Component: istanbul -Licensor: Krishnan Anantheswaran -Website: https://github.com/gotwarlost/istanbul -License: BSD-3-Clause - -Component: grunt-contrib-watch -Licensor: Grunt Team -Website: https://github.com/gruntjs/grunt-contrib-watch -License: MIT - -Component: request -Licensor: Mikeal Rogers -Website: https://github.com/request/request -License: Apache-2.0 - -Component: load-grunt-tasks -Licensor: Sindre Sorhus -Website: https://github.com/sindresorhus/load-grunt-tasks -License: MIT - -Component: jade -Licensor: TJ Holowaychuk -Website: https://github.com/jadejs/jade -License: MIT - -Component: helmet -Licensor: Adam Baldwin -Website: https://github.com/helmetjs/helmet -License: MIT - -Component: grunt-usemin -Licensor: Yeoman -Website: https://github.com/yeoman/grunt-usemin -License: BSD-2-Clause - -Component: grunt-text-replace -Licensor: Jonathan Holmes -Website: https://github.com/yoniholmes/grunt-text-replace -License: MIT - -Component: grunt-rev -Licensor: Sebastiaan Deckers -Website: https://github.com/cbas/grunt-rev -License: MIT - -Component: grunt-ngmin -Licensor: Brian Ford -Website: https://github.com/btford/grunt-ngmin -License: BSD - -Component: grunt-karma -Licensor: Dave Geddes -Website: https://github.com/karma-runner/grunt-karma -License: MIT - -Component: grunt-express -Licensor: Brian Lai -Website: https://github.com/blai/grunt-express -License: MIT - -Component: grunt-env -Licensor: Jarrod Overson -Website: https://github.com/jsoverson/grunt-env -License: Apache-2.0 - -Component: grunt-contrib-watch -Licensor: Grunt Team -Website: http://gruntjs.com/ -License: MIT - -Component: grunt-contrib-uglify -Licensor: Grunt Team -Website: http://gruntjs.com/ -License: MIT - -Component: grunt-contrib-less -Licensor: Grunt Team -Website: http://gruntjs.com/ -License: MIT - -Component: grunt-contrib-jshint -Licensor: Grunt Team -Website: http://gruntjs.com/ -License: MIT - -Component: grunt-contrib-cssmin -Licensor: Grunt Team -Website: http://gruntjs.com/ -License: MIT - -Component: grunt-contrib-copy -Licensor: Grunt Team -Website: http://gruntjs.com/ -License: MIT - -Component: grunt-contrib-connect -Licensor: Grunt Team -Website: http://gruntjs.com/ -License: MIT - -Component: grunt-contrib-concat -Licensor: Grunt Team -Website: http://gruntjs.com/ -License: MIT - -Component: resemblejs -Licensor: James Cryer -Website: https://github.com/Huddle/Resemble.js -License: MIT - -Component: grunt-contrib-compass -Licensor: Grunt Team -Website: http://gruntjs.com/ -License: MIT - -Component: grunt-contrib-clean -Licensor: Grunt Team -Website: http://gruntjs.com/ -License: MIT - -Component: grunt-concurrent -Licensor: Sindre Sorhus -Website: https://github.com/sindresorhus/grunt-concurrent -License: MIT - -Component: grunt-angular-templates -Licensor: Eric Clemmons -Website: https://github.com/ericclemmons/grunt-angular-templates -License: MIT - -Component: grunt-cli -Licensor: Grunt Team -Website: http://gruntjs.com/ -License: MIT - -Component: grunt -Licensor: Grunt Team -Website: http://gruntjs.com/ -License: MIT - -Component: compression -Licensor: Douglas Christopher Wilson -Website: https://github.com/expressjs/compression -License: MIT - -Component: express -Licensor: TJ Holowaychuk -Website: https://github.com/strongloop/express -License: MIT - -Component: bower -Licensor: Twitter -Website: http://bower.io/ -License: MIT - -Component: async -Licensor: Caolan McMahon -Website: https://github.com/caolan/async -License: MIT +Component: Piwik +Licensor: Piwik +Website: http://piwik.org/ +License: GPL v3 ---------------------------------------------------------------------------------------------------------------------------- MIT License diff --git a/License.md b/License.md deleted file mode 100644 index fe75a3c90..000000000 --- a/License.md +++ /dev/null @@ -1,168 +0,0 @@ -# License information - -## For US based partners - -### 1. Scope - -1.1 Under this Test and Evaluation Agreement for Remote Access (“Agreement”) Company is granted a 90-day free trial license to access, test and evaluate the following software: - -hybris as a Service, Beta Release - -(hereinafter "Software") remotely on hybris systems. hybris may supply under this Agreement additional materials and documentation related to the Software (hereinafter “hybris Materials”). The purpose of this Agreement is to enable Company to test the Software and evaluate how Company may use the Software to support its business processes and for hybris to receive Company feedback about such test and evaluation of the Software. In addition, under this Agreement Company may get familiar with the functionality of the Software to determine its possible use in a productive use environment. Company acknowledges that the Software is a preliminary version and not subject to any productive use license agreement or any other agreement with hybris. hybris has no obligation to offer the Software for productive use or any other use, be it remotely accessible or by any other form of access. In addition, hybris has no obligation to include or remove any functionality from the Software in any future version or in any hybris standard product. Company and hybris mutually acknowledge and agree that it would be imprudent and unreasonable to rely upon the expectation of entering into a contract regarding the productive use of the Software. - -1.2 Use of the hybris systems is limited to access the Software for the purpose as permitted under this Agreement. - -1.3 hybris is not responsible for any data produced, used or inserted by Company under this Agreement. - -1.4 Remote access to the Software is dependent upon the availability of the hybris systems. hybris may suspend access to the hybris systems at any time, in its sole discretion. hybris shall endeavour to provide Company with advance notice of any such suspension if practicable. - -1.5 Remote access might also be subject to acceptance of separate terms. - -1.6 Remote access connectivity is the sole responsibility of the Company. hybris is not responsible for any problems or interruptions with respect to the connectivity to the hybris systems or Software under this Agreement. - -### 2. License Rights and Intellectual Property - -2.1 During the term of this Agreement hybris grants to Company a non-transferable and non-exclusive, limited license to remotely access and use the Software for the exclusive purpose of testing and evaluation in accordance with the hybris Materials. Company shall not use the Software for any productive purposes. - -2.2 Company shall not remove notices and notations in the Software and the hybris Materials that refer to copyrights, trademark rights, patent rights and other intellectual property rights. Unless expressly agreed otherwise herein, any and all patent rights, copyrights, trademark rights and other rights in the Software and the hybris Materials, as well as any improvements, inventions, design contributions or derivative works conceived or created by either party in or to the Software and the hybris Materials, shall remain the exclusive property of hybris and/or its licensors. Except for the limited license rights expressly granted herein, this Agreement does not transfer any proprietary right or interest in the Software and the hybris Materials to Company. Between Company and hybris all title to and rights in the Software and the hybris Materials, operational know-how and business secrets related thereto vest exclusively in hybris and/or its licensors, notably copyright and rights of authorship, rights to inventions, and any other industrial and intellectual property rights. All license rights not expressly granted to Company in this Agreement are reserved by hybris and its licensors. Company does not acquire any rights to the source code of the Software. - -2.3 As far as any proprietary rights described in Section 2.2 of this Agreement directly accrue to an employee or subcontractor of Company involved in the testing and evaluating, Company shall ensure the grant of rights under Section 2.2 through appropriate undertakings with such employees and subcontractors. - -2.4 Company shall not be entitled to license, sell, lease, rent, outsource or otherwise transfer, make available or otherwise give access to the Software and the hybris Materials to third parties. Company may utilize subcontractors for those activities within the scope of this Agreement provided Company ensures that such subcontractors adhere to the provisions set forth in this Agreement and Company remains liable to hybris for the acts and omissions of its subcontractors. - -2.5 Company shall not be entitled to duplicate, translate, decompile, reverse-engineer or otherwise modify any parts of the Software and the hybris Materials. No development activities are allowed or supported under this Agreement. - -### 3. Services and Support by hybris - -3.1 The use of the hybris system is an unsupported service. hybris is not obliged to provide or offer any updates to the Software. hybris may, in its sole discretion, provide Company with guidelines for testing and evaluation purposes. - -3.2 Any services by hybris, in particular assistance and consulting with respect to the use of the Software for individual business needs of Company, are not subject to this Agreement. - -### 4. Obligations of Company - -4.1 Company shall appoint a project manager who serves as a contact person for all matters of testing and evaluating. - -4.2 Company shall give comments on how the test runs, documenting related problems via the “hybris Message Wizard” unless informed otherwise by hybris. - -### 5. Limitation on Warranties and Liabilities - -THE SOFTWARE AND ANY hybris MATERIALS ARE LICENSED TO LICENSEE “AS IS”, WITHOUT ANY WARRANTY, ESCROW, TRAINING, MAINTENANCE, OR SERVICE OBLIGATIONS WHATSOEVER ON THE PART OF hybris. hybris MAKES NO EXPRESS OR IMPLIED WARRANTIES OF ANY TYPE WHATSOEVER, INCLUDING BUT NOT LIMITED TO IMPLIED WARRANTIES OF MERCHANTABILITY AND OF FITNESS FOR A PARTICULAR PURPOSE. LICENSEE ASSUMES ALL RISKS ASSOCIATED WITH ITS USE OF THE SOFTWARE AND THE hybris MATERIALS, INCLUDING WITHOUT LIMITATION RISKS RELATING TO QUALITY, PERFORMANCE, DATA LOSS, AND UTILITY IN A PRODUCTION ENVIRONMENT. IN NO EVENT SHALL hybris BE LIABLE TO LICENSEE OR TO ANY THIRD PARTY FOR ANY DAMAGES (WHETHER DIRECT, INDIRECT, CONSEQUENTIAL, INCIDENTAL, PUNITIVE OR ANY OTHER TYPE OF DAMAGE) ARISING IN CONNECTION WITH (i) LICENSEE’S USE OF OR INABILITY TO USE THE SOFTWARE OR THE hybris MATERIALS, (ii) hybris’S PROVISION OF OR FAILURE TO PROVIDE SERVICES PERTAINING TO THE SOFTWARE OR THE hybris MATERIALS, OR (iii) AS A RESULT OF ANY DEFECT IN THE SOFTWARE OR THE hybris MATERIALS. THIS DISCLAIMER OF LIABILITY SHALL APPLY REGARDLESS OF THE FORM OF ACTION THAT MAY BE BROUGHT AGAINST hybris, WHETHER IN CONTRACT OR TORT, INCLUDING WITHOUT LIMITATION ANY ACTION FOR NEGLIGENCE. LICENSEE’S SOLE REMEDY IN THE EVENT OF BREACH OF THIS AGRREEMENT BY hybris OR FOR ANY OTHER CLAIM RELATED TO THE SOFTWARE OR hybris MATERIALS SHALL BE TERMINATION OF THIS AGREEMENT. - -### 6. Data Protection and Confidentiality - -6.1 Each Party shall comply with applicable data protection laws and regulations. No personal data are collected, processed, stored or transmitted under this Agreement. In case of contractual data processing or transfer of personal data outside the EU, the Parties agree to execute a written agreement containing adequate regulations to protect the individuals’ privacy and comply with EU data protection laws. Subject to Section 1.3, Company agrees to take care for any data protection on his own in case it enters data into the system. - -6.2 Company shall treat as confidential all confidential information and trade secrets of hybris and its licensors acquired in connection with the performance of this Agreement that are expressly identified as confidential or proprietary or that are reasonably identifiable as confidential or proprietary based on the circumstances of their disclosure or by their nature ("Confidential Information") and to use such Confidential Information only to perform this Agreement. hybris’s Confidential Information shall include all of, but are not limited to the Software (in object and source code), hybris Materials, programming techniques and concepts, processing methods, system designs embedded in the Software, inventions, techniques, concepts, designs, flow charts, documentation, product specifications, application programming interface specifications, techniques and processes that relate to the Software or the hybris Materials, information on hybris Companies and business partners, information about deployed third-party software and any access credentials used to access the hybris systems, including, but not limited to password or account information. The terms and conditions of this Agreement shall also be treated confidential. - -6.3 The foregoing obligation shall not apply to the extent that Company shows that the information (i) was public knowledge at the time it was disclosed by hybris and had not become public knowledge through an act or omission by Company or Company’s employee or agent in breach of contract, or (ii) was in the possession of or known to Company before Company received it from hybris, or (iii) had been lawfully disclosed to Company by another person entitled to do so, or (iv) had been independently developed by Company without reference to hybris’s information. - -6.4 Confidential Information may be provided to third parties only upon prior written consent hybris. These third parties must be subject to a written non-disclosure obligation. The term “third party“ as used this Section 6.4 does not apply to employees and subcontractors of Company whose proper performance under this Agreement reasonably requires access to such information and who have executed corresponding non-disclosure agreements. - -6.5 Company agrees to be named to other Companies and publicly referenced as a participant in this test and evaluation activity. - -6.6 Company grants to hybris a license in the Feedback that is non-exclusive, perpetual, irrevocable, worldwide, royalty-free, and sub-licensable under all relevant intellectual property rights. hybris may do whatever it wishes with the Feedback, including (1) use, (2) publish, (3) disclose, (4) display, (5) perform, (6) copy, (7) make or have made, or (8) sell it. hybris does not have to identify Company as the Feedback’s source. hybris owes Company no money or anything else in exchange for the Feedback and hybris is not obligated to do anything with the Feedback. “Feedback” means information and materials provided by Company under this Agreement which relate directly to the design and performance of the Software and/or other hybris Materials. - -### 7. Term and Termination - -7.1 This Agreement enters into force upon the availability of the Software to Company and remains effective for a period of ninety (90) days thereafter. It ceases automatically upon expiration of this period without requiring any notice of termination. - -7.2 Either party may terminate this Agreement at any time during the term upon thirty days’ advance written notice to the other party. - -7.3 Either party may terminate this Agreement in the event the other party breaches an obligation under this Agreement, including but not limited to a breach of Sections 2 and 6. - -7.4 Upon expiration or termination of this Agreement Company’s access to the hybris system, Software and hybris Materials shall be terminated. To the extent applicable, Company shall return to hybris and/or destroy any of the hybris Materials and the Software provided by hybris under this Agreement. Any further use of the hybris system, Software and hybris Materials is not allowed and all parts of the Software, if any must be removed in its entirety from Company’s systems. - -### 8. General - -8.1 This Agreement constitutes the complete and exclusive statement of the agreement between hybris and Company related to the subject matter hereof, and supersedes all prior written and oral contracts, proposals and other communications between the parties relating to the subject matter. Oral agreements do not exist. - -8.2 Any changes to this Agreement must be in writing. This also applies to any waiver of this written form requirement. - -8.3 All notices or reports which are required or may be given pursuant to this Agreement shall be in writing and shall be deemed duly given when delivered to the respective addresses specified by either party. - -8.4 Company may not assign or otherwise transfer any of its rights under this Agreement without hybris’s prior written consent. - -8.5 If any provision of this Agreement proves to be invalid, this will not affect any other provision of this Agreement. - -8.6 This Agreement does not entitle either party to use the other party’s name, trademark or trade designation for purposes of advertising and marketing without prior written consent of this party unless provided otherwise herein. - -8.7 This Agreement shall be governed by and construed under the Commonwealth of Pennsylvania law without reference to its conflicts of law principles. In the event of any conflicts between foreign law, rules, and regulations, and United States of America law, rules, and regulations, United States of America law, rules, and regulations shall prevail and govern. The United Nations Convention on Contracts for the International Sale of Goods shall not apply to this agreement. The Uniform Computer Information Transactions Act as enacted shall not apply. The parties agree that the exclusive venue for all legal and equitable actions related to or arising from this Agreement shall be the United States Federal courts sitting in Philadelphia, Pennsylvania. The waiver by either party of any of its rights hereunder shall not be construed as a waiver of any subsequent breach. - - -## For partners in other countries - -### 1. Scope - -1.1 Under this Test and Evaluation Agreement for Remote Access (“Agreement”) Company is granted on a loan basis a 90-day free trial license to access, test and evaluate the following software: - -hybris as a Service, Beta Release - -(hereinafter "Software") remotely on hybris systems. hybris may supply under this Agreement additional materials and documentation related to the Software (hereinafter “hybris Materials”). -The purpose of this Agreement is to enable Company to test the Software and evaluate how Company may use the Software to support its business processes and for hybris to receive Company feedback about such test and evaluation of the Software. In addition, under this Agreement Company may get familiar with the functionality of the Software to determine its possible use in a productive use environment. Company acknowledges that the Software is a preliminary version and not subject to any productive use license agreement or any other agreement with hybris. hybris has no obligation to offer the Software for productive use or any other use, be it remotely accessible or by any other form of access. In addition, hybris has no obligation to include or remove any functionality from the Software in any future version or in any hybris standard product. Company and hybris mutually acknowledge and agree that it would be imprudent and unreasonable to rely upon the expectation of entering into a contract regarding the productive use of the Software. - -1.2 Use of the hybris systems is limited to access the Software for the purpose as permitted under this Agreement. - -1.3 hybris is not responsible for any data produced, used or inserted by Company under this Agreement. - -1.4 Remote access to the Software is dependent upon the availability of the hybris systems. hybris may suspend access to the hybris systems at any time, in its sole discretion. hybris shall endeavour to provide Company with advance notice of any such suspension if practicable. - -1.5 Remote access might also be subject to acceptance of separate terms. - -1.6 Remote access connectivity is the sole responsibility of the Company. hybris is not responsible for any problems or interruptions with respect to the connectivity to the hybris systems or Software under this Agreement. - -### 2. License Rights and Intellectual Property - -2.1 During the term of this Agreement hybris grants to Company a non-transferable and non-exclusive, limited license to remotely access and use the Software for the exclusive purpose of testing and evaluation in accordance with the hybris Materials. Company shall not use the Software for any productive purposes. - -2.2 Company shall not remove notices and notations in the Software and the hybris Materials that refer to copyrights, trademark rights, patent rights and other intellectual property rights. Unless expressly agreed otherwise herein, any and all patent rights, copyrights, trademark rights and other rights in the Software and the hybris Materials, as well as any improvements, inventions, design contributions or derivative works conceived or created by either party in or to the Software and the hybris Materials, shall remain the exclusive property of hybris and/or its licensors. Except for the limited license rights expressly granted herein, this Agreement does not transfer any proprietary right or interest in the Software and the hybris Materials to Company. Between Company and hybris all title to and rights in the Software and the hybris Materials, operational know-how and business secrets related thereto vest exclusively in hybris and/or its licensors, notably copyright and rights of authorship, rights to inventions, and any other industrial and intellectual property rights. All license rights not expressly granted to Company in this Agreement are reserved by hybris and its licensors. Company does not acquire any rights to the source code of the Software. - -2.3 As far as any proprietary rights described in Section 2.2 of this Agreement directly accrue to an employee or subcontractor of Company involved in the testing and evaluating, Company shall ensure the grant of rights under Section 2.2 through appropriate undertakings with such employees and subcontractors. - -2.4 Company shall not be entitled to license, sell, lease, rent, outsource or otherwise transfer, make available or otherwise give access to the Software and the hybris Materials to third parties. Company may utilize subcontractors for those activities within the scope of this Agreement provided Company ensures that such subcontractors adhere to the -provisions set forth in this Agreement and Company remains liable to hybris for the acts and omissions of its subcontractors. - -2.5 Company shall not be entitled to duplicate, translate, decompile, reverse-engineer or otherwise modify any parts of the Software and the hybris Materials. No development activities are allowed or supported under this Agreement. - -### 3. Services and Support by hybris - -3.1 The use of the hybris system is an unsupported service. hybris is not obliged to provide or offer any updates to the Software. hybris may, in its sole discretion, provide Company with guidelines for testing and evaluation purposes. - -3.2 Any services by hybris, in particular assistance and consulting with respect to the use of the Software for individual business needs of Company, are not subject to this Agreement. - -### 4. Obligations of Company - -4.1 Company shall appoint a project manager who serves as a contact person for all matters of testing and evaluating. - -4.2 Company shall give comments on how the test runs, documenting related problems via the “hybris Message Wizard” unless informed otherwise by hybris. - -### 5. Limitation on Warranties and Liabilities - -5.1 As the access to and use of the Software and the hybris Materials are provided to Company free of charge, hybris does not guarantee or warrant any features or qualities of the hybris system, the Software and the hybris Materials or give any undertaking with regard to any other quality. No such warranty or undertaking shall be implied by Company from any description in the hybris Materials or any other communication or advertisement for Software except to the extent that hybris has expressly confirmed that other quality in writing. - -5.2 Irrespective of the legal reasons, hybris shall only be liable for damages occurred under this Agreement if such damage (i) can be claimed under the German Product Liability Act or (ii) is caused due to gross negligence or intentional misconduct by hybris or (iii) consists of personal injury. In all other cases, neither hybris nor its employees, agents and subcontractors shall be liable for any kind of damage or claims hereunder. - -5.3 Company shall take adequate measures for the protection of Company's data and programs. - -### 6. Data Protection and Confidentiality - -6.1 Each Party shall comply with applicable data protection laws and regulations. No personal data are collected, processed, stored or transmitted under this Agreement. In case of contractual data processing or transfer of personal data outside the EU, the Parties agree to execute a written agreement containing adequate regulations to protect the individuals’ privacy and comply with EU data protection laws. Subject to Section 1.3, Company agrees to take care for any data protection on his own in case it enters data into the system. - -6.2 Company shall treat as confidential all confidential information and trade secrets of hybris and its licensors acquired in connection with the performance of this Agreement that are expressly identified as confidential or proprietary or that are reasonably identifiable as confidential or proprietary based on the circumstances of their disclosure or by their nature ("Confidential Information") and to use such Confidential Information only to perform this Agreement. hybris’s Confidential Information shall include all of, but are not limited to the Software (in object and source code), hybris Materials, programming techniques and concepts, processing methods, system designs embedded in the Software, inventions, techniques, concepts, designs, flow charts, documentation, product specifications, application programming interface specifications, techniques and processes that relate to the Software or the hybris Materials, information on hybris Companies and business partners, information about deployed third-party software and any access credentials used to access the hybris systems, including, but not limited to password or account information. The terms and conditions of this Agreement shall also be treated confidential. - -6.3 The foregoing obligation shall not apply to the extent that Company shows that the information (i) was public knowledge at the time it was disclosed by hybris and had not become public knowledge through an act or omission by Company or Company’s employee or agent in breach of contract, or (ii) was in the possession of or known to Company before Company received it from hybris, or (iii) had been lawfully disclosed to Company by another person entitled to do so, or (iv) had been independently developed by Company without reference to hybris’s information. - -6.4 Confidential Information may be provided to third parties only upon prior written consent hybris. These third parties must be subject to a written non-disclosure obligation. The term “third party“ as used this Section 6.4 does not apply to employees and subcontractors of Company whose proper performance under this Agreement reasonably requires access to such information and who have executed corresponding non-disclosure agreements. - -6.5 Company agrees to be named to other Companies and publicly referenced as a participant in this test and evaluation activity. - -6.6 hybris is free to use any Feedback for any purpose. Any materials included in Feedback shall be owned by hybris, unless otherwise agreed between the parties. Company grants to hybris all rights free of charge to the Feedback, materials and notes that Company makes in connection with the test and the evaluation. “Feedback“ means information and materials provided by Company under this Agreement which relate directly to the design and performance of the Software and/or other hybris Materials. - -### 7. Term and Termination - -7.1 This Agreement enters into force upon the availability of the Software to Company and remains effective for a period of ninety (90) days thereafter. It ceases automatically upon expiration of this period without requiring any notice of termination. - -7.2 Either party may terminate this Agreement at any time during the term upon thirty days’ advance written notice to the other party. - -7.3 Either party may terminate this Agreement in the event the other party breaches an obligation under this Agreement, including but not limited to a breach of Sections 2 and 6. - -7.4 Upon expiration or termination of this Agreement Company’s access to the hybris system, Software and hybris Materials shall be terminated. To the extent applicable, Company shall return to hybris and/or destroy any of the hybris Materials and the Software provided by hybris under this Agreement. Any further use of the hybris system, Software and hybris Materials is not allowed and all parts of the Software, if any must be removed in its entirety from Company’s systems. diff --git a/Readme.md b/Readme.md index d82120802..8a61dab44 100644 --- a/Readme.md +++ b/Readme.md @@ -273,7 +273,7 @@ between modules. ### About Contributions -At the moment, we are not accepting pull requests or contributions to this repository. This is likely to change in the future. In the meantime, we encourage you to create a fork of the repository and make edits there. You can also report bugs using GitHub's issue tracking system. +We encourage contributions in the form of pull requests against the master branch of this repository. Your pull request will be reviewed by a member of the hybris organization. ### License diff --git a/public/index.html b/public/index.html index 7d861a551..604c71fa2 100644 --- a/public/index.html +++ b/public/index.html @@ -161,7 +161,5 @@ - -
- + diff --git a/public/js/app/account/controllers/account-ctrl.js b/public/js/app/account/controllers/account-ctrl.js index 0a5c816a0..3c51bd627 100644 --- a/public/js/app/account/controllers/account-ctrl.js +++ b/public/js/app/account/controllers/account-ctrl.js @@ -18,6 +18,7 @@ angular.module('ds.account') function ($scope, $state, addresses, account, orders, OrderListSvc, AccountSvc, $modal, $filter, GlobalData, $translate, AuthDialogManager) { var modalInstance; + var originalAccountData; var customerNumber = account.customerNumber; var notSet = ''; $translate('NOT_SET').then(function(value){ @@ -46,7 +47,7 @@ angular.module('ds.account') $scope.showAllOrdersButton = true; $scope.showOrderButtons = ($scope.orders.length >= $scope.showOrdersDefault); $scope.showOrdersFilter = $scope.showOrdersDefault; - + $scope.titles = []; var titlesToTranslate = ['MR', 'MS', 'MRS', 'DR']; @@ -59,6 +60,35 @@ angular.module('ds.account') }); }); + $scope.editAccountInfo = function(mtype){ + $scope.mtype = mtype; + originalAccountData = angular.copy($scope.account); + + modalInstance = $modal.open({ + templateUrl: 'js/app/account/templates/editUser-dialog.html', + scope: $scope + }); + }; + + $scope.closeEditUserDialog = function(){ + $scope.account = originalAccountData; + modalInstance.close(); + }; + + $scope.updateUserInfo = function(){ + var account = angular.copy($scope.account); + + var emailRegexp = GlobalData.getEmailRegEx(); + + if ($scope.mtype === 'email' && !emailRegexp.test(account.contactEmail)) { + return $translate('PLEASE_ENTER_VALID_EMAIL'); + } + + AccountSvc.updateAccount(account).then(function(){ + modalInstance.close(); + }); + }; + var extractServerSideErrors = function (response) { var errors = []; @@ -198,6 +228,7 @@ angular.module('ds.account') $scope.showOrdersFilter = $scope.showAllOrdersButton ? $scope.showOrdersDefault : $scope.orders.length; $scope.showOrderButtons = ($scope.orders.length > $scope.showOrdersDefault); + }); }; @@ -216,15 +247,7 @@ angular.module('ds.account') }); }; - $scope.updateAccount = function (field, data) { - var account = angular.copy($scope.account); - var emailRegexp = /^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i; - if (field === 'contactEmail' && !emailRegexp.test(data)) { - return $translate('PLEASE_ENTER_VALID_EMAIL'); - } - account[field] = data; - return AccountSvc.updateAccount(account); - }; + $scope.updatePassword = function () { AuthDialogManager.showUpdatePassword(); diff --git a/public/js/app/account/templates/account.html b/public/js/app/account/templates/account.html index 42935e6df..b6180a976 100644 --- a/public/js/app/account/templates/account.html +++ b/public/js/app/account/templates/account.html @@ -13,129 +13,176 @@
-
-
+ -
- {{defaultAddress.street}} - {{defaultAddress.streetNumber}} -
- {{defaultAddress.city}}, {{defaultAddress.state}} {{defaultAddress.zipCode}}
- {{defaultAddress.country}}
- {{defaultAddress.contactPhone}} -
+
+ +
+ + +
-
-
-

{{'ADDRESSBOOK' | translate}}

- -
-
-
-
- -
- - +
+
+
+
+
+

{{'ADDRESSBOOK' | translate}}

+ +
+
+
+
+
+
+ +
+ + +
-
-
-
-

{{'ORDER_HISTORY' | translate}}

-
- - - - - - -
- - +
+
+
+

{{'ORDER_HISTORY' | translate}}

+
+ + + + + + +
+ + +
-
diff --git a/public/js/app/account/templates/addresses.html b/public/js/app/account/templates/addresses.html index 99250359f..33a0729fe 100644 --- a/public/js/app/account/templates/addresses.html +++ b/public/js/app/account/templates/addresses.html @@ -1,26 +1,28 @@ -
-
+
+
- +
- {{address.contactName}} ({{'DEFAULT' | translate}})
- {{address.companyName}}
 - {{address.streetNumber}} {{address.street}}, {{address.streetAppendix}}
- {{address.city}}, {{address.state}} {{address.zipCode}}
- {{address.country}}
- {{address.contactPhone}}
+ {{address.contactName}} (default)
+ + {{address.companyName}}
 + {{address.streetNumber}} {{address.street}}, {{address.streetAppendix}}
+ {{address.city}}, {{address.state}} {{address.zipCode}}
+ {{address.country}}
+ {{address.contactPhone}}
+
- +
@@ -38,4 +40,4 @@

{{'NO_ADDRESSES' | translate}}

-
\ No newline at end of file +
diff --git a/public/js/app/account/templates/editUser-dialog.html b/public/js/app/account/templates/editUser-dialog.html new file mode 100644 index 000000000..5f0967d7d --- /dev/null +++ b/public/js/app/account/templates/editUser-dialog.html @@ -0,0 +1,84 @@ +
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+

Region preferences

+
+ + +
+
+ +
+
+
+
+ + +
+
+
+ +
+ +
+
+ + +
+
+
diff --git a/public/js/app/auth/templates/password-update.html b/public/js/app/auth/templates/password-update.html index 51831c933..84f05d350 100644 --- a/public/js/app/auth/templates/password-update.html +++ b/public/js/app/auth/templates/password-update.html @@ -5,11 +5,25 @@
+ +
    +
  • {{error.message | translate}}
    • +
+ + +
    +
  • + {{'FIELD_REQUIRED' | translate}} +
    • +
  • + {{'PASSWORD_TOO_SHORT' | translate}} +
    • +
@@ -17,36 +31,20 @@ ng-model="passwordModel.newPassword" required ng-minlength="6" placeholder="{{'PASSWORD_MINCHAR'| translate}}" />
-
- - {{'FIELD_REQUIRED' | translate}} - - - {{'PASSWORD_TOO_SHORT' | translate}} - -
+
    +
  • {{'PASSWORDS_NO_MATCH' | translate}}
    • +
  • {{'PASSWORD_TOO_SHORT' | translate}}
    • +
-
- - {{'PASSWORDS_NO_MATCH' | translate}} - - - {{'PASSWORD_TOO_SHORT' | translate}} - -
- -
    -
  • {{error.message | translate}}
    • -
+
- - - - - - - - - \ No newline at end of file +
\ No newline at end of file diff --git a/public/js/app/confirmation/controllers/confirmation-ctrl.js b/public/js/app/confirmation/controllers/confirmation-ctrl.js index 78de93307..faf2ed8d5 100644 --- a/public/js/app/confirmation/controllers/confirmation-ctrl.js +++ b/public/js/app/confirmation/controllers/confirmation-ctrl.js @@ -56,5 +56,7 @@ angular.module('ds.confirmation') $scope.$on('$destroy', unbindConfirmAccount); }); + + }]); \ No newline at end of file diff --git a/public/js/app/products/controllers/browse-products-ctrl.js b/public/js/app/products/controllers/browse-products-ctrl.js index 6791b32e0..5316772d3 100644 --- a/public/js/app/products/controllers/browse-products-ctrl.js +++ b/public/js/app/products/controllers/browse-products-ctrl.js @@ -56,11 +56,11 @@ angular.module('ds.products') $rootScope.$emit('category:selected', { category: category }); - function getProductIdsFromElements(elements) { + function getProductIdsFromAssignments(assignments) { - return elements.map(function (element) { - if (element.ref.type === 'product') { - return element.ref.id; + return assignments.map(function (assignment) { + if (assignment.ref.type === 'product') { + return assignment.ref.id; } else { return ''; } @@ -161,7 +161,7 @@ angular.module('ds.products') */ $scope.addMore = function () { // category selected, but no products associated with category - leave blank for time being - if ($scope.category.elements && $scope.category.elements.length === 0) { + if ($scope.category.assignments && $scope.category.assignments.length === 0) { $scope.products = []; $scope.pagination = { productsFrom: 0, @@ -182,9 +182,9 @@ angular.module('ds.products') var qSpec = 'published:true'; - if ($scope.category.elements && $scope.category.elements.length > 0) { - qSpec = qSpec + ' ' + 'id:(' + getProductIdsFromElements($scope.category.elements) + ')'; - } // If no category elements (rather than length = 0), we're showing "all" products + if ($scope.category.assignments && $scope.category.assignments.length > 0) { + qSpec = qSpec + ' ' + 'id:(' + getProductIdsFromAssignments($scope.category.assignments) + ')'; + } // If no category assignment (rather than length = 0), we're showing "all" products var query = { pageNumber: $scope.pageNumber, pageSize: $scope.pageSize, @@ -284,8 +284,8 @@ angular.module('ds.products') //we only want to show published products on this list var qSpec = 'published:true'; - if ($scope.category.elements && $scope.category.elements.length > 0) { - qSpec = qSpec + ' ' + 'id:(' + getProductIdsFromElements($scope.category.elements) + ')'; + if ($scope.category.assignments && $scope.category.assignments.length > 0) { + qSpec = qSpec + ' ' + 'id:(' + getProductIdsFromAssignments($scope.category.assignments) + ')'; } query.q = qSpec; diff --git a/public/js/app/products/services/category-service.js b/public/js/app/products/services/category-service.js index 1719bdeb1..019aa0c1f 100644 --- a/public/js/app/products/services/category-service.js +++ b/public/js/app/products/services/category-service.js @@ -129,9 +129,9 @@ angular.module('ds.products') }); } cdef.promise.then(function (category) { - PriceProductREST.Categories.all('categories').one(category.id).all('elements').getList({recursive: true}).then( - function(elements){ - category.elements = elements.plain(); + PriceProductREST.Categories.all('categories').one(category.id).all('assignments').getList({recursive: true}).then( + function(assignments){ + category.assignments = assignments.plain(); compositeDef.resolve(category); }, function(){ compositeDef.resolve(category); diff --git a/public/js/app/search/controllers/search-list-ctrl.js b/public/js/app/search/controllers/search-list-ctrl.js index af5001227..7f3df1fd6 100644 --- a/public/js/app/search/controllers/search-list-ctrl.js +++ b/public/js/app/search/controllers/search-list-ctrl.js @@ -46,10 +46,10 @@ angular.module('ds.searchlist') $scope.loadMorePages = false; - function getProductIdsFromElements(elements) { + function getProductIdsFromAssignments(assignments) { - return elements.map(function (element) { - return element.objectID; + return assignments.map(function (assignment) { + return assignment.objectID; }); } @@ -172,7 +172,7 @@ angular.module('ds.searchlist') $scope.lastPageNumber = Math.ceil(content.nbHits / $scope.pageSize); if (content.hits.length > 0) { - var ids = getProductIdsFromElements(content.hits); + var ids = getProductIdsFromAssignments(content.hits); getProducts(ids); } diff --git a/public/js/app/shared/i18n/lang/de.js b/public/js/app/shared/i18n/lang/de.js index 5dda82f6e..6a1cbd554 100644 --- a/public/js/app/shared/i18n/lang/de.js +++ b/public/js/app/shared/i18n/lang/de.js @@ -15,334 +15,559 @@ angular.module('ds.i18n') .constant('TranslationsDE', { + en:'Englisch', + de:'Deutsch', + fr:'Französisch', + es:'Spanisch', - /* - - languages - */ - en: 'Englisch', - de: 'Deutsch', - fr: 'Französisch', - es: 'Spanisch', - - - /* - countries - */ - CANADA: 'Canada', - USA: 'USA', - - - /* - cart - */ - BACK_TO_CHECKOUT: 'zurück zur Kasse', - CHECKOUT: 'Kasse', - CONTINUE_SHOPPING: 'Weiter Einkaufen', - SHOP: 'Geschäft', - EST_ORDER_TOTAL: 'Zwischensumme', - FREE_SHIPPING: 'Kostenloser Versand', - ITEM: 'Artikel', - ITEM_PRICE: 'Artikel Preis', - TOTAL_PRICE: 'Gesamtpreis', - CART_UNAVAILABLE: 'Warenkorb momentan nicht zugänglich. Bitte noch einmal anfordern.', - CART_EMPTY: 'Keine Artikel im Korb', - CART_ITEM_UPDATE_ERROR: 'Aktualizierung nicht erfolgreich. Bitte noch einmal anfordern.', - ESTIMATE_TAX: 'Schätzung Steuerberatung', - APPLY: 'Anwenden', - ESTIMATE_TAX_ERROR: 'PLZ/Postleitzahl und Land Code Felder sind Pflichtfelder', - //XMSG - SELECT_A_COUNTRY: 'Wählen Sie ein Land', - - /* - checkout - */ - ADDRESS: 'Adresse', - ADDRESS_LINE_1: 'Adresszeile 1', - ADDRESS_LINE_2: 'Adresszeile 2', - BILLING_ADDRESS: 'Rechnungsadresse', - CITY: 'Stadt', - PROVINCE: 'Provinz', - CONTINUE: 'Weiter', - COUNTRY: 'Land', - CREDIT_CARD_NUMBER: 'Kreditkartennummer', - CVC_NUMBER: 'CVC Nummer', - DELIVERY_METHOD: 'Versandart', - EMAIL: 'Email', - EDIT: 'Bearbeiten', - FIRST_NAME: 'Vorname', - FREE_STANDARD_SHIPPING: 'Kostenloser Standardversand', - FLAT_RATE_SHPPING: 'Pauschale', - INVALID_EXPIRATION_DATE: 'Ungültiges Ablaufdatum', - ITEMS: 'Artikel', - LAST_NAME: 'Nachname', - LAST_NAME_REQUIRED: 'Nachname Pflicht', - METHOD: 'Verfahren', - MIDDLE_NAME: 'Zweiter Vorname', - MONTH: 'Monat', - NAME: 'Name', - NO_ITEMS_IN_CART: 'Es sind keine Artikel im Warenkorb.', - OPTIONAL: 'optional', - ORDER_DETAILS: 'Bestelldetails', - ORDER_DATE: 'Bestelldatum', - ORDER_PENDING: 'Einen Moment... Sie Ihre Bestellung', - ORDER_TOTAL: 'Gesamtsumme', - PAYMENT: 'Zahlung', - PHONE_REQUIRED: 'Telefon Pflicht', - PLACE_ORDER: 'Bestellung aufgeben', - PLEASE_CORRECT_ERRORS: 'Bitte korrigieren sie alle Fehler.', - PLEASE_ENTER_VALID_CC: 'Bitte geben Sie eine gültige Kreditkartennummer an.', - PLEASE_ENTER_VALID_CODE: 'Bitte geben Sie einen gültigen Code an.', - PLEASE_ENTER_VALID_EMAIL: 'Geben Sie eine gültige E-Mail an.', - REQUIRED: 'Erforderlich', - SAME_AS_BILLING_ADDRESS: 'entspricht Rechnungsadresse', - SECURE_CHECKOUT: 'Sicher bestellen', - SELECT_FROM_ADDRESS_BOOK: 'Vom Adressbuch Wählen', - SHIPPING: 'Versand', - SHIPPING_ADDRESS: 'Versandadresse', - SIMPLE_3_STEP_CHECKOUT: 'Einfach bestellen in drei Schritten', - SIMPLE_4_STEP_CHECKOUT: 'Einfach bestellen in vier Schritten', - STATE: 'Bundesland', - STEP_1_MY_DETAILS: '1. Meine Daten', - STEP_2_SHIPPING_INFORMATION: '2. Versandinformationen', - STEP_3_PAYMENT: '3. Zahlung', - STEP_4_REVIEW_ORDER: '4. Bestätigung', - SUBTOTAL: 'Zwischensumme', - DISCOUNT: 'Rabatt', - TAX: 'MwSt', - TOTAL: 'gesamt', - YEAR: 'Jahr', - - /* addresses */ - DEFAULT: 'Default', - DISTRICT: 'Kreis', - STREET_NAME: 'Straßenname mit Hausnummer', - BUILDING_NAME: 'Gebäudename', - ROOM_NUMBER: 'Zimmernummer', - PREFECTURE: 'Präfektur', - POSTAL_CODE: 'Postleitzahl', - ZIP: 'PLZ', - CITY_VILLAGE: 'Stadt / Dorf / Stadt Ward', - SUBAREA: 'Untergebiet', - FURTHER_SUBAREA: 'Weitere Untergebiet , Block # / Haus #', - - /* coupons */ - COUPON_APPLY: 'Anwenden', - COUPON_APPLIED: 'Angewandt', - COUPON_CODE: 'Gutscheincode hinzufügen', - COUPON_ERROR: 'Coupon nicht gültig', - COUPON_ERR_CURRENCY: 'Währungs ungültige Gutschein', - COUPON_ERR_ANONYMOUS: 'Melden Sie sich an , um Gutscheincode zu nutzen', - COUPON_ERR_UNAVAILABLE: 'Coupon nicht mehr verfügbar', - COUPON_MINIMUM_NOT_MET: 'Aktuelle Bestellsumme nicht die erforderliche Mindest für diesen Gutschein treffen', - COUPON_NOT_VALID: 'Coupon ungültig', - - /* - confirmation - */ - A_COPY_OF_YOUR_ORDER_DETAILS_HAS_BEEN_SENT_TO: 'Eine Bestellbestätigung wurde Ihnen zugesendet', - ENJOY_YOUR_ITEMS: 'Viel Spass mit ihrer Bestellung!', - FOR_YOUR_ORDER: 'für Ihre Bestellung!', - ITEM_IN_YOUR_ORDER: 'Element in der Reihenfolge', - ITEMS_IN_YOUR_ORDER: 'Artikel in Ihrer Bestellung', - QUESTIONS: 'Wenn Sie irgendwelche Fragen haben, kontaktieren Sie uns unter', - ORDER: 'Bestellung', - RETURN_TO_SHOPPING: 'Weiter einkaufen', - SUCCESS: 'Erfolg!', - ACCOUNT_SUCCESS: 'Dein Konto wurde erfolgreich erstellt!', - THANK_YOU: 'Vielen Dank', - THANK_YOU_FOR_YOUR_ORDER: 'Vielen Dank Für Ihre Bestellung', - THE_SHIPMENT_IS_SCHEDULED_TO_ARRIVE_AT_THE_FOLLOWING_LOCATION: 'Die Artikel werden an die folgenden Adresse gesendet', - YOUR_ORDER_IS: 'Ihre Bestellung ist # ', - ONE_MORE_STEP: 'Ein weiterer Schritt , um ein Konto zu erstellen', - ONE_MORE_STEP_MESSAGE: 'für eine Schnellauswahl und einfachen Zugang zu Vorherige Bestellungen', - SKU: 'SKU', - - /* - navigation - */ - PRODUCTS: 'Produkte', - BACK_TO: 'Zurück zu', - REGION: 'Region', - - /* - product detail page - */ - BUY: 'In den Warenkorb', + //XBUT + //------------------------------------------------- + // Cart + //------------------------------------------------- + + BACK_TO_CHECKOUT:'Zurück zur Kasse', + //XBUT + CHECKOUT:'Kasse', + //XBUT + CONTINUE_SHOPPING:'Einkauf fortsetzen', + //XBUT + SHOP:'Einkaufen', + //XFLD: Est. is short for Estimated + EST_ORDER_TOTAL:'Geschätzte Bestellsumme', + //XFLD + FREE_SHIPPING:'Versand und Rücksendung in den USA kostenlos', + //XFLD + ITEM:'Position', + //XFLD + ITEM_PRICE:'Positionspreis', + //XFLD + TOTAL_PRICE:'Gesamtpreis', + //XMSG + CART_UNAVAILABLE:'Der Warenkorb ist zurzeit nicht verfügbar. Versuchen Sie es noch einmal.', + //XMSG + CART_EMPTY:'Ihr Warenkorb ist leer', + //XMSG + CART_ITEM_UPDATE_ERROR:'Die Aktualisierung war nicht erfolgreich. Versuchen Sie es noch einmal.', + //XFLD + ESTIMATE_TAX:'Steuern schätzen', + //XBUT + APPLY:'Anwenden', + //XMSG + ESTIMATE_TAX_ERROR:'Felder "Postleitzahl" und "Ländercode" sind erforderlich', + + //XFLD + //------------------------------------------------- + // Checkout + //------------------------------------------------- + + + ADDRESS:'Adresse', + //XFLD + ADDRESS_LINE_1:'Adresszeile 1', + //XFLD + ADDRESS_LINE_2:'Adresszeile 2', + //XGRP + BILLING_ADDRESS:'Rechnungsadresse', + //XFLD + CITY:'Ort', + //XFLD: Is part of the Canadian and German address forms + PROVINCE:'Provinz/Bundesland', + //XBUT + CONTINUE:'Weiter', + //XFLD + COUNTRY:'Land', + //XFLD + CREDIT_CARD_NUMBER:'Kreditkartennummer', + //XFLD + CVC_NUMBER:'Prüfnummer', + //XFLD + DELIVERY_METHOD:'Liefermethode', + //XFLD + EMAIL:'E-Mail', + //XBUT + EDIT:'Bearbeiten', + //XFLD + FIRST_NAME:'Vorname', + //XLST + FREE_STANDARD_SHIPPING:'Kostenloser Standardversand', + //XLST + FLAT_RATE_SHPPING:'Pauschale', + //XMSG + INVALID_EXPIRATION_DATE:'Ungültiges Ablaufdatum', + //XFLD + ITEMS:'Positionen', + //XFLD + LAST_NAME:'Nachname', + //XFLD + LAST_NAME_REQUIRED:'Nachname erforderlich', + //XFLD + METHOD:'Versandart', + //XFLD + MIDDLE_NAME:'Zweiter Vorname', + //XFLD + MONTH:'Monat', + //XFLD + NAME:'Name', + //XMSG + NO_ITEMS_IN_CART:'Ihr Warenkorb enthält keine Positionen.', + //XACT + OPTIONAL:'Optional', + //XGRP + ORDER_DETAILS:'Bestelldetails', + //XFLD + ORDER_DATE:'Bestelldatum', + //XMSG + ORDER_PENDING:'Einen Augenblick bitte... Ihre Bestellung wird ausgeführt', + //XFLD + ORDER_TOTAL:'Bestellsumme', + //XFLD + PAYMENT:'Zahlung', + //XMSG + PHONE_REQUIRED:'Telefon erforderlich', + //XBUT + PLACE_ORDER:'Bestellen', + //XFLD + PLACED_AT:'Bestellt am', + //XMSG + PLEASE_CORRECT_ERRORS:'Korrigieren Sie vor dem Bestellen die oben aufgeführten Fehler.', + //XMSG + PLEASE_ENTER_VALID_CC:'Geben Sie eine gültige Kreditkartennummer ein', + //XMSG + PLEASE_ENTER_VALID_CODE:'Geben Sie einen gültigen Code ein', + //XMSG + PLEASE_ENTER_VALID_EMAIL:'Geben Sie eine gültige E-Mail-Adresse im Format name@beispiel.com ein', + //XACT + REQUIRED:'Erforderlich', + //XCKL + SAME_AS_BILLING_ADDRESS:'Wie Rechnungsadresse', + //XTIT + SECURE_CHECKOUT:'Sichere Kaufabwicklung', + //XBUT + SELECT_FROM_ADDRESS_BOOK:'Aus Adressbuch auswählen', + //XFLD + SHIPPING:'Versand', + //XGRP + SHIPPING_ADDRESS:'Lieferadresse', + //XGRP + SIMPLE_3_STEP_CHECKOUT:'Einfache Kaufabwicklung in 3 Schritten', + //XGRP + SIMPLE_4_STEP_CHECKOUT:'Einfache Kaufabwicklung in 4 Schritten', + //XFLD: Is part of the US address form + STATE:'Bundesstaat', + //XGRP + STEP_1_MY_DETAILS:'Schritt 1: Meine Details', + //XGRP + STEP_2_SHIPPING_INFORMATION:'Schritt 2: Versandinformationen', + //XGRP + STEP_3_PAYMENT:'Schritt 3: Zahlung', + //XGRP + STEP_4_REVIEW_ORDER:'Schritt 4: Bestellung prüfen', + //XFLD + SUBTOTAL:'Zwischensumme', + //XFLD + DISCOUNT:'Rabatt', + //XFLD + TAX:'Steuern', + //XFLD + TOTAL:'Summe', + //XFLD + YEAR:'Jahr', + + //XFLD + //------------------------------------------------- + // Addresses + //------------------------------------------------- + + + DEFAULT:'Standard', + //XFLD: Is part of the Chinese addreess form + DISTRICT:'Stadtbezirk', + //XFLD + STREET_NAME:'Straße/Hausnummer', + //XFLD + BUILDING_NAME:'Gebäudename/-nummer', + //XFLD + ROOM_NUMBER:'Zimmernummer', + //XFLD: Is part of the Japanese address form + PREFECTURE:'Präfektur', + //XFLD + POSTAL_CODE:'Postleitzahl', + //XFLD + ZIP:'Postleitzahl', + //XFLD + CITY_VILLAGE:'Stadt/Dorf/Stadtbezirk', + //XFLD + SUBAREA:'Stadtteil', + //XFLD + FURTHER_SUBAREA:'Stadtteilabschnitt, Blocknummer/Hausnummer', + + //XBUT + //------------------------------------------------- + // Coupons + //------------------------------------------------- + + + COUPON_APPLY:'Anwenden', + //XFLD + COUPON_APPLIED:'Angewendet', + //XLNK + COUPON_CODE:'Couponcode hinzufügen', + //XMSG + COUPON_ERROR:'Coupon nicht gültig.', + //XMSG + COUPON_ERR_CURRENCY:'Währung für Coupon ungültig', + //XMSG + COUPON_ERR_ANONYMOUS:'Melden Sie sich an, um den Couponcode zu verwenden', + //XMSG + COUPON_ERR_UNAVAILABLE:'Coupon nicht mehr verfügbar', + //XMSG + COUPON_MINIMUM_NOT_MET:'Aktuelle Bestellsumme entspricht nicht der erforderlichen Mindestsumme für diesen Coupon', + //XMSG + COUPON_NOT_VALID:'Coupon nicht gültig', + + //XMSG + //------------------------------------------------- + // Confirmation + //------------------------------------------------- + + + A_COPY_OF_YOUR_ORDER_DETAILS_HAS_BEEN_SENT_TO:'

Eine Kopie Ihrer Bestelldetails wurde an {{emailAddress}}

gesendet', + //XMSG + ENJOY_YOUR_ITEMS:'Viel Freude an Ihrem Einkauf!', + //XMSG + ITEM_IN_YOUR_ORDER:'Position in Ihrer Bestellung', + //XMSG + ITEMS_IN_YOUR_ORDER:'Positionen in Ihrer Bestellung', + //XMSG + QUESTIONS:'

Bei Fragen kontaktieren Sie uns unter {{questionsContactInfo}}.

', + //XFLD + ORDER:'Bestellung', + //XBUT + RETURN_TO_SHOPPING:'Zurück zum Einkauf', + //XMSG + SUCCESS:'Vorgang war erfolgreich!', + //XMSG + ACCOUNT_SUCCESS:'Ihr Konto wurde erfolgreich angelegt.', + //XMSG + THANK_YOU:'Vielen Dank', + //XMSG + THANK_YOU_FOR_YOUR_ORDER:'Vielen Dank
für Ihre Bestellung!', + //XMSG + THE_SHIPMENT_IS_SCHEDULED_TO_ARRIVE_AT_THE_FOLLOWING_LOCATION:'Die Bestellung wird geliefert an', + //XMSG + ONE_MORE_STEP:'Nur ein weiterer Schritt zum Anlegen eines Kontos mit schneller Kaufabwicklung und einem einfachen Zugriff auf frühere Bestellungen', + //XFLD Stock Keeping Unit + SKU:'Lagermengeneinheit', + + //XFLD + //------------------------------------------------- + // Navigation + //------------------------------------------------- + + + PRODUCTS:'Produkte', + //XFLD: The title of the site selector + REGION:'Region', + + //XBUT + //------------------------------------------------- + // Product Detail Page + //------------------------------------------------- + + + BUY:'Kaufen', + //XBUT ADD_TO_CART:'In den Warenkorb', - PRODUCT_DESCRIPTION: 'Produkte Beschreibung', - OUT_OF_STOCK: 'Ausverkauft', - QTY: 'Menge', - ERROR_ADDING_TO_CART: 'Artikel konnte nicht hinzugefügt werden. Bitte noch einmal probieren.', - - - /* - product list page - */ - NEWEST: 'neueste', - OF: 'Von', - PRICE_HIGH_LOW: 'Preis absteigend', - PRICE_LOW_HIGH: 'Preis aufsteigend', - SORT_BY: 'Sortieren', - VIEWING: 'Anzeige', - PRODUCTS_FROM_TO: '
{{productsFrom}}-{{productsTo}} of {{total}}
', - ALL_PRODUCTS: 'Alle Produkte', - - EMPTY_MSG: 'Demo Shop - Coming soon', - LANGUAGES: 'Sprachen', - SELECT_LANGUAGE: 'Wählen Sie eine Sprache', - SIGN_OUT: 'Austragen', - SIGN_IN: 'Anmelden', - SIGN_IN_WITH_FACEBOOK: 'Mit Facebook Anmelden', - LOG_IN_WITH_GOOGLE_PLUS: 'Mit Google+ Anmelden', - MY_ACCOUNT: 'Mein Profil', - CREATE_ACCOUNT: 'Konto erstellen', - CONTINUE_AS_GUEST: 'Weiter als Gast', - - /* - account page - */ - ACCOUNT_DETAILS: 'Kontodaten', - ADD: 'Hinzufügen', - ADDRESSBOOK: 'Adressbuch', - NO_ADDRESSES: 'Sie haben keine Adressen gespeichert!', - ADD_ADDRESS: 'Adresse hinzufügen', - CLOSE: 'Schließen', - COMPANY_NAME: 'Name Der Firma', - CONFIRM_ADDRESS_REMOVAL: 'Adresse löschen?', - FULL_NAME: 'Vollständiger Name', - CONTACT_PHONE: 'Telefon', - CURRENCY: 'Währung', - SELECT_CURRENCY: 'Wählen Sie eine Währung', - DATE: 'Datum', - LOCALE: 'Ort', - NAME_REQUIRED: 'Name Erforderlich', - STREET: 'Straße', - SAVE: 'Speichern', - WELCOME: 'Willkommen,
{{firstName}} {{middleName}} {{lastName}}', - ITEM_IN_ORDER: 'translation needed', - ITEMS_IN_ORDER: 'Postenzähler', - NOT_SET: 'Unbekannt', - ORDER_HISTORY: 'Bestellverlauf', - ORDER_NUMBER: 'Bestellnummer', - ORDER_STATUS: 'Auftragsstatus', - SHIPPING_DETAILS: 'SHIPPING DETAILS', - STREET_NUMBER: 'Nummer', - UPDATE_PASSWORD: 'Passwort aktualisieren', - CURRENT_PASSWORD: 'Aktuelles Passwort', - NEW_PASSWORD: 'Neues Passwort', - CONFIRM_NEW_PASSWORD: 'Neues Passwort bestätigen', - PASSWORDS_NO_MATCH: 'Passwörter stimmen nicht überein', - WRONG_CURRENT_PASSWORD: 'Aktuelles Passwort nicht korrekt.', - PASSWORD_TOO_SHORT: 'Passwort zu kurz', - SHOW_ALL: 'Alle anzeigen', - SHOW_LESS: 'Weniger', - - /* - login, password, signup - */ - PASSWORD: 'Passwort', - PASSWORD_MINCHAR: 'Min. 6 Zeichen', - CONFIRM_PASSWORD: 'Passwort bestätigen', - FORGOT_PW: 'Passwort vergessen?', - RESET_PASSWORD: 'Neues Passwort', - RESET_PW_TITLE: 'Passwort Zurücksetzen', - RESET_PW_INSTRUCT: 'Bitte ein neues Passwort angeben.', - TOKEN: 'Token', - FORGOT_PW_INSTRUCT: 'Bitte Emailadresse angeben. Ein Link zum Zurücksetzen des Passworts wird Ihnen dann zugesendet.', - REQUEST_PW_EXPIRED: 'Passwort Zurücksetzung Abgelaufen', - REQUEST_PW_EXPIRED_MSG: 'Die Anfrage zum Zurücksetzen des Passworts ist abgelaufen. Bitte Emailadresse angeben und noch einmal anfordern.', - CHECK_EMAIL:'Überprüfen Sie Ihre Email', - CHECK_EMAIL_INSTRUCT: '... und klicken auf den Link zum Zurücksetzen des Passworts. Gültig für 24 Stunden.', - PASSWORD_REQUIRED: 'Passwort mit mindestens 6 Zeichen erforderlich.', - PASSWORDS_MUST_MATCH: 'Passwörter müssen übereinstimmen.', - PW_SUCCESS: 'Erfolg', - PW_CHANGED_MSG: 'Ihr Passwort wurde geändert. Sie können sich nun in Ihrem Konto anmelden.', - INVALID_TOKEN: 'Dieser Link is nicht gültig. Bitte neu anfordern.', - PW_CHANGE_FAILED: 'Passwort konnte nicht geändert werden.', - RESET_PW_REPEAT: 'Link nochmal anfordern.', - FIELD_REQUIRED: 'Angabe erforderlich', - FIELD_TOO_SHORT: 'Feld zu kurz!', - FIELDS_NOT_MATCHING: 'Angaben stimmen nicht überein!', - - SERVER_UNAVAILABLE: 'Server ist nicht verfügbar, bitte versuchen Sie es später erneut.', - INVALID_CREDENTIALS: 'Anmeldeinformation ungültig.', - PASSWORD_INVALID: 'Passwort ungültig - mindestens 6 Zeichen erforderlich.', - ACCOUNT_LOCKED: 'Konto wegen hoher Anzahl von ungültigen Anmeldeversuchen gesperrt. Bitte warten Sie 5 Minuten.', - ACCOUNT_ALREADY_EXISTS: 'Konto für diese Emailadresse wurde bereits erstellt.', - FORGOT_PASSWORD: 'Passwort vergessen?', - EMAIL_NOT_FOUND: 'Emailadresse nicht mit einem Konto verbunden.', - ENTER_EMAIL: 'Emailadresse angeben', - ENTER_EXISTING_EMAIL: 'Geben Sie die E-Mail-Adresse eines vorhandenen Kontos', - LOGIN_FAILED: 'Anmeldung fehlgeschlagen', - - ACCOUNT_EMAIL: 'Konto Email', - - /* - error display - */ - ERROR_TITLE: 'Interner Fehler', - ERROR_MESSAGE: 'Ups! Da ist ein Problem', - ERROR_TITLE_401: 'Unbefugt', - ERROR_MESSAGE_401: 'Ups! Da ist ein Problem. Ihre Anmeldedaten gewähren keinen Zugang zu dieser Seite', - ERROR_TITLE_404: 'Seite nicht gefunden', - ERROR_MESSAGE_404: 'Ups! Da ist ein Problem. Diese Seite ist nicht vorhanden', - ERROR_REDIRECT: 'Hier ist eine Seite , damit Sie wieder auf die Strecke', - ERROR_BUTTON_TEXT: 'HOMEPAGE', - - - /* - titles - */ - DR: 'Dr.', - MR: 'Herr', - MRS: 'Frau', - MS: 'Fräulein', - TITLE: 'Anrede', - - - /* - order statuses - */ - COMPLETED: 'Fertiggestellt', - CONFIRMED: 'Bestätigt', - CREATED: 'Erstellt', - DECLINED: 'Zurückgegangen', - SHIPPED: 'Ausgeliefert', - - /* - Order Details - */ - CREDIT_CARD: 'Kreditkarte', - ON: 'an', - QUANTITY: 'Menge', - SHIPPED_BY_ON: 'Versendet durch: {{carrier}} on {{shippedDate}}', - TRACKING_NUMBER: 'Verfolgungsnummer', - - - /* - Search - */ - FOUND_FOR: 'gefunden', - SEARCH: 'Suche', - SEARCH_RESULTS: 'Suchergebnisse', - MOST_RELEVANT: 'Wichtigsten', - SEARCH_AGAIN: 'Neue Suche', - RESULTS: 'Ergebnisse', - SEE_ALL: 'Zeige Alle', - SEARCH_UNAVAILABLE: 'Suche ist derzeit nicht verfügbar', - NO_RESULTS_FOUND: 'Keine Ergebnisse gefunden', + //XTIT + PRODUCT_DESCRIPTION:'Produktbeschreibung', + //XBUT + OUT_OF_STOCK:'nicht vorrätig', + //XFLD + QTY:'Menge', + //XMSG + ERROR_ADDING_TO_CART:'Hinzufügen zum Warenkorb war nicht erfolgreich. Versuchen Sie es noch einmal.', + //XLST //------------------------------------------------- - // FOOTER + // Product List Page //------------------------------------------------- + + NEWEST:'neueste', + //XLST + PRICE_HIGH_LOW:'Preis (höchster - niedrigster)', + //XLST + PRICE_LOW_HIGH:'Preis (niedrigster - höchster)', + //XFLD + SORT_BY:'Sortieren nach', + //XFLD: Viewing number of product out of total number of products on Product Listing Page + VIEWING:'Anzeigen', + //XFLD + PRODUCTS_FROM_TO:'
{{productsFrom}}-{{productsTo}} von {{total}}
', + //XFLD + ALL_PRODUCTS:'Alle Produkte', + //XTIT + EMPTY_MSG:'Demo-Filiale - demnächst verfügbar', + //XFLD + LANGUAGES:'Sprachen', + //XFLD + SELECT_LANGUAGE:'Sprache auswählen', + //XBUT + SIGN_OUT:'Abmelden', + //XBUT + SIGN_IN:'Anmelden', + //XBUT + SIGN_IN_WITH_FACEBOOK:'Über Facebook anmelden', + //XBUT + LOG_IN_WITH_GOOGLE_PLUS:'Über Google+ anmelden', + //XBUT + MY_ACCOUNT:'Mein Konto', + //XBUT + CREATE_ACCOUNT:'Konto anlegen', + //XBUT + CONTINUE_AS_GUEST:'Weiter als Gast', + + //XFLD + //------------------------------------------------- + // Account Page + //------------------------------------------------- + + + ACCOUNT_DETAILS:'Kontodetails', + //XBUT + ADD:'Hinzufügen', + //XGRP + ADDRESSBOOK:'Adressbuch', + //XMSG + NO_ADDRESSES:'Sie haben keine Adressen gespeichert.', + //XBUT + ADD_ADDRESS:'Adresse hinzufügen', + //XBUT + CLOSE:'Schließen', + //XFLD + COMPANY_NAME:'Unternehmen', + //XMSG + CONFIRM_ADDRESS_REMOVAL:'Möchten Sie die Adresse wirklich entfernen?', + //XFLD + FULL_NAME:'Vollständiger Name', + //XFLD + CONTACT_PHONE:'Telefon', + //XFLD + DATE:'Datum', + //XMSG + NAME_REQUIRED:'Name erforderlich', + //XFLD + STREET:'Straße', + //XFLD + STREET_NUMBER:'Hausnummer', + //XTIT + WELCOME:'Willkommen, ,
{{firstName}} {{middleName}} {{lastName}}', + //XGRP + ORDER_HISTORY:'Bestellhistorie', + //XFLD + ORDER_NUMBER:'Bestellnummer', + //XFLD + ORDER_STATUS:'Bestellstatus', + //XFLD + SHIPPING_DETAILS:'VERSANDDETAILS', + //XBUT + SAVE:'Sichern', + //XBUT + UPDATE_PASSWORD:'Kennwort aktualisieren', + //XBUT + CURRENT_PASSWORD:'Aktuelles Kennwort', + //XBUT + NEW_PASSWORD:'Neues Kennwort', + //XMSG + CONFIRM_NEW_PASSWORD:'Neues Kennwort bestätigen', + //XMSG + PASSWORDS_NO_MATCH:'Kennwörter stimmen nicht überein', + //XMSG + WRONG_CURRENT_PASSWORD:'Geben Sie ein korrektes aktuelles Kennwort an.', + //XMSG + PASSWORD_TOO_SHORT:'Kennwort zu kurz', + //XFLD + SHOW_ALL:'Alles anzeigen', + //XFLD + SHOW_LESS:'Weniger anzeigen', + + //XBUT + //------------------------------------------------- + // Login, password, signup + //------------------------------------------------- + + + FORGOT_PW:'Kennwort vergessen?', + //XFLD + PASSWORD:'Kennwort', + //XACT + PASSWORD_MINCHAR:'Mindestens 6 Zeichen', + //XBUT + CONFIRM_PASSWORD:'Kennwort bestätigen', + //XFLD + TOKEN:'Token', + //XBUT + RESET_PASSWORD:'Kennwort zurücksetzen', + //XGRP + RESET_PW_TITLE:'Kennwort zurücksetzen', + //XMSG + RESET_PW_INSTRUCT:'Legen Sie ein neues Kennwort an.', + //XMSG + FORGOT_PW_INSTRUCT:'Geben Sie unten die E-Mail-Adresse Ihres Kontos an. Sie erhalten eine E-Mail mit einem Link zum Zurücksetzen Ihres Kennworts.', + //XMSG + REQUEST_PW_EXPIRED:'Anforderung zum Zurücksetzen des Kennworts abgelaufen', + //XMSG + REQUEST_PW_EXPIRED_MSG:'Die Anforderung zum Zurücksetzen Ihres Kennworts ist abgelaufen. Geben Sie Ihre E-Mail ein, um eine neue Anforderung zu übermitteln.', + //XMSG + CHECK_EMAIL:'Überprüfen Sie Ihre E-Mail', + //XMSG + CHECK_EMAIL_INSTRUCT:'... und wählen Sie den Link, um Ihr Kennwort zurückzusetzen. Der Link ist 24 Stunden gültig.', + //XMSG + PASSWORD_REQUIRED:'Das Kennwort muss mindestens 6 Zeichen haben.', + //XMSG + PASSWORDS_MUST_MATCH:'Die Kennwörter müssen übereinstimmen.', + //XMSG + PW_SUCCESS:'Erfolgreich', + //XMSG + PW_CHANGED_MSG:'Ihr Kennwort wurde zurückgesetzt. Sie können sich nun an Ihrem Konto anmelden.', + //XMSG + INVALID_TOKEN:'Der Link zum Zurücksetzen des Kennworts ist nicht mehr gültig. Fordern Sie einen neuen Link an.', + //XMSG + PW_CHANGE_FAILED:'Aktualisierung des Kennworts fehlgeschlagen.', + //XMSG + RESET_PW_REPEAT:'Fordern Sie erneut einen Link zum Zurücksetzen des Kennworts an.', + //XACT + FIELD_REQUIRED:'Das Feld ist erforderlich.', + //XACT + FIELD_TOO_SHORT:'Das Feld ist zu kurz.', + //XACT + FIELDS_NOT_MATCHING:'Die Felder stimmen nicht überein.', + + //XMSG + SERVER_UNAVAILABLE:'Der Server ist nicht verfügbar, versuchen Sie es später erneut.', + //XMSG + INVALID_CREDENTIALS:'Sie haben eine ungültige E-Mail-Adresse oder ein ungültiges Kennwort eingegeben.', + //XMSG + PASSWORD_INVALID:'Kennwort ungültig - mindestens 6 Zeichen erforderlich.', + //XMSG + ACCOUNT_LOCKED:'Das Konto wurde gesperrt, weil die Anzahl der ungültigen Anmeldeversuche überschritten wurde. Versuchen Sie es nach 5 Minuten noch einmal.', + //XMSG + ACCOUNT_ALREADY_EXISTS:'E-Mail-Adresse wird für das vorhandene Konto bereits verwendet.', + //XFLD + FORGOT_PASSWORD:'Kennwort vergessen?', + //XMSG + EMAIL_NOT_FOUND:'Dieser E-Mail-Adresse ist kein Konto zugeordnet.', + //XACT + ENTER_EMAIL:'E-Mail-Adresse eingeben', + //XMSG + ENTER_EXISTING_EMAIL:'Geben Sie die E-Mail-Adresse eines vorhandenen Kontos ein', + //XMSG + LOGIN_FAILED:'Anmeldung fehlgeschlagen', + + //XFLD + ACCOUNT_EMAIL:'E-Mail-Adresse für Konto', + + //XMSG + //------------------------------------------------- + // Dynamic Error Displays + //------------------------------------------------- + + + ERROR_TITLE:'Interner Fehler', + //XMSG + ERROR_MESSAGE:'Hoppla, es ist ein Problem aufgetreten.', + //XMSG + ERROR_TITLE_401:'Keine Berechtigung', + //XMSG + ERROR_MESSAGE_401:'Hoppla, es ist ein Problem aufgetreten. Ihre Anmeldedaten lassen keinen Zugriff auf diese Seite zu.', + //XMSG + ERROR_TITLE_404:'Seite nicht gefunden', + //XMSG + ERROR_MESSAGE_404:'Hoppla, es ist ein Problem aufgetreten. Diese Seite ist nicht vorhanden.', + //XMSG + ERROR_REDIRECT:'Hier ist eine Seite, die Ihnen weiterhilft.', + //XBUT + ERROR_BUTTON_TEXT:'STARTSEITE', + + //XACT + //------------------------------------------------- + // Titles + //------------------------------------------------- + + + DR:'Dr.', + //XACT + MR:'Herr', + //XACT + MRS:'Frau', + //XACT + MS:'Frau', + //XACT + TITLE:'Anrede', + + //XSEL + //------------------------------------------------- + // Order Statuses + //------------------------------------------------- + + + COMPLETED:'Abgeschlossen', + //XSEL + CONFIRMED:'Bestätigt', + //XSEL + CREATED:'Angelegt', + //XSEL + DECLINED:'Abgelehnt', + //XSEL + SHIPPED:'Versendet', + + //XFLD + //------------------------------------------------- + // Order Details + //------------------------------------------------- + + + CREDIT_CARD:'Kreditkarte', //XFLD - TERMS_AND_CONDITIONS: 'Geschäftsbedingungen', + ON:'am', //XFLD - CONTACT_US: 'Kontaktieren Sie Uns', + QUANTITY:'Menge', //XFLD - SITE_MAP: 'Site Map', + SHIPPED_BY_ON:'Geliefert von: {{carrier}} am {{shippedDate}}', + //XFLD + TRACKING_NUMBER:'Verfolgungsnummer: {{trackingNumber}}', + + //XFLD + //------------------------------------------------- + // Search + //------------------------------------------------- + FOUND_FOR:'0 für {{searchString}} gefunden', + //XACT + SEARCH:'Suchen', + //XFLD + SEARCH_RESULTS:'Suchergebnisse', + //XFLD + MOST_RELEVANT:'Relevanteste', + //XGRP + RESULTS:'Ergebnisse', + //XLNK + SEE_ALL:'Alle anzeigen', + //XMSG + SEARCH_UNAVAILABLE:'Die Suche ist zurzeit nicht verfügbar.', + //XMSG + NO_RESULTS_FOUND:'Keine Ergebnisse gefunden.', + + //XFLD + //------------------------------------------------- + // FOOTER + //------------------------------------------------- + + + TERMS_AND_CONDITIONS:'Geschäftsbedingungen', + //XFLD + CONTACT_US:'Kontakt', + //XFLD + SITE_MAP:'Sitemap', - }); +}); diff --git a/public/js/app/shared/i18n/lang/en.js b/public/js/app/shared/i18n/lang/en.js index 4c7c815ff..6da691701 100644 --- a/public/js/app/shared/i18n/lang/en.js +++ b/public/js/app/shared/i18n/lang/en.js @@ -358,6 +358,8 @@ angular.module('ds.i18n') ACCOUNT_DETAILS: 'Account details', //XBUT ADD: 'Add', + REGION_PREFERENCES: 'Region Preferences', + NEW_EMAIL: 'New Email', //XGRP ADDRESSBOOK: 'Addressbook', //XMSG @@ -383,7 +385,7 @@ angular.module('ds.i18n') //XFLD STREET_NUMBER: 'Street Number', //XTIT - WELCOME: 'Welcome,
{{firstName}} {{middleName}} {{lastName}}', + WELCOME: 'Welcome', //XFLD ITEMS_IN_ORDER: 'Items In Order', //XFLD diff --git a/public/js/app/shared/services/global-data.js b/public/js/app/shared/services/global-data.js index 55422c4a0..d281c374c 100644 --- a/public/js/app/shared/services/global-data.js +++ b/public/js/app/shared/services/global-data.js @@ -358,6 +358,11 @@ angular.module('ds.shared') return null; } }, + + getEmailRegEx: function(){ + return (/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i); + + } }; diff --git a/public/js/app/shared/site-config.js b/public/js/app/shared/site-config.js index d2d00c5ee..617f025e4 100644 --- a/public/js/app/shared/site-config.js +++ b/public/js/app/shared/site-config.js @@ -89,7 +89,7 @@ angular.module('ds.shared') }, tracking: { - baseUrl: ' https://' + apiPath + '/hybris/piwik/b1/' + tenantId + '/events' + baseUrl: 'https://' + apiPath + '/hybris/piwik/b1/' + tenantId + '/events' }, indexing: { diff --git a/public/js/app/shared/templates/footer.html b/public/js/app/shared/templates/footer.html index 5a8607353..c98096ccc 100644 --- a/public/js/app/shared/templates/footer.html +++ b/public/js/app/shared/templates/footer.html @@ -3,7 +3,7 @@
- {{'REGION' | translate}} + {{selectedSite.name}} | {{selectedLanguage() | translate}}
diff --git a/public/less/_account.less b/public/less/_account.less index 85e126e7c..8e6bd5780 100644 --- a/public/less/_account.less +++ b/public/less/_account.less @@ -1,3 +1,7 @@ +#EditAccountModalLabel{ + text-transform: uppercase; +} + .account{ section{ padding-left: 62px; @@ -74,7 +78,6 @@ margin-bottom: 0; min-height:1px; } - .orderdetailsheader{ margin-bottom: 25px; h2{ @@ -119,19 +122,58 @@ } .img-circle{ - margin-top: 25px; - min-width: 45px; + margin-top: -17px; + margin-left: 35px; } .page-headline{ - margin-top: 65px; - h1{ + overflow:hidden; font-size: 34px; margin-top: 5px; + margin-bottom: 18px; + font-weight: 200; + small{ + display:block; + margin-bottom: 17px; + } + .welcomeTxt{ + display:inline-block; + } + img{ + width: 65px; + } + + } + + &.mobile{ + h1{ + margin-bottom: 28px; + } + + img{ + margin: 0 0 20px 0; + } } } + + .userInfoRow.mobile{ + padding-bottom: 0; + + #add-address-btn{ + margin-top: 0; + } + } + + .mobileDataSection{ + margin: 0 0 40px 0; + + .dataLabel.locale{ + margin-bottom: 20px; + } + } + .inline-label{ font-family: @font-family-serif, serif; @@ -181,7 +223,33 @@ float: none; } } - + + .desktopUserInfo{ + margin-top: 40px; + + } + + .userInfoRow{ + border-top: 1px solid #e5e5e5; + padding-top: 30px; + padding-bottom: 75px; + } + + .desktopUserInfo.userInfoRow{ + border-top: none; + + } + + .userInfoRow .titleRow{ + margin-bottom:21px; + font-size:10px; + text-transform: uppercase; + color: #7d7e7f; + } + .userInfoRow .dataLabel{ + display:block; + font-weight:bold; + } /* UPSCALING IMPROVMENTS */ @media screen and (max-width: @screen-sm-max){ @@ -215,20 +283,72 @@ } } -.default-address span { +.default-address .contactName{ font-weight: bold; } +.default-address .defaultLabel{ + color:#016aab; +} +.panel{ + height: 183px; + +} + +.panel.defaultAddress{ + border: 1px solid #016aab; +} address { min-height: 120px; overflow: hidden; + color: #969696; } -.editable-buttons.btn.btn-default { - display: none; +.panel.defaultAddress address{ + color:#333; } -.editable-controls.editable-error { - color: @state-danger-text !important; +.section-headline h2{ + font-size: 18px; + font-weight: 900 !important; + padding-bottom: 0 !important; +} +.editLinkContainer{ + border-right: 1px solid #cecece; +} + +.editLinkContainer + div{ + padding-left: 22px; } +address .addressInfo{ font-weight: 200; } +.btn-group-vertical .btn-link, .btn-group-vertical .btn.delete, .userInfoRow a{ + color:#cecece; + font-size: 22px; +} + +.btn-group-vertical .btn-link:hover, .userInfoRow a:hover{ + color:#016aab; +} + +.btn-group-vertical .btn.delete:hover{ + color: #f1291e; +} + +.btn-group-vertical .btn-link.active{ + color: #016aab; +} + +.editable-buttons.btn.btn-default { display: none; } .editable-controls.editable-error { + color: @state-danger-text !important; +} + +.account .btn-secondary{ + background-color: #636465; + color: #fff; + padding-left: 26px; + padding-right:26px; + -webkit-box-shadow: 0px 4px 7px 0px rgba(0,0,0,0.75); + -moz-box-shadow: 0px 4px 7px 0px rgba(0,0,0,0.75); + box-shadow: 0px 4px 7px 0px rgba(0,0,0,0.75); +} diff --git a/public/less/_overwrites.less b/public/less/_overwrites.less index ed1f530c3..b09e2becf 100644 --- a/public/less/_overwrites.less +++ b/public/less/_overwrites.less @@ -199,10 +199,6 @@ .modal{ z-index: @zIndex-editcart!important; } -.modal-title{ - font-family: @font-family-serif; - font-style: italic; -} // ADDITIONAL CUSTOM BUTTON SKINNING .btn{ @@ -237,8 +233,6 @@ // HEADLINES .page-headline{ small{ - font-family: @font-family-serif, serif; - font-style: italic; font-weight: normal; font-size: 12px; text-transform: none; @@ -256,13 +250,13 @@ .section-headline{ h1, h2, h3, h4, h5, h6{ - font-family: @font-family-serif, serif; - font-style: italic; font-weight: normal; padding-bottom: 10px; overflow: hidden; } } + + .area-headline{ font-weight: bold; font-size: 12px; diff --git a/test/e2e/protractor-utils.js b/test/e2e/protractor-utils.js index b7d1a5d7d..5fe6ee3f4 100644 --- a/test/e2e/protractor-utils.js +++ b/test/e2e/protractor-utils.js @@ -7,6 +7,7 @@ var stressBallPath = "//a[contains(@href, '/products/5436f9e75acee4d3c910c0b5/') exports.beerBug = stressBallPath; var cartButtonId = exports.cartButtonId = 'full-cart-btn'; var buyButton = exports.buyButton = "buy-button"; +var siteSelectorButton = exports.siteSelectorButton = 'siteSelectorButton' exports.contineShopping = "continue-shopping"; var removeFromCart = exports.removeFromCart = "remove-product"; exports.productDescriptionBind = 'product.description'; @@ -170,7 +171,7 @@ var switchSite = exports.switchSite = function (site) { var siteRow = '0' } - var siteSelector = element(by.linkText('Region')); + var siteSelector = element(by.id(siteSelectorButton)); browser.driver.actions().mouseMove(siteSelector).perform(); siteSelector.click(); var newSite = element(by.repeater('site in sites').row(siteRow)); diff --git a/test/unit/account/account-ctrl-spec.js b/test/unit/account/account-ctrl-spec.js index 97a27a619..343d69169 100644 --- a/test/unit/account/account-ctrl-spec.js +++ b/test/unit/account/account-ctrl-spec.js @@ -19,6 +19,8 @@ describe('AccountCtrl Test', function () { var mockedGlobalData = { store: {tenant: storeTenant}, getCurrencyId: function() { return null}, + getAvailableLanguages: function(){return null}, + getEmailRegEx: function(){return (/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i)}, getCurrencySymbol: function () {return '$'}, getAvailableCurrency: function() { return 'USD'}, getCurrency: function() { return null}, @@ -56,6 +58,7 @@ describe('AccountCtrl Test', function () { } ]; var mockedModal = {}; + var defaultLang = 'en'; var mockedAppConfig = {}; var storeTenant = '121212'; @@ -148,7 +151,7 @@ describe('AccountCtrl Test', function () { beforeEach(function () { AccountCtrl = $controller('AccountCtrl', {$scope: $scope, 'AccountSvc': AccountSvc, addresses: addresses, account: account, orders: orders, - OrderListSvc: mockedOrderListSvc, AuthDialogManager: mockedAuthDialogManager, $translate: mockedTranslate}); + OrderListSvc: mockedOrderListSvc, AuthDialogManager: mockedAuthDialogManager, $translate: mockedTranslate, GlobalData: mockedGlobalData}); }); it("should expose correct scope interface", function() { @@ -166,7 +169,7 @@ describe('AccountCtrl Test', function () { expect($scope.refreshAddresses).toBeDefined(); expect($scope.setAddressAsDefault).toBeDefined(); expect($scope.showAllOrders).toBeDefined(); - expect($scope.updateAccount).toBeDefined(); + expect($scope.updateUserInfo).toBeDefined(); expect($scope.updatePassword).toBeDefined(); }); @@ -236,18 +239,13 @@ describe('AccountCtrl Test', function () { describe('updateAccount()', function() { - it('should update account by executing updateAccount', function () { - $scope.updateAccount(); - $scope.$digest(); + + it('should update account by executing updateUserInfo', function () { + $scope.updateUserInfo(); expect(AccountSvc.updateAccount).toHaveBeenCalled(); }); - it('should partially update account when calling updateAccount with parameters', function () { - var msg = $scope.updateAccount('contactEmail', 'notAnEmailAddress'); - $scope.$digest(); - expect(AccountSvc.updateAccount).wasNotCalled(); - expect(msg).toBeTruthy(); - }); + }); describe('saveOnEnter', function(){ diff --git a/test/unit/products/browse-products-ctrl-spec.js b/test/unit/products/browse-products-ctrl-spec.js index 3d28329bc..465238c22 100644 --- a/test/unit/products/browse-products-ctrl-spec.js +++ b/test/unit/products/browse-products-ctrl-spec.js @@ -11,7 +11,7 @@ describe('BrowseProductsCtrl', function () { mockedGlobalData.getCurrencyId = jasmine.createSpy('getCurrencyId').andReturn('USD'); mockedGlobalData.getCurrencySymbol = jasmine.createSpy('getCurrencySymbol').andReturn('$'); mockedCategory.id = 123; - mockedCategory.elements = [ + mockedCategory.assignments = [ { 'id': 456, 'ref': { @@ -118,11 +118,11 @@ describe('BrowseProductsCtrl', function () { }); - describe('Initialize with category without elements', function(){ + describe('Initialize with category without assignments', function(){ beforeEach(function () { browseProdCtrl = $controller('BrowseProductsCtrl', {'$scope': $scope, '$rootScope': $rootScope, 'ProductSvc': mockedProductSvc, 'GlobalData':mockedGlobalData, - 'settings': mockedSettings, 'category': {elements:[]}, '$state': mockedState, 'CategorySvc': mockedCategorySvc}); + 'settings': mockedSettings, 'category': {assignments:[]}, '$state': mockedState, 'CategorySvc': mockedCategorySvc}); }); diff --git a/test/unit/products/category-svc-spec.js b/test/unit/products/category-svc-spec.js index 6b5411dcb..fa1629e08 100644 --- a/test/unit/products/category-svc-spec.js +++ b/test/unit/products/category-svc-spec.js @@ -150,7 +150,7 @@ describe('CategorySvc', function () { it('should return category with products', function () { categorySvc.resetCategoryCache(); $httpBackend.expectGET(categoryUrl+catQueryPath).respond(categoryResponse); - $httpBackend.expectGET(categoryUrl+'/'+cosmeticsId+'/elements?recursive=true').respond([]); + $httpBackend.expectGET(categoryUrl+'/'+cosmeticsId+'/assignments?recursive=true').respond([]); var cat = null; categorySvc.getCategoryWithProducts(cosmeticsSlug).then(function (category) { cat = category; @@ -162,7 +162,7 @@ describe('CategorySvc', function () { $httpBackend.verifyNoOutstandingRequest(); cat = null; - $httpBackend.expectGET(categoryUrl+'/'+cosmeticsId+'/elements?recursive=true').respond([]); + $httpBackend.expectGET(categoryUrl+'/'+cosmeticsId+'/assignments?recursive=true').respond([]); categorySvc.getCategoryWithProducts(cosmeticsSlug).then(function (category) { cat = category; });