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

Add Source Delivery awareness to Order page #315

Merged
merged 10 commits into from
Dec 19, 2017
Merged

Add Source Delivery awareness to Order page #315

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ac33fcf
Add Source Delivery awareness to Order page
Dec 15, 2017
f624e51
code review changes
Dec 15, 2017
ceab796
Added shipping algorithm interfaces
VitaliyBoyko Dec 15, 2017
b7813a8
Merge branches '309-add-source-to-order-page' and 'develop' of https:…
VitaliyBoyko Dec 15, 2017
e64e73c
Fixed static checks
VitaliyBoyko Dec 15, 2017
73ff71c
Fixed static test dependency issue
VitaliyBoyko Dec 15, 2017
ff04725
Fixed static checks
VitaliyBoyko Dec 15, 2017
4359bc6
MSI: Add Source Delivery awareness to Order page #309
Dec 19, 2017
e34ab71
Merge remote-tracking branch 'origin/develop' into 309-add-source-to-…
Dec 19, 2017
a4e374a
MSI: Add Source Delivery awareness to Order page #309
Dec 19, 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
Prev Previous commit
Next Next commit
Fixed static checks
  • Loading branch information
@VitaliyBoyko
VitaliyBoyko committed Dec 15, 2017
commit e64e73cf3a9dcf3363e575e44692b763e01d2a8a
2 changes: 1 addition & 1 deletion app/code/Magento/InventoryApi/Test/Api/StockRepository/DeleteTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
use Magento\TestFramework\Assert\AssertArrayContains;
use Magento\TestFramework\TestCase\WebapiAbstract;

class GetListTest extends WebapiAbstract
class DeleteTest extends WebapiAbstract
{
/**#@+
* Service constants
Expand Down
3 changes: 3 additions & 0 deletions app/code/Magento/InventorySales/Model/ShippingAlgorithm/ResultInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@

namespace Magento\InventorySales\Model\ShippingAlgorithm;

/**
* @api
*/
interface ResultInterface
{
}
3 changes: 3 additions & 0 deletions app/code/Magento/InventorySales/Model/ShippingAlgorithmInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
use Magento\InventorySales\Model\ShippingAlgorithm\ResultInterface;
use Magento\Sales\Api\Data\OrderItemInterface;

/**
* @api
*/
interface ShippingAlgorithmInterface
{
/**
Expand Down
3 changes: 2 additions & 1 deletion app/code/Magento/InventorySales/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"magento/module-inventory-catalog": "100.0.*",
"magento/module-inventory-sales-api": "100.0.*",
"magento/module-store": "100.3.*",
"magento/module-ui": "100.3.*"
"magento/module-ui": "100.3.*",
"magento/module-sales": "100.0.*"
},
"type": "magento2-module",
"version": "100.0.0-dev",
Expand Down
10 changes: 5 additions & 5 deletions app/code/Magento/InventorySales/view/adminhtml/templates/order/view/tab/sources.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@
<?php foreach ($block->getSourceItems() as $sourceName => $sourceItems): ?>
<table class="data-table admin__table-primary edit-order-table">
<div class="admin__page-section-item-title">
<span class="title"><?= $sourceName ?></span>
<span class="title"><?= /* @escapeNotVerified */ $sourceName ?></span>
</div>
<thead>
<tr class="headings">
<th><span>Sku</span></th>
<th><span>Qty</span></th>
<th><span><?= __('Sku') ?></span></th>
<th><span><?= __('Qty') ?></span></th>
</tr>
</thead>
<?php foreach ($sourceItems as $item): ?>
<tr>
<td><?= $item['sku'] ?></td>
<td><?= $item['qty'] ?></td>
<td><?= /* @escapeNotVerified */ $item['sku'] ?></td>
<td><?= /* @escapeNotVerified */ $item['qty'] ?></td>
</tr>
<?php endforeach; ?>
</table>
Expand Down