Skip to content

Added missing tracking info into fulfillment call #82

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

Open
wkaminsk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added missing tracking info into fulfillment call #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 18 additions & 2 deletions Model/Api/Order/Helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use Magento\Catalog\Api\CategoryRepositoryInterface;
use Magento\Customer\Model\Customer;
use Magento\Customer\Model\ResourceModel\GroupRepository;
use Magento\Framework\App\RequestInterface;
use Magento\Framework\App\State;
use Magento\Framework\HTTP\Header;
use Magento\Framework\Locale\ResolverInterface;
Expand Down Expand Up @@ -99,6 +100,7 @@ class Helper
* @var CustomerGroupFactory
*/
private $_groupRepository;
private $request;

/**
* Helper constructor.
Expand Down Expand Up @@ -132,6 +134,7 @@ public function __construct(
State $state,
ResolverInterface $localeResolver,
Header $httpHeader,
RequestInterface $request,
Registry $registry
) {
$this->_customerFactory = $customerFactory;
Expand All @@ -149,6 +152,7 @@ public function __construct(
$this->localeResolver = $localeResolver;
$this->httpHeader = $httpHeader;
$this->registry = $registry;
$this->request = $request;
}

/**
Expand Down Expand Up @@ -638,13 +642,25 @@ public function getOrderFulfillments($createdShipment = null)

foreach ($shipmentCollection as $shipment) {
$tracking = $shipment->getTracksCollection()->getFirstItem();

if ($tracking->getId()) {
$title = $tracking->getTitle();
$trackingNumber = $tracking->getTrackNumber();
} else {
$tracking = $this->request->getParam('tracking');

if (!empty($tracking)) {
$title = $tracking[1]['title'];
$trackingNumber = $tracking[1]['number'];
}
}
$comment = $shipment->getCommentsCollection()->getFirstItem();
$payload = array(
"fulfillment_id" => $shipment->getIncrementId(),
"created_at" => $this->formatDateAsIso8601($shipment->getCreatedAt()),
"status" => "success",
"tracking_company" => $tracking->getTitle(),
"tracking_numbers" => $tracking->getTrackNumber(),
"tracking_company" => $title,
"tracking_numbers" => $trackingNumber,
"message" => $comment->getComment(),
"line_items" => $this->getAllShipmentItems($shipment)
);
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "riskified/magento2new",
"type": "magento2-module",
"description": "Riskified decider module for Magento 2",
"version": "1.12.19",
"version": "1.12.20",
"require": {
"php": ">=7.4",
"magento/framework": ">=100.1.0",
Expand Down
1 change: 0 additions & 1 deletion etc/di.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
<type name="Magento\Framework\Console\CommandListInterface">
<arguments>
<argument name="commands" xsi:type="array">
<item name="riskfied_send_historical_orders" xsi:type="object">Riskified\Decider\Model\Command\UploadHistoricalOrders</item>
<item name="release_on_hold_orders" xsi:type="object">Riskified\Decider\Model\Command\ReleaseOnHoldOrders</item>
</argument>
</arguments>
Expand Down