Skip to content

MSI-1866: Changes to Source Selection Service Contracts #1986

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

Merged
merged 10 commits into from
Jan 18, 2019
Merged

MSI-1866: Changes to Source Selection Service Contracts #1986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1ef8c48
MSI-1866: Changes to Source Selection Service Contracts
maghamed Jan 18, 2019
9ca7837
MSI-1866: Changes to Source Selection Service Contracts
maghamed Jan 18, 2019
f012e88
MSI-1866: Changes to Source Selection Service Contracts
maghamed Jan 18, 2019
2ac2752
MSI-1866: Changes to Source Selection Service Contracts
maghamed Jan 18, 2019
7e0596c
MSI-1866: Changes to Source Selection Service Contracts
maghamed Jan 18, 2019
77f3f0b
MSI-1866: Changes to Source Selection Service Contracts
maghamed Jan 18, 2019
abf1ece
MSI-1866: Changes to Source Selection Service Contracts
maghamed Jan 18, 2019
168af0f
MSI-1866: Changes to Source Selection Service Contracts
maghamed Jan 18, 2019
9bacd23
MSI-1866: Changes to Source Selection Service Contracts
maghamed Jan 18, 2019
4467601
MSI-1866: Changes to Source Selection Service Contracts
maghamed Jan 18, 2019
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
2 changes: 1 addition & 1 deletion ...Magento/InventoryDistanceBasedSourceSelection/Model/Algorithms/DistanceBasedAlgorithm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
use Magento\InventoryApi\Api\GetSourcesAssignedToStockOrderedByPriorityInterface;
use Magento\InventoryApi\Api\Data\SourceInterface;
use Magento\InventoryDistanceBasedSourceSelection\Model\DistanceProvider\GetDistanceFromSourceToAddress;
use Magento\InventoryDistanceBasedSourceSelectionApi\Api\Data\AddressInterface;
use Magento\InventorySourceSelectionApi\Api\Data\AddressInterface;
use Magento\InventorySourceSelectionApi\Model\Algorithms\Result\GetDefaultSortedSourcesResult;
use Magento\InventorySourceSelectionApi\Api\Data\InventoryRequestInterface;
use Magento\InventorySourceSelectionApi\Api\Data\SourceSelectionResultInterface;
Expand Down
2 changes: 1 addition & 1 deletion ...Magento/InventoryDistanceBasedSourceSelection/Model/Convert/AddressToComponentsString.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace Magento\InventoryDistanceBasedSourceSelection\Model\Convert;

use Magento\InventoryDistanceBasedSourceSelectionApi\Api\Data\AddressInterface;
use Magento\InventorySourceSelectionApi\Api\Data\AddressInterface;

