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

Jump to bottom

Imi fixes #1

Closed
wants to merge 8 commits into from
Closed

Imi fixes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5f13fb2
rebase to magenerds-master
Mar 6, 2019
b869307
reset
Mar 6, 2019
0405ef6
Set new copyright year
sippsolutions May 6, 2019
d1e6e4d
Whitespace
sippsolutions Jul 10, 2019
57983be
Merge branch 'imi-fixes' of https://github.com/iMi-digital/BasePrice …
bst2002git Oct 18, 2019
465226f
.
bst2002git Oct 18, 2019
d686cb8
Merge branch 'feature/tier-price' of https://github.com/iMi-digital/B…
bst2002git Oct 18, 2019
e19dbde
.
bst2002git Oct 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
6 changes: 3 additions & 3 deletions Block/Adminhtml/Form/Field/Unit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
* @category Magenerds
* @package Magenerds_BasePrice
* @subpackage Block
* @copyright Copyright (c) 2017 TechDivision GmbH (http://www.techdivision.com)
* @link http://www.techdivision.com/
* @copyright Copyright (c) 2019 TechDivision GmbH (https://www.techdivision.com)
* @link https://www.techdivision.com/
* @author Florian Sydekum <[email protected]>
*/
namespace Magenerds\BasePrice\Block\Adminhtml\Form\Field;
Expand Down Expand Up @@ -77,4 +77,4 @@ public function _toHtml()
public function setInputName($value) {
return $this->setName($value);
}
}
}
6 changes: 3 additions & 3 deletions Block/Adminhtml/System/Config/Form/Field/ConversionMapping.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
* @category Magenerds
* @package Magenerds_BasePrice
* @subpackage Block
* @copyright Copyright (c) 2017 TechDivision GmbH (http://www.techdivision.com)
* @link http://www.techdivision.com/
* @copyright Copyright (c) 2019 TechDivision GmbH (https://www.techdivision.com)
* @link https://www.techdivision.com/
* @author Florian Sydekum <[email protected]>
*/
namespace Magenerds\BasePrice\Block\Adminhtml\System\Config\Form\Field;
Expand Down Expand Up @@ -127,4 +127,4 @@ public function renderCellTemplate($columnName)

return parent::renderCellTemplate($columnName);
}
}
}
6 changes: 3 additions & 3 deletions Block/AfterPrice.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
* @category Magenerds
* @package Magenerds_BasePrice
* @subpackage Block
* @copyright Copyright (c) 2017 TechDivision GmbH (http://www.techdivision.com)
* @link http://www.techdivision.com/
* @copyright Copyright (c) 2019 TechDivision GmbH (https://www.techdivision.com)
* @link https://www.techdivision.com/
* @author Florian Sydekum <[email protected]>
*/
namespace Magenerds\BasePrice\Block;
Expand Down Expand Up @@ -138,4 +138,4 @@ public function getTierBasePrices(): array
{
return $this->_helper->getTierBasePricesText($this->getProduct(), true);
}
}
}
4 changes: 2 additions & 2 deletions Helper/Data.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
* @category Magenerds
* @package Magenerds_BasePrice
* @subpackage Helper
* @copyright Copyright (c) 2017 TechDivision GmbH (http://www.techdivision.com)
* @link http://www.techdivision.com/
* @copyright Copyright (c) 2019 TechDivision GmbH (https://www.techdivision.com)
* @link https://www.techdivision.com/
* @author Florian Sydekum <[email protected]>
*/
namespace Magenerds\BasePrice\Helper;
Expand Down
6 changes: 3 additions & 3 deletions Model/Plugin/ConfigurablePrice.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
* @category Magenerds
* @package Magenerds_BasePrice
* @subpackage Model
* @copyright Copyright (c) 2017 TechDivision GmbH (http://www.techdivision.com)
* @link http://www.techdivision.com/
* @copyright Copyright (c) 2019 TechDivision GmbH (https://www.techdivision.com)
* @link https://www.techdivision.com/
* @author Florian Sydekum <[email protected]>
*/
namespace Magenerds\BasePrice\Model\Plugin;
Expand Down Expand Up @@ -81,4 +81,4 @@ public function afterGetJsonConfig(\Magento\ConfigurableProduct\Block\Product\Vi

return $this->_jsonEncoder->encode($config);
}
}
}
6 changes: 3 additions & 3 deletions Model/Plugin/Grouped.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
* @category Magenerds
* @package Magenerds_BasePrice
* @subpackage Model
* @copyright Copyright (c) 2017 TechDivision GmbH (http://www.techdivision.com)
* @link http://www.techdivision.com/
* @copyright Copyright (c) 2019 TechDivision GmbH (https://www.techdivision.com)
* @link https://www.techdivision.com/
* @author Florian Sydekum <[email protected]>
*/
namespace Magenerds\BasePrice\Model\Plugin;
Expand Down Expand Up @@ -58,4 +58,4 @@ public function getAssociatedProducts($product)
}
return $product->getData($this->_keyAssociatedProducts);
}
}
}
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

