MTA-3760: Fix Update Products Using Mass Actions (7ba8f244) · Commits · KIII-12 / Magento

Commit 7ba8f244 authored 8 years ago by

Alex Kolesnyk

MTA-3760: Fix Update Products Using Mass Actions

- merge commit with conflict: dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml

parents ce694387 6614360a

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/info.phtml 38 additions, 12 deletions

...thorizenet/view/adminhtml/templates/directpost/info.phtml
app/code/Magento/Catalog/Helper/Product/Compare.php 4 additions, 0 deletions

app/code/Magento/Catalog/Helper/Product/Compare.php
app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php 22 additions, 1 deletion

...ento/Catalog/Model/ResourceModel/Product/Option/Value.php
app/code/Magento/Catalog/Test/Unit/Helper/Product/CompareTest.php 6 additions, 2 deletions

.../Magento/Catalog/Test/Unit/Helper/Product/CompareTest.php
app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php 0 additions, 14 deletions

app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
app/code/Magento/Catalog/view/adminhtml/web/js/components/import-handler.js 9 additions, 11 deletions

...atalog/view/adminhtml/web/js/components/import-handler.js
app/code/Magento/Catalog/view/frontend/requirejs-config.js 0 additions, 1 deletion

app/code/Magento/Catalog/view/frontend/requirejs-config.js
app/code/Magento/Catalog/view/frontend/web/js/compare.js 0 additions, 36 deletions

app/code/Magento/Catalog/view/frontend/web/js/compare.js
app/code/Magento/Catalog/view/frontend/web/js/view/compare-products.js 11 additions, 16 deletions

...nto/Catalog/view/frontend/web/js/view/compare-products.js
app/code/Magento/Customer/view/frontend/requirejs-config.js 2 additions, 1 deletion

app/code/Magento/Customer/view/frontend/requirejs-config.js
app/code/Magento/Customer/view/frontend/templates/address/edit.phtml 1 addition, 1 deletion

...gento/Customer/view/frontend/templates/address/edit.phtml
app/code/Magento/Customer/view/frontend/web/js/addressValidation.js 43 additions, 0 deletions

...agento/Customer/view/frontend/web/js/addressValidation.js
app/code/Magento/Eav/Model/Entity/AbstractEntity.php 4 additions, 4 deletions

app/code/Magento/Eav/Model/Entity/AbstractEntity.php
app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php 39 additions, 13 deletions

app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
app/code/Magento/Payment/view/adminhtml/web/transparent.js 46 additions, 29 deletions

app/code/Magento/Payment/view/adminhtml/web/transparent.js
app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-data.js 0 additions, 0 deletions

...e/web/js/model/credit-card-validation/credit-card-data.js
app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-number-validator.js 0 additions, 0 deletions

...el/credit-card-validation/credit-card-number-validator.js
app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-number-validator/credit-card-type.js 0 additions, 0 deletions

...lidation/credit-card-number-validator/credit-card-type.js
app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/credit-card-number-validator/luhn10-validator.js 0 additions, 0 deletions

...lidation/credit-card-number-validator/luhn10-validator.js
app/code/Magento/Payment/view/base/web/js/model/credit-card-validation/cvv-validator.js 0 additions, 0 deletions

...base/web/js/model/credit-card-validation/cvv-validator.js

with 225 additions and 141 deletions

Please register or to comment

Admin message

MTA-3760: Fix Update Products Using Mass Actions