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

Bugfix for regions with single quote in name #936

Merged
merged 1 commit into from
Jan 14, 2015
Merged

Bugfix for regions with single quote in name #936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,10 @@ define([
*/
_renderSelectOption: function(selectElement, key, value) {
selectElement.append($.proxy(function() {
if (value.code && $(value.name).is('span')) {
var name = value.name.replace(/[!"#$%&'()*+,.\/:;<=>?@[\\\]^`{|}~]/g, "\\$&");
if (value.code && $(name).is('span')) {
key = value.code;
value.name = $(value.name).text();
value.name = $(name).text();
}
$.template('regionTemplate', this.options.regionTemplate);
if (this.options.defaultRegion === key) {
Expand Down Expand Up @@ -172,4 +173,4 @@ define([
});

return $.mage.regionUpdater;
});
});
2 changes: 1 addition & 1 deletion ...TestCase/UpdateCustomerFrontendEntity.php → ...Case/UpdateCustomerFrontendEntityTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class UpdateCustomerFrontendEntity extends Injectable
class UpdateCustomerFrontendEntityTest extends Injectable
{
/**
* Factory for Fixtures
Expand Down
1 change: 1 addition & 0 deletions ...ase/UpdateCustomerFrontendEntity/test.csv → ...UpdateCustomerFrontendEntityTest/test.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
"customer/data/firstname";"customer/data/lastname";"customer/data/email";"address/data/firstname";"address/data/lastname";"address/data/company";"address/data/street";"address/data/city";"address/data/country_id";"address/data/region_id";"address/data/region";"address/data/telephone";"address/data/fax";"address/data/postcode";"constraint"
"Jany %isolation%";"Doe %isolation%";"janydoe%isolation%@example.com";"Jany %isolation%";"Doe %isolation%";"Company %isolation%";"Some street %isolation%";"City %isolation%";"United States";"Colorado";"-";"555-888-111-999";"161-999-8888";"12345";"assertCustomerAddressSuccessSaveMessage, assertCustomerDefaultAddresses"
"Jonny %isolation%";"Doe %isolation%";"jonny%isolation%@example.com";"John %isolation%";"Doe %isolation%";"Company %isolation%";"Some street %isolation%";"City %isolation%";"United Kingdom";"-";"Region %isolation%";"0123456789-02134567";"5555-874-99634";"12345";"assertCustomerAddressSuccessSaveMessage, assertCustomerDefaultAddresses"
"Jean %isolation%";"Reno %isolation%";"jean%isolation%@example.com";"Jean %isolation%";"Reno %isolation%";"Magento %isolation%";"18-20 Rue Maréchal Leclerc";"Quintin";"France";"Côtes-d'Armor";"-";"555-888-111-999";"161-999-8888";"12345";"assertCustomerAddressSuccessSaveMessage, assertCustomerDefaultAddresses"