Website: http://www.magenerds.com/magento-2-extensions/base-price/

Documentation: http://doc.magenerds.com/base-price/
Documentation: http://doc.magenerds.com/base-price/
4 changes: 2 additions & 2 deletions Setup/InstallData.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
* @category Magenerds
* @package Magenerds_BasePrice
* @subpackage Setup
* @copyright Copyright (c) 2017 TechDivision GmbH (http://www.techdivision.com)
* @link http://www.techdivision.com/
* @copyright Copyright (c) 2019 TechDivision GmbH (https://www.techdivision.com)
* @link https://www.techdivision.com/
* @author Florian Sydekum <[email protected]>
*/
namespace Magenerds\BasePrice\Setup;
Expand Down
6 changes: 3 additions & 3 deletions etc/acl.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* @package Magenerds_BasePrice
* @subpackage etc
* @author Florian Sydekum <[email protected]>
* @copyright Copyright (c) 2017 TechDivision GmbH (http://www.techdivision.com)
* @link http://www.techdivision.com/
* @copyright Copyright (c) 2019 TechDivision GmbH (https://www.techdivision.com)
* @link https://www.techdivision.com/
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
Expand All @@ -31,4 +31,4 @@
</resource>
</resources>
</acl>
</config>
</config>
6 changes: 3 additions & 3 deletions etc/adminhtml/system.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* @package Magenerds_BasePrice
* @subpackage etc
* @author Florian Sydekum <[email protected]>
* @copyright Copyright (c) 2017 TechDivision GmbH (http://www.techdivision.com)
* @link http://www.techdivision.com/
* @copyright Copyright (c) 2019 TechDivision GmbH (https://www.techdivision.com)
* @link https://www.techdivision.com/
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
Expand Down Expand Up @@ -44,4 +44,4 @@
</group>
</section>
</system>
</config>
</config>
6 changes: 3 additions & 3 deletions etc/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* @package Magenerds_BasePrice
* @subpackage etc
* @author Florian Sydekum <[email protected]>
* @copyright Copyright (c) 2017 TechDivision GmbH (http://www.techdivision.com)
* @link http://www.techdivision.com/
* @copyright Copyright (c) 2019 TechDivision GmbH (https://www.techdivision.com)
* @link https://www.techdivision.com/
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
Expand All @@ -26,4 +26,4 @@
</general>
</baseprice>
</default>
</config>
</config>
6 changes: 3 additions & 3 deletions etc/di.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
* @package Magenerds_BasePrice
* @subpackage etc
* @author Florian Sydekum <[email protected]>
* @copyright Copyright (c) 2017 TechDivision GmbH (http://www.techdivision.com)
* @link http://www.techdivision.com/
* @copyright Copyright (c) 2019 TechDivision GmbH (https://www.techdivision.com)
* @link https://www.techdivision.com/
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
<type name="Magento\ConfigurableProduct\Block\Product\View\Type\Configurable">
<plugin name="magenerds_baseprice_configurablePriceRender" type="Magenerds\BasePrice\Model\Plugin\ConfigurablePrice" />
</type>
<preference for="Magento\GroupedProduct\Model\Product\Type\Grouped" type="Magenerds\BasePrice\Model\Plugin\Grouped"/>
</config>
</config>
4 changes: 2 additions & 2 deletions etc/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* @package Magenerds_BasePrice
* @subpackage etc
* @author Florian Sydekum <[email protected]>
* @copyright Copyright (c) 2017 TechDivision GmbH (http://www.techdivision.com)
* @link http://www.techdivision.com/
* @copyright Copyright (c) 2019 TechDivision GmbH (https://www.techdivision.com)
* @link https://www.techdivision.com/
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
Expand Down
6 changes: 3 additions & 3 deletions registration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
* @category Magenerds
* @package Magenerds_BasePrice
* @subpackage Module
* @copyright Copyright (c) 2017 TechDivision GmbH (http://www.techdivision.com)
* @link http://www.techdivision.com/
* @copyright Copyright (c) 2019 TechDivision GmbH (https://www.techdivision.com)
* @link https://www.techdivision.com/
* @author Florian Sydekum <[email protected]>
*/
\Magento\Framework\Component\ComponentRegistrar::register(
\Magento\Framework\Component\ComponentRegistrar::MODULE,
'Magenerds_BasePrice',
__DIR__
);
);
4 changes: 2 additions & 2 deletions view/frontend/templates/afterprice.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* @package Magenerds_BasePrice
* @subpackage view
* @author Florian Sydekum <[email protected]>
* @copyright Copyright (c) 2017 TechDivision GmbH (http://www.techdivision.com)
* @link http://www.techdivision.com/
* @copyright Copyright (c) 2019 TechDivision GmbH (https://www.techdivision.com)
* @link https://www.techdivision.com/
*/

/**
Expand Down