Skip to content

Commit

Permalink
Merge pull request #186 from magento-goinc/MAGETWO-45552
Browse files Browse the repository at this point in the history 
[GoInc+Dragons] BugFixing again
  • Loading branch information
Slabko,Michael(mslabko) committed Nov 14, 2015
2 parents 3148312 + 556c07c commit 95faca4
Show file tree
Hide file tree
Showing 25 changed files with 53 additions and 37 deletions.
4 changes: 2 additions & 2 deletions app/code/Magento/Customer/view/frontend/email/account_new.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
{{trans
'To sign in to our site, use these credentials during checkout or on the <a href="%customer_url">My Account</a> page:'

customer_url=$this.getUrl($store,'customer/account/')
customer_url=$this.getUrl($store,'customer/account/',[_nosid:1])
|raw}}
</p>
<ul>
Expand All @@ -30,7 +30,7 @@
{{trans
'Forgot your account password? Click <a href="%reset_url">here</a> to reset it.'

reset_url="$this.getUrl($store,'customer/account/createPassword/',[_query:[id:$customer.id,token:$customer.rp_token]])"
reset_url="$this.getUrl($store,'customer/account/createPassword/',[_query:[id:$customer.id,token:$customer.rp_token],_nosid:1])"
|raw}}
</p>
<p>{{trans "When you sign in to your account, you will be able to:"}}</p>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Customer/view/frontend/email/account_new_confirmation.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<table class="inner-wrapper" border="0" cellspacing="0" cellpadding="0" align="center">
<tr>
<td align="center">
<a href="{{var this.getUrl($store,'customer/account/confirm/',[_query:[id:$customer.id,key:$customer.confirmation,back_url:$back_url]])}}" target="_blank">{{trans "Confirm Your Account"}}</a>
<a href="{{var this.getUrl($store,'customer/account/confirm/',[_query:[id:$customer.id,key:$customer.confirmation,back_url:$back_url],_nosid:1])}}" target="_blank">{{trans "Confirm Your Account"}}</a>
</td>
</tr>
</table>
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Customer/view/frontend/email/account_new_confirmed.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
{{trans
'To sign in to our site, use these credentials during checkout or on the <a href="%customer_url">My Account</a> page:'

customer_url=$this.getUrl($store,'customer/account/')
customer_url=$this.getUrl($store,'customer/account/',[_nosid:1])
|raw}}
</p>
<ul>
Expand All @@ -29,7 +29,7 @@
{{trans
'Forgot your account password? Click <a href="%reset_url">here</a> to reset it.'

reset_url="$this.getUrl($store,'customer/account/createPassword/',[_query:[id:$customer.id,token:$customer.rp_token]])"
reset_url="$this.getUrl($store,'customer/account/createPassword/',[_query:[id:$customer.id,token:$customer.rp_token],_nosid:1])"
|raw}}
</p>
<p>{{trans "When you sign in to your account, you will be able to:"}}</p>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Customer/view/frontend/email/account_new_no_password.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
{{trans
'To sign in to our site and set a password, click on the <a href="%create_password_url">link</a>:'

create_password_url="$this.getUrl($store,'customer/account/createPassword/',[_query:[id:$customer.id,token:$customer.rp_token]])"
create_password_url="$this.getUrl($store,'customer/account/createPassword/',[_query:[id:$customer.id,token:$customer.rp_token],_nosid:1])"
|raw}}
</p>
<ul>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Customer/view/frontend/email/password_new.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<table class="inner-wrapper" border="0" cellspacing="0" cellpadding="0" align="center">
<tr>
<td align="center">
<a href="{{var this.getUrl($store,'customer/account/createPassword',[_query:[id:$customer.id,token:$customer.rp_token]])}}" target="_blank">{{trans "Set a New Password"}}</a>
<a href="{{var this.getUrl($store,'customer/account/createPassword',[_query:[id:$customer.id,token:$customer.rp_token],_nosid:1])}}" target="_blank">{{trans "Set a New Password"}}</a>
</td>
</tr>
</table>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Customer/view/frontend/email/password_reset_confirmation.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<table class="inner-wrapper" border="0" cellspacing="0" cellpadding="0" align="center">
<tr>
<td align="center">
<a href="{{var this.getUrl($store,'customer/account/createPassword/',[_query:[id:$customer.id,token:$customer.rp_token]])}}" target="_blank">{{trans "Set a New Password"}}</a>
<a href="{{var this.getUrl($store,'customer/account/createPassword/',[_query:[id:$customer.id,token:$customer.rp_token],_nosid:1])}}" target="_blank">{{trans "Set a New Password"}}</a>
</td>
</tr>
</table>
Expand Down
36 changes: 26 additions & 10 deletions app/code/Magento/Eav/Model/Entity/Attribute/Set.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,16 +190,7 @@ public function organizeData($data)
}
if ($data['groups']) {
foreach ($data['groups'] as $group) {
$modelGroup = $this->_attrGroupFactory->create();
$modelGroup->setId(
is_numeric($group[0]) && $group[0] > 0 ? $group[0] : null
)->setAttributeGroupName(
$group[1]
)->setAttributeSetId(
$this->getId()
)->setSortOrder(
$group[2]
);
$modelGroup = $this->initGroupModel($group);

if ($data['attributes']) {
foreach ($data['attributes'] as $attribute) {
Expand Down Expand Up @@ -253,6 +244,31 @@ public function organizeData($data)
return $this;
}

/**
* @param array $group
* @return Group
*/
private function initGroupModel($group)
{
$modelGroup = $this->_attrGroupFactory->create();
$modelGroup->setId(
is_numeric($group[0]) && $group[0] > 0 ? $group[0] : null
)->setAttributeGroupName(
$group[1]
)->setAttributeSetId(
$this->getId()
)->setSortOrder(
$group[2]
);
if ($modelGroup->getId()) {
$group = $this->_attrGroupFactory->create()->load($modelGroup->getId());
if ($group->getId()) {
$modelGroup->setAttributeGroupCode($group->getAttributeGroupCode());
}
}
return $modelGroup;
}

/**
* Validate attribute set name
*
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/view/frontend/email/creditmemo_new.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<p class="greeting">{{trans "%name," name=$order.getCustomerName()}}</p>
<p>
{{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}}
{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/') |raw}}
{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
{{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
{{depend store_hours}}
{{trans 'Our hours are <span class="no-link">%store_hours</span>.' store_hours=$store_hours |raw}}
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/view/frontend/email/creditmemo_update.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
order_status=$order.getStatusLabel()
|raw}}
</p>
<p>{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/') |raw}}</p>
<p>{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}</p>
<p>
{{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
{{depend store_hours}}
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/view/frontend/email/invoice_new.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<p class="greeting">{{trans "%name," name=$order.getCustomerName()}}</p>
<p>
{{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}}
{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/') |raw}}
{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
{{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
{{depend store_hours}}
{{trans 'Our hours are <span class="no-link">%store_hours</span>.' store_hours=$store_hours |raw}}
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/view/frontend/email/invoice_update.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
order_status=$order.getStatusLabel()
|raw}}
</p>
<p>{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/') |raw}}</p>
<p>{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}</p>
<p>
{{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
{{depend store_hours}}
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/view/frontend/email/order_new.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<p>
{{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}}
{{trans "Once your package ships we will send you a tracking number."}}
{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/') |raw}}
{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
</p>
<p>
{{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/view/frontend/email/order_update.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
order_status=$order.getStatusLabel()
|raw}}
</p>
<p>{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/') |raw}}</p>
<p>{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}</p>
<p>
{{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
{{depend store_hours}}
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/view/frontend/email/shipment_new.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<p class="greeting">{{trans "%name," name=$order.getCustomerName()}}</p>
<p>
{{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}}
{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/') |raw}}
{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
{{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
{{depend store_hours}}
{{trans 'Our hours are <span class="no-link">%store_hours</span>.' store_hours=$store_hours |raw}}
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/view/frontend/email/shipment_update.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
order_status=$order.getStatusLabel()
|raw}}
</p>
<p>{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/') |raw}}</p>
<p>{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}</p>
<p>
{{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
{{depend store_hours}}
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/User/view/adminhtml/email/password_reset_confirmation.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

{{trans "If you requested this change, reset your password here:"}}

{{store url="admin/auth/resetpassword/" _query_id=$user.id _query_token=$user.rp_token}}
{{store url="admin/auth/resetpassword/" _query_id=$user.id _query_token=$user.rp_token _nosid=1}}

{{trans "If you did not make this request, you can ignore this email and your password will remain the same."}}

Expand Down
4 changes: 2 additions & 2 deletions app/design/frontend/Magento/luma/Magento_Customer/email/account_new.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
{{trans
'To sign in to our site, use these credentials during checkout or on the <a href="%customer_url">My Account</a> page:'

customer_url=$this.getUrl($store,'customer/account/')
customer_url=$this.getUrl($store,'customer/account/',[_nosid:1])
|raw}}
</p>
<table class="email-credentials">
Expand All @@ -36,7 +36,7 @@
{{trans
'Forgot your account password? Click <a href="%reset_url">here</a> to reset it.'

reset_url="$this.getUrl($store,'customer/account/createPassword/',[_query:[id:$customer.id,token:$customer.rp_token]])"
reset_url="$this.getUrl($store,'customer/account/createPassword/',[_query:[id:$customer.id,token:$customer.rp_token],_nosid:1])"
|raw}}
</p>
<br />
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_new.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<p class="greeting">{{trans "%name," name=$order.getCustomerName()}}</p>
<p>
{{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}}
{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/') |raw}}
{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
</p>
<p>
{{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>.' store_email=$store_email |raw}}
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
increment_id=$order.increment_id
order_status=$order.getStatusLabel()
|raw}}
{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/') |raw}}
{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
</p>
<p>
{{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>.' store_email=$store_email |raw}}
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/Magento/luma/Magento_Sales/email/invoice_new.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<p class="greeting">{{trans "%name," name=$order.getCustomerName()}}</p>
<p>
{{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}}
{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/') |raw}}
{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
</p>
<p>
{{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>.' store_email=$store_email |raw}}
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
increment_id=$order.increment_id
order_status=$order.getStatusLabel()
|raw}}
{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/') |raw}}
{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
</p>
<p>
{{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>.' store_email=$store_email |raw}}
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/Magento/luma/Magento_Sales/email/order_new.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<p>
{{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}}
{{trans "Once your package ships we will send you a tracking number."}}
{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/') |raw}}
{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
</p>
<p>
{{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>.' store_email=$store_email |raw}}
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/Magento/luma/Magento_Sales/email/order_update.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
increment_id=$order.increment_id
order_status=$order.getStatusLabel()
|raw}}
{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/') |raw}}
{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
</p>
<p>
{{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>.' store_email=$store_email |raw}}
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<p class="greeting">{{trans "%name," name=$order.getCustomerName()}}</p>
<p>
{{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}}
{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/') |raw}}
{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
</p>
<p>
{{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>.' store_email=$store_email |raw}}
Expand Down
Loading

0 comments on commit 95faca4

Please sign in to comment.