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.

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

Pd 562 pack store webhook multiple shipments fix #41

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion Controller/adminhtml/Index/Label.php
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ private function buildWuunderData($infoArray, $order)
array(
"product" => "Magento 2 extension",
"version" => array(
"build" => "2.2.2",
"build" => "2.2.3",
"plugin" => "2.0"),
"platform" => array(
"name" => "Magento",
Expand Down
15 changes: 8 additions & 7 deletions Helper/Data.php
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
<?php

namespace Wuunder\Wuunderconnector\Helper;
use \Magento\Framework\App\Helper\AbstractHelper;

use \Magento\Framework\App\Helper\AbstractHelper;

class Data extends AbstractHelper
{
public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig)
{
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Wuunder\Wuunderconnector\Logger\Logger $wuunderLogger
) {
$this->scopeConfig = $scopeConfig;
$this->wuunder_logger = $wuunderLogger;
}

public function log($message)

{
if ($this->_isLoggingEnabled()) {
$writer = new \Zend\Log\Writer\Stream(BP . '/var/log/wuunder.log');
$logger = new \Zend\Log\Logger();
$logger->addWriter($writer);
$logger->info($message);
$this->wuunder_logger->error($message);
}
}

Expand Down
13 changes: 13 additions & 0 deletions Logger/Handler.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?php


namespace Wuunder\Wuunderconnector\Logger;

use Magento\Framework\Logger\Handler\Base;
use Monolog\Logger;

class Handler extends Base
{
protected $loggerType = Logger::INFO;
protected $fileName = '/var/log/wuunder.log';
}
8 changes: 8 additions & 0 deletions Logger/Logger.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?php


namespace Wuunder\Wuunderconnector\Logger;

class Logger extends \Monolog\Logger
{
}
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "wuunder/magento2-connector",
"description": "Magento 2 extension Wuunder",
"type": "magento2-module",
"version": "2.2.2",
"version": "2.2.3",
"homepage": "https://wearewuunder.com/",
"require": {
"wuunder/connector-php": ">=1.0.0"
Expand Down
17 changes: 16 additions & 1 deletion etc/di.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,19 @@
</argument>
</arguments>
</type>
</config>
<!-- start logger-->
<type name="Wuunder\Wuunderconnector\Logger\Handler">
<arguments>
<argument name="filesystem" xsi:type="object">Magento\Framework\Filesystem\Driver\File</argument>
</arguments>
</type>
<type name="Wuunder\Wuunderconnector\Logger\Logger">
<arguments>
<argument name="name" xsi:type="string">customLogger</argument>
<argument name="handlers" xsi:type="array">
<item name="system" xsi:type="object">Wuunder\Wuunderconnector\Logger\Handler</item>
</argument>
</arguments>
</type>
<!-- end logger-->
</config>
2 changes: 1 addition & 1 deletion etc/module.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>

<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
<module name="Wuunder_Wuunderconnector" setup_version="2.2.2" active="true">
<module name="Wuunder_Wuunderconnector" setup_version="2.2.3" active="true">
<sequence>
<module name="Magento_Checkout"/>
</sequence>
Expand Down