Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

受注登録・編集：複数配送時、商品の削除/お届け先の削除ボタン追加 #2053

Merged
merged 3 commits into from
Feb 6, 2017
Merged

受注登録・編集：複数配送時、商品の削除/お届け先の削除ボタン追加 #2053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0297a60
add product delete and delivery delete
kdl-github-albert Jan 25, 2017
af8be73
fix for shipping
kdl-github-albert Jan 27, 2017
8c962fa
add new test case for order shippings
kdl-github-albert Jan 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions src/Eccube/Controller/Admin/Order/EditController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,25 @@ public function index(Application $app, Request $request, $id = null)
// 編集前の受注情報を保持
$OriginOrder = clone $TargetOrder;
$OriginalOrderDetails = new ArrayCollection();
// 編集前のお届け先情報を保持
$OriginalShippings = new ArrayCollection();
// 編集前のお届け先のアイテム情報を保持
$OriginalShipmentItems = new ArrayCollection();

foreach ($TargetOrder->getOrderDetails() as $OrderDetail) {
$OriginalOrderDetails->add($OrderDetail);
}

// 編集前の情報を保持
foreach ($TargetOrder->getShippings() as $tmpOriginalShippings) {
foreach ($tmpOriginalShippings->getShipmentItems() as $tmpOriginalShipmentItem) {
// アイテム情報
$OriginalShipmentItems->add($tmpOriginalShipmentItem);
}
// お届け先情報
$OriginalShippings->add($tmpOriginalShippings);
}

$builder = $app['form.factory']
->createBuilder('order', $TargetOrder);

Expand Down Expand Up @@ -149,13 +163,25 @@ public function index(Application $app, Request $request, $id = null)
$shipmentItems = $Shipping->getShipmentItems();
/** @var \Eccube\Entity\ShipmentItem $ShipmentItem */
foreach ($shipmentItems as $ShipmentItem) {
// 削除予定から商品アイテムを外す
$OriginalShipmentItems->removeElement($ShipmentItem);
$ShipmentItem->setOrder($TargetOrder);
$ShipmentItem->setShipping($Shipping);
$app['orm.em']->persist($ShipmentItem);
}
// 削除予定からお届け先情報を外す
$OriginalShippings->removeElement($Shipping);
$Shipping->setOrder($TargetOrder);
$app['orm.em']->persist($Shipping);
}
// 商品アイテムを削除する
foreach ($OriginalShipmentItems as $OriginalShipmentItem) {
$app['orm.em']->remove($OriginalShipmentItem);
}
// お届け先情報削除する
foreach ($OriginalShippings as $OriginalShipping) {
$app['orm.em']->remove($OriginalShipping);
}
} else {

$NewShipmentItems = new ArrayCollection();
Expand Down
Loading