antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ticket-ChangeDeliveryAddress' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-10-13 15:53:46 +02:00
commit 72a789159a
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ant_changeaddress/change_address.php
View File

@ -74,7 +74,7 @@ if ($cookie->isLogged()) {
$order->update();
}
} else {
$errors[] = Tools::displayError('Error occured');
$errors[] = Tools::displayError('An error occured');
}
}
$address = Db::getInstance()->getRow('

1
modules/ant_changeaddress/change_address.tpl
View File

@ -73,6 +73,7 @@
{/if}
<p class="submit_buttons">
<a href="{$link->getPageLink('history.php', true)}" title="{l s='Back' mod='ant_changeaddress'}" class="button_large">{l s='Back to my commands' mod='ant_changeaddress'}</a>
{if $delivery_mode == "DOM"}
<a href="{$link->getPageLink('address.php', true)}" title="{l s='Add' mod='ant_changeaddress'}" class="button_large">{l s='Add a new address' mod='ant_changeaddress'}</a>
{/if}

14
themes/site/css/style.css
View File

@ -7110,3 +7110,17 @@ table#carrierTable tbody td {
#product #privatesales_similarproduct .ico_next:before{
display: none;
}
/* Order detail */
#history #block-history{
background: #fff;
padding: 20px;
-moz-box-shadow: 2px 2px 5px #cccccc;
-webkit-box-shadow: 2px 2px 5px #CCC;
-ms-box-shadow: 2px 2px 5px #cccccc;
-o-box-shadow: 2px 2px 5px #cccccc;
box-shadow: 2px 2px 5px #CCC;
}
#history #block-history .alternate_item {
background: #F3F3F3;
}