forked from shopware/shopware
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'next-11782/show-the-intra-community-delivery-on-receipt…
…s' into 'master' NEXT-11782 - Show the intra community delivery on receipts See merge request shopware/6/product/platform!3746
- Loading branch information
Showing
8 changed files
with
202 additions
and
12 deletions.
There are no files selected for viewing
10 changes: 10 additions & 0 deletions
10
changelog/_unreleased/2020-11-10-show-the-intra-community-delivery-on-receipts.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| --- | ||
| title: Show the intra community delivery on receipts | ||
| issue: NEXT-11782 | ||
| flag: FEATURE_NEXT_10559 | ||
| --- | ||
| # Administration | ||
| * Changed `onChangeType` method in `sw-settings-document-detail` for toggle the `DisplayNoteDelivery` checkbox. | ||
| * Changed block of `sw_settings_document_detail_content_form_field_renderer` in `module/sw-settings-document/page/sw-settings-document-detail/sw-settings-document-detail.html.twig`. | ||
| * Added a new block `sw_settings_document_detail_content_field_additional_note_delivery` in `module/sw-settings-document/page/sw-settings-document-detail/sw-settings-document-detail.html.twig`. | ||
| * Added new `sw-checkbox-field` and `sw-entity-multi-id-select` components in `module/sw-settings-document/page/sw-settings-document-detail/sw-settings-document-detail.html.twig`. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
69 changes: 69 additions & 0 deletions
69
...pp/administration/test/e2e/cypress/integration/settings/sw-settings-document/crud.spec.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| // / <reference types="Cypress" /> | ||
|
|
||
| describe('Documents: Test crud operations', () => { | ||
| beforeEach(() => { | ||
| cy.setToInitialState().then(() => { | ||
| cy.loginViaApi(); | ||
| }).then(() => { | ||
| return cy.createProductFixture(); | ||
| }) | ||
| .then(() => { | ||
| cy.openInitialPage(`${Cypress.env('admin')}#/sw/settings/document/index`); | ||
| }); | ||
| }); | ||
|
|
||
| it('@settings: Create invoice document', () => { | ||
| cy.window().then((win) => { | ||
| if (!win.Shopware.Feature.isActive('FEATURE_NEXT_10559')) { | ||
| cy.log('Skipping test of deactivated feature \'FEATURE_NEXT_10559\' flag'); | ||
| return; | ||
| } | ||
|
|
||
| cy.get('.sw-settings-document-list__add-document').click(); | ||
|
|
||
| // fill data into general field. | ||
| cy.get('#sw-field--documentConfig-name').type('Invoice Name'); | ||
| cy.get('#sw-field--documentConfig-filenamePrefix').type('invoice_'); | ||
| cy.get('#sw-field--documentConfig-filenameSuffix').type('no'); | ||
| cy.get('#itemsPerPage').type('10'); | ||
|
|
||
| // select document type by Invoice type. | ||
| cy.get('.sw-settings-document-detail__select-type') | ||
| .scrollIntoView() | ||
| .click(); | ||
| cy.get('.sw-select-result-list__item-list li .sw-highlight-text') | ||
| .contains('Invoice') | ||
| .click(); | ||
|
|
||
| // check exists additional note delivery field. | ||
| cy.get('.sw-settings-document-detail__field_additional_note_delivery input[type="checkbox"]') | ||
| .scrollIntoView() | ||
| .should('be.visible'); | ||
|
|
||
| // select additional note delivery checkbox. | ||
| cy.get('.sw-settings-document-detail__field_additional_note_delivery input[type="checkbox"]') | ||
| .scrollIntoView() | ||
| .click(); | ||
|
|
||
| // check exists select multi countries field. | ||
| cy.get('.sw-settings-document-detail__field_delivery_countries').should('be.visible'); | ||
|
|
||
| // select country | ||
| cy.get('.sw-settings-document-detail__field_delivery_countries').typeMultiSelectAndCheck('Germany', { | ||
| searchTerm: 'Germany' | ||
| }); | ||
|
|
||
| // do saving action. | ||
| cy.get('.sw-settings-document-detail__save-action').click(); | ||
|
|
||
| // back to documents list and check exists invoice which was created successfully. | ||
| cy.get('.smart-bar__back-btn').click(); | ||
| cy.get('.sw-settings-document-list-grid .sw-grid-row .sw-grid__cell-content a') | ||
| .contains('Invoice Name') | ||
| .should('be.visible'); | ||
| cy.get('.sw-settings-document-list-grid .sw-grid-row .sw-document-list__column-type .sw-grid__cell-content') | ||
| .contains('Invoice') | ||
| .should('be.visible'); | ||
| }); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters