-
Notifications
You must be signed in to change notification settings - Fork 9.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Price template refactoring * Refactored order item templates in the Sales, Bundle and Downloadable modules * Eliminated the unused PHTML templates and removed the direct dependencies on the TaxHelper module in the Catalog module * Service layer implementation: * Created service layer for Order creation * Created service layer for Invoice * Created service layer for Credit Memo * Created service layer for Shipment * Introduce the Search library: * Created adapter interfaces for the Search library * Created response structure * Created parsing of XML declaration and creation of library objects (Queries, Filters, Aggregations) * Refactored Framework\Stdlib\Cookie to use CookieManager * Added the ability to prevent the backend cookie from going to the storefront * Fixed bugs: * Fixed an issue where taxes were not added in some orders * Fixed an issue were the Add New Address button did not work if the default address was already set * Fixed a Google Chrome and Internet Explorer specific issue when a JavaScript error made it impossible to register during checkout downloadable product * Fixed an issue when the credit card iframe (PayPal or 3D secure) was absent on the Order Review step during Onepage Checkout * Fixed an issue with the Tax Rate, Customer Tax Class and Product Tax Class multiselects on the Tax Rule Information page * Fixed JavaScript issues which prevented saving a newsletter template. * Modified the Button component behavior * Fixed an issue where it was impossible for a guest customer to register during Onepage checkout when the Require Customer To Be Logged In To Checkout option was set to Yes * Fixed an issue where the Calendar icons were not displayed on the storefront * Fixed an AJAX loader issue in the Admin panel * Fixed an issue where it was impossible to upload images for variations of a configurable product on product form * Fixed an issue where clicking on a row in the Search Terms Report Grid leads to 404 page * Fixed an issue where configurable products fixture creates out of stock products * Fixed an issue where Magento crashed when invalid cookie domain was set * Fixed an issue where the Change checkbox label overlapped the text message for a recurring profile attribute on the attribute mass update page * Fixed an issue where integrity test determined normal dependencies as redundant * Fixed an issue where Catalog\Service\V1\Product\Attribute\ReadService::search returned an error * Fixed an issue where Magento\Catalog\Service\V1\Category\Attribute\ReadService::options returned empty results * GitHub requests: * [#160] (https://github.com/magento/bugathon_march_2013/issues/160) -- Wrong default value for memory_limit in .htaccess.sample * [#480] (#480) -- Provide instructions on adding memcache support for Magento 2 * [#612] (#612) -- Category Layered Navigation : Selection of disabled entity * [#626] (#626) -- Unable to install under IIS / FastCGI
- Loading branch information
1 parent
906c3c7
commit a2ea67f
Showing
829 changed files
with
37,808 additions
and
9,866 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| <?php | ||
| /** | ||
| * Backend Session configuration object | ||
| * | ||
| * Magento | ||
| * | ||
| * NOTICE OF LICENSE | ||
| * | ||
| * This source file is subject to the Open Software License (OSL 3.0) | ||
| * that is bundled with this package in the file LICENSE.txt. | ||
| * It is also available through the world-wide-web at this URL: | ||
| * http://opensource.org/licenses/osl-3.0.php | ||
| * If you did not receive a copy of the license and are unable to | ||
| * obtain it through the world-wide-web, please send an email | ||
| * to license@magentocommerce.com so we can send you a copy immediately. | ||
| * | ||
| * DISCLAIMER | ||
| * | ||
| * Do not edit or add to this file if you wish to upgrade Magento to newer | ||
| * versions in the future. If you wish to customize Magento for your | ||
| * needs please refer to http://www.magentocommerce.com for more information. | ||
| * | ||
| * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) | ||
| * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) | ||
| */ | ||
| namespace Magento\Backend; | ||
|
|
||
| use Magento\Backend\App\Area\FrontNameResolver; | ||
| use Magento\Framework\Session\Config; | ||
|
|
||
| /** | ||
| * Magento Backend session configuration | ||
| * | ||
| * @method Config setSaveHandler() | ||
| */ | ||
| class AdminConfig extends Config | ||
| { | ||
| /** | ||
| * @var FrontNameResolver $frontNameResolver | ||
| */ | ||
| protected $frontNameResolver; | ||
|
|
||
| /** | ||
| * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig | ||
| * @param \Magento\Framework\Stdlib\String $stringHelper | ||
| * @param \Magento\Framework\App\RequestInterface $request | ||
| * @param \Magento\Framework\App\State $appState | ||
| * @param \Magento\Framework\App\Filesystem $filesystem | ||
| * @param string $scopeType | ||
| * @param FrontNameResolver $frontNameResolver | ||
| * @param string $saveMethod | ||
| * @param null|string $savePath | ||
| * @param null|string $cacheLimiter | ||
| * @param string $lifetimePath | ||
| * @SuppressWarnings(PHPMD.ExcessiveParameterList) | ||
| */ | ||
| public function __construct( | ||
| \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig, | ||
| \Magento\Framework\Stdlib\String $stringHelper, | ||
| \Magento\Framework\App\RequestInterface $request, | ||
| \Magento\Framework\App\State $appState, | ||
| \Magento\Framework\App\Filesystem $filesystem, | ||
| $scopeType, | ||
| FrontNameResolver $frontNameResolver, | ||
| $saveMethod = \Magento\Framework\Session\SaveHandlerInterface::DEFAULT_HANDLER, | ||
| $savePath = null, | ||
| $cacheLimiter = null, | ||
| $lifetimePath = self::XML_PATH_COOKIE_LIFETIME | ||
| ) { | ||
| parent::__construct( | ||
| $scopeConfig, | ||
| $stringHelper, | ||
| $request, | ||
| $appState, | ||
| $filesystem, | ||
| $scopeType, | ||
| $saveMethod, | ||
| $savePath, | ||
| $cacheLimiter, | ||
| $lifetimePath | ||
| ); | ||
|
|
||
| $this->frontNameResolver = $frontNameResolver; | ||
|
|
||
| $baseUrl = $this->_httpRequest->getBaseUrl(); | ||
| $adminPath = $this->extractAdminPath($baseUrl); | ||
| $this->setCookiePath($adminPath); | ||
| } | ||
|
|
||
| /** | ||
| * Determine the admin path | ||
| * | ||
| * @param string $baseUrl | ||
| * @return string | ||
| * @throws \InvalidArgumentException | ||
| */ | ||
| private function extractAdminPath($baseUrl) | ||
| { | ||
| if (!is_string($baseUrl)) { | ||
| throw new \InvalidArgumentException('Cookie path is not a string.'); | ||
| } | ||
|
|
||
| $adminPath = $this->frontNameResolver->getFrontName(); | ||
|
|
||
| if (!substr($baseUrl, -1) || ('/' != substr($baseUrl, -1))) { | ||
| $baseUrl = $baseUrl . '/'; | ||
| } | ||
|
|
||
| return $baseUrl . $adminPath; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.