Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
9478138
Merge pull request #2 from vgelani/2.1-develop-PR-port-15372
gelanivishal May 23, 2018
9400075
Merge pull request #5 from vgelani/2.1-develop-PR-port-15398
gelanivishal May 25, 2018
ec03b6d
Merge branch '2.1-develop' of https://github.com/vgelani/magento2 int…
gelanivishal May 25, 2018
0967f9d
Merge pull request #8 from vgelani/2.1-develop-PR-port-15421
gelanivishal May 25, 2018
689cb43
Merge pull request #10 from vgelani/2.1-develop-PR-port-15416
gelanivishal May 25, 2018
e55cdca
Merge pull request #12 from vgelani/2.1-develop-PR-port-15549
gelanivishal Jun 1, 2018
c308795
#14063 - Wrong invoice prefix in multistore setup due to default stor…
sanjay-wagento May 19, 2018
634b957
Merge pull request #14 from vgelani/2.1-develop-PR-port-15332
gelanivishal Jun 1, 2018
2d936be
Merge pull request #16 from vgelani/2.1-develop-PR-port-15602
gelanivishal Jun 1, 2018
a5fa6e3
Merge pull request #17 from vgelani/2.1-develop-PR-port-15336
gelanivishal Jun 1, 2018
b04093c
Fixxes #15565
EliasKotlyar May 29, 2018
486c5d4
Fixed coding standard error
gelanivishal May 29, 2018
c8ecee0
Merge pull request #22 from vgelani/2.1-develop-PR-port-15566
gelanivishal Jun 4, 2018
b62d330
Merge remote-tracking branch 'upstream/2.1-develop' into 2.1-develop
gelanivishal Jun 7, 2018
7136c3a
Merge pull request #26 from vgelani/2.1-develop-PR-port-15892
gelanivishal Jun 8, 2018
7ca71cc
Merge pull request #28 from vgelani/2.1-develop-PR-port-15322
gelanivishal Jun 8, 2018
e4b77eb
Refactor validate code in Tax module
gelanivishal May 19, 2018
dcc10e9
Fixed semicolon issue
gelanivishal May 19, 2018
4d67269
Fixed coding standard issue
gelanivishal May 20, 2018
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
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,15 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
{
/** @var \Magento\Sales\Model\AbstractModel $object */
if ($object instanceof EntityInterface && $object->getIncrementId() == null) {
$store = $object->getStore();
$storeId = $store->getId();
if ($storeId === null) {
$storeId = $store->getGroup()->getDefaultStoreId();
}
$object->setIncrementId(
$this->sequenceManager->getSequence(
$object->getEntityType(),
$object->getStore()->getGroup()->getDefaultStoreId()
$storeId
)->getNextValue()
);
}
Expand Down
4 changes: 3 additions & 1 deletion app/code/Magento/Store/Model/PathConfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ public function shouldBeSecure($path)
*/
public function getDefaultPath()
{
return $this->scopeConfig->getValue('web/default/front', ScopeInterface::SCOPE_STORE);
$store = $this->storeManager->getStore();
$value = $this->scopeConfig->getValue('web/default/front', ScopeInterface::SCOPE_STORE, $store);
return $value;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,10 @@ require(['jquery', "mage/mage"], function(jQuery){

});
</script>
<script type="text/x-magento-init">
{
"#<?= /* @escapeNotVerified */ $block->getRenameFormId() ?>": {
"Magento_Tax/js/page/validate": {}
}
}
</script>
15 changes: 15 additions & 0 deletions app/code/Magento/Tax/view/adminhtml/web/js/page/validate.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

define([
'jquery',
'mage/mage'
], function (jQuery) {
'use strict';

return function (data, element) {
jQuery(element).mage('form').mage('validation');
};
});
2 changes: 1 addition & 1 deletion app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class Generator extends AbstractSchemaGenerator
const UNAUTHORIZED_DESCRIPTION = '401 Unauthorized';

/** Array signifier */
const ARRAY_SIGNIFIER = '[]';
const ARRAY_SIGNIFIER = '[0]';

/**
* Swagger factory instance.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@
}
}
}

#po_number {
margin-bottom: 20px;
}
}

.payment-method-title {
Expand Down