class AddressToComponentsString
{
Expand Down
2 changes: 1 addition & 1 deletion ...code/Magento/InventoryDistanceBasedSourceSelection/Model/Convert/AddressToQueryString.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace Magento\InventoryDistanceBasedSourceSelection\Model\Convert;

use Magento\InventoryDistanceBasedSourceSelectionApi\Api\Data\AddressInterface;
use Magento\InventorySourceSelectionApi\Api\Data\AddressInterface;

class AddressToQueryString
{
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/InventoryDistanceBasedSourceSelection/Model/Convert/AddressToString.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace Magento\InventoryDistanceBasedSourceSelection\Model\Convert;

use Magento\InventoryDistanceBasedSourceSelectionApi\Api\Data\AddressInterface;
use Magento\InventorySourceSelectionApi\Api\Data\AddressInterface;

class AddressToString
{
Expand Down
2 changes: 1 addition & 1 deletion ...oryDistanceBasedSourceSelection/Model/DistanceProvider/GetDistanceFromSourceToAddress.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
namespace Magento\InventoryDistanceBasedSourceSelection\Model\DistanceProvider;

use Magento\InventoryApi\Api\Data\SourceInterface;
use Magento\InventoryDistanceBasedSourceSelectionApi\Api\Data\AddressInterface;
use Magento\InventorySourceSelectionApi\Api\Data\AddressInterface;
use Magento\InventoryDistanceBasedSourceSelectionApi\Api\GetDistanceInterface;
use Magento\InventoryDistanceBasedSourceSelectionApi\Api\GetLatLngFromAddressInterface;

Expand Down
2 changes: 1 addition & 1 deletion ...ento/InventoryDistanceBasedSourceSelection/Model/DistanceProvider/GetLatLngFromSource.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
namespace Magento\InventoryDistanceBasedSourceSelection\Model\DistanceProvider;

use Magento\InventoryApi\Api\Data\SourceInterface;
use Magento\InventoryDistanceBasedSourceSelectionApi\Api\Data\AddressInterfaceFactory;
use Magento\InventorySourceSelectionApi\Api\Data\AddressInterfaceFactory;
use Magento\InventoryDistanceBasedSourceSelectionApi\Api\Data\LatLngInterface;
use Magento\InventoryDistanceBasedSourceSelectionApi\Api\GetLatLngFromAddressInterface;
use Magento\InventoryDistanceBasedSourceSelectionApi\Api\Data\LatLngInterfaceFactory;
Expand Down
2 changes: 1 addition & 1 deletion ...oryDistanceBasedSourceSelection/Model/DistanceProvider/GoogleMap/GetLatLngFromAddress.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
use Magento\InventoryDistanceBasedSourceSelection\Model\Convert\AddressToComponentsString;
use Magento\InventoryDistanceBasedSourceSelection\Model\Convert\AddressToQueryString;
use Magento\InventoryDistanceBasedSourceSelection\Model\Convert\AddressToString;
use Magento\InventoryDistanceBasedSourceSelectionApi\Api\Data\AddressInterface;
use Magento\InventorySourceSelectionApi\Api\Data\AddressInterface;
use Magento\InventoryDistanceBasedSourceSelectionApi\Api\Data\LatLngInterface;
use Magento\InventoryDistanceBasedSourceSelectionApi\Api\Data\LatLngInterfaceFactory;
use Magento\InventoryDistanceBasedSourceSelectionApi\Api\GetLatLngFromAddressInterface;
Expand Down
2 changes: 1 addition & 1 deletion ...ntoryDistanceBasedSourceSelection/Model/DistanceProvider/Offline/GetLatLngFromAddress.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
use Magento\InventoryDistanceBasedSourceSelectionApi\Api\Data\LatLngInterfaceFactory;
use Magento\InventoryDistanceBasedSourceSelectionApi\Api\GetLatLngFromAddressInterface;
use Magento\InventoryDistanceBasedSourceSelection\Model\ResourceModel\GetGeoNameDataByAddress;
use Magento\InventoryDistanceBasedSourceSelectionApi\Api\Data\AddressInterface;
use Magento\InventorySourceSelectionApi\Api\Data\AddressInterface;

/**
* @inheritdoc
Expand Down
65 changes: 0 additions & 65 deletions app/code/Magento/InventoryDistanceBasedSourceSelection/Model/GetAddressFromOrder.php
View file
Open in desktop

This file was deleted.

72 changes: 0 additions & 72 deletions ...yDistanceBasedSourceSelection/Model/InventoryRequestBuilder/FromOrder/DistanceBuilder.php
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...nto/InventoryDistanceBasedSourceSelection/Model/ResourceModel/GetGeoNameDataByAddress.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
use Magento\Framework\App\ResourceConnection;
use Magento\Framework\Exception\NoSuchEntityException;
use Magento\InventoryDistanceBasedSourceSelection\Model\Convert\AddressToString;
use Magento\InventoryDistanceBasedSourceSelectionApi\Api\Data\AddressInterface;
use Magento\InventorySourceSelectionApi\Api\Data\AddressInterface;

/**
* Get geoname data by postcode
Expand Down
4 changes: 1 addition & 3 deletions app/code/Magento/InventoryDistanceBasedSourceSelection/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@
"magento/framework": "*",
"magento/module-inventory-distance-based-source-selection-api": "*",
"magento/module-inventory-source-selection-api": "*",
"magento/module-inventory-source-selection": "*",
"magento/module-inventory-api": "*",
"magento/module-config": "*",
"magento/module-sales": "*"
"magento/module-config": "*"
},
"type": "magento2-module",
"license": [
Expand Down
13 changes: 1 addition & 12 deletions app/code/Magento/InventoryDistanceBasedSourceSelection/etc/di.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@
xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
<preference for="Magento\InventoryDistanceBasedSourceSelectionApi\Api\GetDistanceProviderCodeInterface"
type="Magento\InventoryDistanceBasedSourceSelection\Model\GetDistanceProviderCode"/>
<preference for="Magento\InventoryDistanceBasedSourceSelectionApi\Api\Data\AddressInterface"
type="Magento\InventoryDistanceBasedSourceSelection\Model\Address"/>
<preference for="Magento\InventoryDistanceBasedSourceSelectionApi\Api\Data\LatLngInterface"
type="Magento\InventoryDistanceBasedSourceSelection\Model\LatLng"/>

<type name="Magento\InventorySourceSelection\Model\SourceSelectionService">
<type name="Magento\InventorySourceSelectionApi\Model\SourceSelectionService">
<arguments>
<argument name="sourceSelectionMethods" xsi:type="array">
<item name="distance"
Expand Down Expand Up @@ -57,15 +55,6 @@
type="Magento\InventoryDistanceBasedSourceSelection\Plugin\FillSourceLatitudeAndLongitude"/>
</type>

<type name="Magento\InventorySourceSelectionApi\Model\GetInventoryRequestFromOrderBuilder">
<arguments>
<argument name="buildersByAlgorithm" xsi:type="array">
<item name="distance"
xsi:type="object">Magento\InventoryDistanceBasedSourceSelection\Model\InventoryRequestBuilder\FromOrder\DistanceBuilder</item>
</argument>
</arguments>
</type>

<type name="Magento\Config\Model\Config\TypePool">
<arguments>
<argument name="sensitive" xsi:type="array">
Expand Down
6 changes: 3 additions & 3 deletions ...de/Magento/InventoryDistanceBasedSourceSelectionApi/Api/GetLatLngFromAddressInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
interface GetLatLngFromAddressInterface
{
/**
* Get latitude and longitude object from source
* Get latitude and longitude object from address
*
* @param \Magento\InventoryDistanceBasedSourceSelectionApi\Api\Data\AddressInterface $address
* @param \Magento\InventorySourceSelectionApi\Api\Data\AddressInterface $address
* @return \Magento\InventoryDistanceBasedSourceSelectionApi\Api\Data\LatLngInterface
*/
public function execute(
\Magento\InventoryDistanceBasedSourceSelectionApi\Api\Data\AddressInterface $address
\Magento\InventorySourceSelectionApi\Api\Data\AddressInterface $address
): \Magento\InventoryDistanceBasedSourceSelectionApi\Api\Data\LatLngInterface;
}
2 changes: 1 addition & 1 deletion app/code/Magento/InventoryDistanceBasedSourceSelectionApi/Model/GetLatLngFromAddress.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace Magento\InventoryDistanceBasedSourceSelectionApi\Model;

use Magento\InventoryDistanceBasedSourceSelectionApi\Api\Data\AddressInterface;
use Magento\InventorySourceSelectionApi\Api\Data\AddressInterface;
use Magento\InventoryDistanceBasedSourceSelectionApi\Api\Data\LatLngInterface;
use Magento\InventoryDistanceBasedSourceSelectionApi\Api\GetDistanceProviderCodeInterface;
use Magento\InventoryDistanceBasedSourceSelectionApi\Api\GetLatLngFromAddressInterface;
Expand Down
3 changes: 2 additions & 1 deletion app/code/Magento/InventoryDistanceBasedSourceSelectionApi/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"description": "N/A",
"require": {
"php": "~7.1.3||~7.2.0",
"magento/framework": "*"
"magento/framework": "*",
"magento/module-inventory-source-selection-api": "*"
},
"type": "magento2-module",
"license": [
Expand Down
Loading