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

Merge branch 'ticket-modifAddress' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-05-18 10:30:54 +02:00
commit e2fa90e008
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
adm/scaddressedit.php
View File

@ -49,7 +49,7 @@ p {
overflow: auto;
}
</style>
</head><body onload="<?php if(isset($_POST['submitSC'])) { ?>window.close();<?php } ?>">
</head><body onunload="window.opener.location.reload(true);" onload="<?php if(isset($_POST['submitSC'])) { ?>window.close();<?php } ?>">
<form action="" method="post">
<fieldset>
<p>

7
modules/soflexibilite/views/templates/hook/displayAdminOrder.tpl
View File

@ -59,7 +59,8 @@
</span>
</div>
<div class="float-left">
<strong>{$soflexibilite_delivery_address.name|escape:'htmlall':'UTF-8'}</strong><br>
<a class="float-right" id="modif_address" style="cursor: pointer; float:right;" ><img src="../img/admin/edit.gif" alt=""></a>
<strong>{$soflexibilite_delivery_address.name|escape:'htmlall':'UTF-8'}</strong><br>
{if $soflexibilite_delivery_address.libelle}<strong>
<span style="color: green">{$soflexibilite_delivery_address.libelle|escape:'htmlall':'UTF-8'}</span>
</strong>
@ -99,6 +100,10 @@
$('#myTab').parent().append('<hr>');
$('#sf_panel').appendTo($('#myTab').parent());
}
$('#modif_address').click(function(){
var p = window.open('scaddressedit.php?id_cart={/literal}{$soflexibilite_id_cart}{literal}', 'Modification SoColissimo', 'width=720, height=360, resizable=1, scrollbars=1');
return false;
});
});
</script>
{/literal}

27
override/controllers/ParentOrderController.php
View File

@ -164,20 +164,19 @@ class ParentOrderController extends ParentOrderControllerCore {
// distinction "at home" et "out of home"
$carriers_ah = array();
$carriers_ooh = array();
//if(_THEME_NAME_ != "site_mobile") {
$config_carrier_ooh = array(88,89); // prod
// $config_carrier_ooh = array(47,48); // dev
// $config_carrier_ooh = array(40,45); // local
foreach ($carriers as $carrier) {
if (in_array($carrier['id_carrier'], $config_carrier_ooh) ){
$carriers_ooh[] = $carrier;
} else {
$carriers_ah[] = $carrier;
}
}
unset($carriers);
$carriers = $carriers_ah;
//}
// $config_carrier_ooh = array(88,89); // prod
$config_carrier_ooh = array(47,48); // dev
// $config_carrier_ooh = array(40,45); // local
foreach ($carriers as $carrier) {
if (in_array($carrier['id_carrier'], $config_carrier_ooh) ){
$carriers_ooh[] = $carrier;
} else {
$carriers_ah[] = $carrier;
}
}
unset($carriers);
$carriers = $carriers_ah;
}
}
}