Skip to content

Fixed creating shipping labels in part-shipment #27672

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.

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

Merged
merged 7 commits into from
Oct 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,11 @@ $girthEnabled = $block->isDisplayGirthValue() && $block->isGirthAllowed() ? 1 :
}
});
packaging.setItemQtyCallback(function(itemId){
var item = $$('[name="shipment[items]['+itemId+']"]')[0];
var item = $$('[name="shipment[items]['+itemId+']"]')[0],
itemTitle = $('order_item_' + itemId + '_title');
if (!itemTitle && !item) {
return 0;
}
if (item && !isNaN(item.value)) {
return item.value;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\Shipping\Block\Adminhtml\Order;

use Magento\Backend\Block\Template;
use Magento\Framework\Api\SearchCriteria;
use Magento\Framework\Api\SearchCriteriaBuilder;
use Magento\Framework\ObjectManagerInterface;
use Magento\Framework\Registry;
use Magento\Sales\Api\Data\OrderInterface;
use Magento\Sales\Api\Data\ShipmentTrackInterface;
use Magento\TestFramework\Helper\Bootstrap;
use PHPUnit\Framework\TestCase;
use Magento\Sales\Api\OrderRepositoryInterface;

/**
* Class verifies packaging popup.
*
* @magentoAppArea adminhtml
*/
class AddToPackageTest extends TestCase
{
/**
* @var OrderRepositoryInterface
*/
private $orderRepository;

/** @var ObjectManagerInterface */
private $objectManager;

/** @var Registry */
private $registry;

protected function setUp(): void
{
$this->objectManager = Bootstrap::getObjectManager();
$this->registry = $this->objectManager->get(Registry::class);
$this->orderRepository = $this->objectManager->get(OrderRepositoryInterface::class);
}

/**
* Loads order entity by provided order increment ID.
*
* @param string $incrementId
* @return OrderInterface
*/
private function getOrderByIncrementId(string $incrementId) : OrderInterface
{
/** @var SearchCriteria $searchCriteria */
$searchCriteria = $this->objectManager->get(SearchCriteriaBuilder::class)
->addFilter('increment_id', $incrementId)
->create();

$items = $this->orderRepository->getList($searchCriteria)
->getItems();

return array_pop($items);
}

/**
* Test that Packaging popup renders
*
* @magentoDataFixture Magento/Shipping/_files/shipping_with_carrier_data.php
*/
public function testGetCommentsHtml()
{
/** @var Template $block */
$block = $this->objectManager->get(Packaging::class);

$order = $this->getOrderByIncrementId('100000001');

/** @var ShipmentTrackInterface $track */
$shipment = $order->getShipmentsCollection()->getFirstItem();

$this->registry->register('current_shipment', $shipment);

$block->setTemplate('Magento_Shipping::order/packaging/popup.phtml');
$html = $block->toHtml();
$expectedNeedle = "packaging.setItemQtyCallback(function(itemId){
var item = $$('[name=\"shipment[items]['+itemId+']\"]')[0],
itemTitle = $('order_item_' + itemId + '_title');
if (!itemTitle && !item) {
return 0;
}
if (item && !isNaN(item.value)) {
return item.value;
}
});";
$this->assertStringContainsString($expectedNeedle, $html);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

use Magento\Catalog\Api\ProductRepositoryInterface;
use Magento\Sales\Api\Data\OrderInterfaceFactory;
use Magento\Sales\Api\OrderRepositoryInterface;
use Magento\Sales\Model\Order;
use Magento\Sales\Model\Order\ShipmentFactory;
use Magento\TestFramework\Helper\Bootstrap;
use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
use Magento\Framework\DB\Transaction;

Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/order_with_customer.php');

$objectManager = Bootstrap::getObjectManager();
/** @var Transaction $transaction */
$transaction = $objectManager->get(Transaction::class);
/** @var ProductRepositoryInterface $productRepository */
$productRepository = $objectManager->create(ProductRepositoryInterface::class);
$product = $productRepository->get('simple');
/** @var Order $order */
$order = $objectManager->get(OrderInterfaceFactory::class)->create()->loadByIncrementId('100000001');
$order->setShippingDescription('UPS Next Day Air')
->setShippingMethod('ups_11')
->setShippingAmount(0)
->setCouponCode('1234567890')
->setDiscountDescription('1234567890');

/** @var OrderRepositoryInterface $orderRepository */
$orderRepository = $objectManager->create(OrderRepositoryInterface::class);
$orderRepository->save($order);

$shipmentItems = [];
foreach ($order->getItems() as $orderItem) {
$shipmentItems[$orderItem->getId()] = $orderItem->getQtyOrdered();
}
$tracking = [
'carrier_code' => 'ups',
'title' => 'United Parcel Service',
'number' => '987654321'
];

$shipment = $objectManager->get(ShipmentFactory::class)->create($order, $shipmentItems, [$tracking]);
$shipment->register();
$transaction->addObject($shipment)->addObject($order)->save();
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

use Magento\TestFramework\Workaround\Override\Fixture\Resolver;

Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/order_with_customer_rollback.php');