-
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.
CC-30520 Fixed wrong predefined delivery address after reoder. (#2381)
CC-30520 Fixed wrong predefined delivery address after reoder.
- Loading branch information
0 parents
commit e5970af
Showing
24 changed files
with
553 additions
and
0 deletions.
There are no files selected for viewing
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,3 @@ | ||
coverage_clover: tests/_output/coverage.xml | ||
json_path: tests/_output/coveralls-upload.json | ||
service_name: travis-ci |
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,13 @@ | ||
; This file is for unifying the coding style for different editors and IDEs. | ||
; More information at https://editorconfig.org | ||
root = true | ||
|
||
[*] | ||
indent_style = space | ||
indent_size = 4 | ||
end_of_line = lf | ||
insert_final_newline = true | ||
trim_trailing_whitespace = true | ||
|
||
[*.bat] | ||
end_of_line = crlf |
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,36 @@ | ||
# Define the line ending behavior of the different file extensions | ||
# Set the default behavior, in case people don't have core.autocrlf set. | ||
* text text=auto eol=lf | ||
|
||
*.php diff=php | ||
|
||
# Denote all files that are truly binary and should not be modified. | ||
*.png binary | ||
*.jpg binary | ||
*.gif binary | ||
*.jpeg binary | ||
*.zip binary | ||
*.phar binary | ||
*.ttf binary | ||
*.woff binary | ||
*.woff2 binary | ||
*.eot binary | ||
*.ico binary | ||
*.mo binary | ||
*.pdf binary | ||
*.xsd binary | ||
*.exe binary | ||
|
||
# Remove files for archives generated using `git archive` | ||
dependency.json export-ignore | ||
phpstan.json export-ignore | ||
phpstan.neon export-ignore | ||
psalm-report.json export-ignore linguist-generated=true | ||
tooling.yml export-ignore | ||
.coveralls.yml export-ignore | ||
.travis.yml export-ignore | ||
.editorconfig export-ignore | ||
.gitattributes export-ignore | ||
.gitignore export-ignore | ||
architecture-baseline.json export-ignore | ||
.github/ export-ignore |
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,52 @@ | ||
name: CI | ||
|
||
on: | ||
push: | ||
branches: | ||
- 'master' | ||
pull_request: | ||
workflow_dispatch: | ||
|
||
jobs: | ||
validation: | ||
name: Validation | ||
runs-on: ubuntu-20.04 | ||
|
||
steps: | ||
- uses: actions/checkout@v2 | ||
|
||
- name: Setup PHP | ||
uses: shivammathur/setup-php@v2 | ||
with: | ||
php-version: '8.0' | ||
extensions: mbstring, intl, bcmath | ||
coverage: none | ||
|
||
- name: Composer Install | ||
run: composer install --prefer-dist --no-interaction --profile | ||
|
||
- name: Run validation | ||
run: composer validate | ||
|
||
- name: Syntax check | ||
run: find ./src -path src -prune -o -type f -name '*.php' -print0 | xargs -0 -n1 -P4 php -l -n | (! grep -v "No syntax errors detected" ) | ||
|
||
lowest: | ||
name: Prefer Lowest | ||
runs-on: ubuntu-20.04 | ||
|
||
steps: | ||
- uses: actions/checkout@v2 | ||
|
||
- name: Setup PHP | ||
uses: shivammathur/setup-php@v2 | ||
with: | ||
php-version: '8.0' | ||
extensions: mbstring, intl, bcmath | ||
coverage: none | ||
|
||
- name: Composer Install | ||
run: composer install --prefer-dist --no-interaction --profile | ||
|
||
- name: Composer Update | ||
run: composer update --prefer-lowest --prefer-dist --no-interaction --profile -vvv |
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,36 @@ | ||
# IDE | ||
.idea/ | ||
.project/ | ||
nbproject/ | ||
.buildpath/ | ||
.settings/ | ||
*.sublime-* | ||
|
||
# OS | ||
.DS_Store | ||
*.AppleDouble | ||
*.AppleDB | ||
*.AppleDesktop | ||
|
||
# grunt stuff | ||
.grunt | ||
.sass-cache | ||
/node_modules/ | ||
|
||
# tooling | ||
vendor/ | ||
composer.lock | ||
.phpunit.result.cache | ||
|
||
# built client resources | ||
src/*/Zed/*/Static/Public | ||
src/*/Zed/*/Static/Assets/sprite | ||
|
||
# Propel classes | ||
src/*/Zed/*/Persistence/Propel/Base/* | ||
src/*/Zed/*/Persistence/Propel/Map/* | ||
|
||
# tests | ||
tests/**/_generated/ | ||
tests/_output/* | ||
!tests/_output/.gitkeep |
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,3 @@ | ||
# ShipmentPage Changelog | ||
|
||
[Release Changelog](https://github.com/spryker-shop/shipment-page/releases) |
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,46 @@ | ||
CODE CONTRIBUTION LICENSE AGREEMENT | ||
|
||
BY DISPLAYING, PUBLISHING, UPLOADING OR PROMOTING (COLLECTIVELY, “POSTING”) SOURCE CODE (“SOURCE CODE”) | ||
TO SPRYKER SYSTEMS GMBH, REGISTERED WITH THE COMMERCIAL REGISTER OF THE LOWER COURT OF HAMBURG UNDER | ||
HRB 134310 (“WE”, “US” OR ”SPRYKER”), YOU AGREE TO THIS CODE CONTRIBUTION LICENSE AGREEMENT (THE “AGREEMENT”). | ||
|
||
You grant us and our affiliates an irrevocable, perpetual, worldwide, royalty-free, non-exclusive, unrestricted | ||
license and right to use, reproduce and store, disseminate and otherwise exploit, modify, delete from, add to, | ||
create derivative works of, publicly perform, publicly display, reproduce, exchange parts of Source Code or combine them with | ||
other Source Code, use in data networks and distribute with or without consideration and without limitations as to the | ||
number of items via all distribution channels (and to sublicense the foregoing rights through multiple tiers of licensees) | ||
of such Source Code and any other copyright protected material for any reason and in connection with advertising and | ||
promoting our software and/or our products in any media formats and through any channels now existing or developed in | ||
the future. The transfer and assignment of rights covers any usage and exploitation rights for any unknown types of use | ||
as well as with regard to any known types of use the right to unrestrictedly make publicly available and publish, | ||
irrespective of the medium including any editions and versions and grant simple or exclusive usage, exploitation or | ||
adaptation rights to third parties. | ||
|
||
Spryker may reject, refuse to post or delete any Source Code for any or no reason, including, without limitation. | ||
|
||
From time to time, we may remove the Source Code permanently or temporarily, provided that even if we do remove such | ||
Source Code, we shall have no obligation to cease our other uses of the Source Code as permitted above. | ||
|
||
You agree to be fully responsible for and to pay any and all royalties, fees, and any other monies owing any person or | ||
entity by reason of any Source Code posted by you. | ||
|
||
Spryker respects the intellectual property of others, and requires that you do the same. Your postings and the Source Code | ||
must not infringe any copyright, patent, trademark, trade secret or other proprietary rights or other rights of any person | ||
or entity and you may not upload, embed, post, email, transmit or otherwise make available Source Code, software or any other | ||
material that that infringes such rights. | ||
|
||
YOU GUARANTEE THAT: (I) YOU OWN THE SOURCE CODE POSTED BY YOU OR OTHERWISE HAVE THE RIGHT TO GRANT THE LICENSES AND RIGHTS | ||
SET FORTH ABOVE, AND (II) THE POSTING OF YOUR SOURCE CODE DOES NOT VIOLATE THE PRIVACY RIGHTS, PUBLICITY RIGHTS, CONTRACT RIGHTS, | ||
INTELLECTUAL PROPERTY OR ANY OTHER RIGHTS OF ANY PERSON OR ENTITY OR ANY APPLICABLE LAW. | ||
|
||
YOU AGREE TO INDEMNIFY AND HOLD SPRYKER, ITS SUBSIDIARIES, AND AFFILIATES, AND THEIR RESPECTIVE OFFICERS, AGENTS, PARTNERS | ||
AND EMPLOYEES, HARMLESS FROM ANY LOSS, LIABILITY, COST, EXPENSE, CLAIM OR DEMAND, INCLUDING WITHOUT LIMITATION, REASONABLE | ||
ATTORNEYS’ FEES, DUE OR RELATING TO OR ARISING OUT OF THE USE OF YOUR SOURCE CODE IN VIOLATION OF THIS AGREEMENT AND/OR | ||
ARISING FROM A BREACH OF ANY TERMS OF THIS AGREEMENT AND/OR ANY BREACH OF YOUR REPRESENTATIONS AND WARRANTIES SET FORTH IN | ||
THIS AGREEMENT AND/OR ARISING OUT OF OR RELATING TO ANY SOURCE CODE THAT YOU POST. | ||
|
||
This Agreement shall be governed by the laws of Germany to the exclusion of IPR (International Law) and the United Nations Convention | ||
on Contracts for the International Sale of Goods (CISG). The parties consent to the jurisdiction of the courts in Berlin (Germany). | ||
|
||
This Agreement constitutes the entire agreement between you and us concerning Spryker’s use of the Source Code. This Agreement | ||
supersedes any prior verbal understanding between the parties. This Agreement may be amended only in a writing signed by an authorized officer of Spryker. |
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,40 @@ | ||
SPRYKER SYSTEMS GMBH EVALUATION LICENSE AGREEMENT | ||
|
||
SPRYKER SYSTEMS GMBH, REGISTERED WITH THE COMMERCIAL REGISTER OF THE LOWER COURT OF HAMBURG UNDER HRB 134310 | ||
("WE" OR "SPRYKER")GRANTS YOU (THE "LICENSEE") THE RIGHT TO USE THE SOFTWARE (AS DEFINED BELOW) | ||
UNDER THE PROVISIONS OF THIS EVALUATION LICENSE AGREEMENT (THE "AGREEMENT"). | ||
|
||
The "Software" includes any software owned and distributed by Spryker under this Agreement. The Software | ||
contains elements of open source components, to which different license terms apply respectively. | ||
These open source components are needed to be installed separately. | ||
|
||
Spryker grants to Licensee, during the 45-calendar-day period (the "Evaluation Period") following the download of the Software, | ||
the nontransferable, nonexclusive limited, free of charge license to permit Licensee's employees to internally use the Software | ||
to test and evaluate the Software in connection with potentially purchasing non-evaluation licenses to the Software. | ||
|
||
Licensee shall not (i) use the Software to set up a productive live system, for development purposes or any other purposes apart | ||
from evaluating the Software; (ii) copy any part of the Software except to make one copy for back-up purposes; (iii) distribute, | ||
disclose, market, rent, lease, or transfer the Software or act as a service bureau with respect to the Software; (iv) export the | ||
Software or install it in multiple locations; (v) disclose any confidential information provided by Spryker; (vi) modify or make | ||
derivative works of the Software; or (vii) allow others to make or obtain copies of the Software. | ||
|
||
THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND. SPRYKER DISCLAIMS ALL WARRANTIES, EXPRESSED OR IMPLIED, INCLUDING | ||
BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, TITLE, NONINFRINGEMENT, AND FITNESS FOR A PARTICULAR PURPOSE. SPRYKER WILL NOT | ||
BE LIABLE FOR ANY DAMAGES ASSOCIATED WITH THE SOFTWARE, INCLUDING WITHOUT LIMITATION ORDINARY, INCIDENTAL, INDIRECT, OR CONSEQUENTIAL | ||
DAMAGES OF ANY KIND, INCLUDING BUT NOT LIMITED TO DAMAGES RELATING TO LOST DATA OR LOST PROFITS, EVEN IF SPRYKER HAS BEEN ADVISED OF | ||
THE POSSIBILITY OF SUCH DAMAGES. | ||
|
||
Licensee's license to use the Software shall terminate on the earlier of (i) the expiration of the Evaluation Period, or (ii) the date | ||
both parties enter into a definitive agreement for the provision by Spryker to Licensee of a non-evaluation license to the Software. | ||
Upon termination of the license as provided above, Licensee shall promptly destroy the Software and any back-up copy of the Software | ||
made during the Evaluation Period if Spryker and the Licensee have not agreed a non-evaluation license to the Software. | ||
|
||
This Agreement shall be governed by the laws of Germany to the exclusion of IPR (International Law) and the United Nations Convention | ||
on Contracts for the International Sale of Goods (CISG). The parties consent to the jurisdiction of the courts in Berlin (Germany). | ||
|
||
This Agreement is not assignable or transferable by Licensee and any attempt to do so is null and void. | ||
|
||
This Agreement constitutes the entire agreement between the parties concerning Licensee's use of the Software. This Agreement supersedes | ||
any prior verbal understanding between the parties and any Licensee purchase order or other ordering document, regardless of whether such | ||
document is received by Spryker before or after execution of this Agreement. This Agreement may be amended only in a writing signed by | ||
an authorized officer of Spryker. |
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,15 @@ | ||
# ShipmentPage Module | ||
[![Latest Stable Version](https://poser.pugx.org/spryker-shop/shipment-page/v/stable.svg)](https://packagist.org/packages/spryker-shop/shipment-page) | ||
[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%208.0-8892BF.svg)](https://php.net/) | ||
|
||
The module provides shipment management functionality. | ||
|
||
## Installation | ||
|
||
``` | ||
composer require spryker-shop/shipment-page | ||
``` | ||
|
||
## Documentation | ||
|
||
[Spryker Documentation](https://docs.spryker.com) |
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 @@ | ||
[] |
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,14 @@ | ||
namespace: ShipmentPage | ||
include: | ||
- tests/SprykerShopTest/Yves/ShipmentPage | ||
paths: | ||
tests: tests/ | ||
output: tests/_output/ | ||
data: tests/_data/ | ||
support: tests/_support/ | ||
envs: tests/_envs/ | ||
settings: | ||
suite_class: \PHPUnit\Framework\TestSuite | ||
colors: true | ||
memory_limit: 1024M | ||
log: true |
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,43 @@ | ||
{ | ||
"name": "spryker-shop/shipment-page", | ||
"type": "library", | ||
"description": "ShipmentPage module", | ||
"license": "proprietary", | ||
"require": { | ||
"php": ">=8.0", | ||
"spryker-shop/customer-reorder-widget-extension": "^1.2.0", | ||
"spryker/kernel": "^3.52.0", | ||
"spryker/shipment": "^8.0.0" | ||
}, | ||
"require-dev": { | ||
"spryker/code-sniffer": "*", | ||
"spryker/testify": "*" | ||
}, | ||
"autoload": { | ||
"psr-4": { | ||
"SprykerShop\\": "src/SprykerShop/" | ||
} | ||
}, | ||
"autoload-dev": { | ||
"psr-4": { | ||
"SprykerShopTest\\": "tests/SprykerShopTest/" | ||
} | ||
}, | ||
"minimum-stability": "dev", | ||
"prefer-stable": true, | ||
"scripts": { | ||
"cs-check": "phpcs -p -s --standard=vendor/spryker/code-sniffer/SprykerStrict/ruleset.xml src/ tests/", | ||
"cs-fix": "phpcbf -p --standard=vendor/spryker/code-sniffer/SprykerStrict/ruleset.xml src/ tests/" | ||
}, | ||
"extra": { | ||
"branch-alias": { | ||
"dev-master": "1.0.x-dev" | ||
} | ||
}, | ||
"config": { | ||
"sort-packages": true, | ||
"allow-plugins": { | ||
"dealerdirect/phpcodesniffer-composer-installer": true | ||
} | ||
} | ||
} |
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,5 @@ | ||
{ | ||
"include": { | ||
"spryker/shipment": "Added for forward compatibility." | ||
} | ||
} |
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,2 @@ | ||
parameters: | ||
level: 8 |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
11 changes: 11 additions & 0 deletions
11
src/SprykerShop/Shared/ShipmentPage/Transfer/shipment_page.transfer.xml
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,11 @@ | ||
<?xml version="1.0"?> | ||
<transfers xmlns="spryker:transfer-01" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="spryker:transfer-01 http://static.spryker.com/transfer-01.xsd"> | ||
|
||
<transfer name="Item"> | ||
<property name="shipment" type="Shipment"/> | ||
</transfer> | ||
|
||
<transfer name="Shipment"> | ||
</transfer> | ||
|
||
</transfers> |
34 changes: 34 additions & 0 deletions
34
...hop/Yves/ShipmentPage/Plugin/CustomerReorderWidget/ShipmentReorderItemSanitizerPlugin.php
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,34 @@ | ||
<?php | ||
|
||
/** | ||
* Copyright © 2016-present Spryker Systems GmbH. All rights reserved. | ||
* Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file. | ||
*/ | ||
|
||
namespace SprykerShop\Yves\ShipmentPage\Plugin\CustomerReorderWidget; | ||
|
||
use Spryker\Yves\Kernel\AbstractPlugin; | ||
use SprykerShop\Yves\CustomerReorderWidgetExtension\Dependency\Plugin\ReorderItemSanitizerPluginInterface; | ||
|
||
/** | ||
* @method \SprykerShop\Yves\ShipmentPage\ShipmentPageFactory getFactory() | ||
*/ | ||
class ShipmentReorderItemSanitizerPlugin extends AbstractPlugin implements ReorderItemSanitizerPluginInterface | ||
{ | ||
/** | ||
* {@inheritDoc} | ||
* - Sets the `ItemTransfer.shipment` property to `null` for each item. | ||
* | ||
* @api | ||
* | ||
* @param array<\Generated\Shared\Transfer\ItemTransfer> $itemTransfers | ||
* | ||
* @return array<\Generated\Shared\Transfer\ItemTransfer> | ||
*/ | ||
public function execute(array $itemTransfers): array | ||
{ | ||
return $this->getFactory() | ||
->createItemSanitizer() | ||
->sanitizeShipment($itemTransfers); | ||
} | ||
} |
Oops, something went wrong.