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

Merge branch 'ticket-13166-ReturnProcess' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2017-06-06 11:58:17 +02:00
commit 21925a54ea
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
adm/tabs/AdminOrders.php
View File

@ -1578,8 +1578,8 @@ class AdminOrders extends AdminTab
}
if(count($returnable) > 0) {
$instructions = array(
1 => 'Commande à ré-expédier',
2 => 'Commande à rembourser',
4 => 'Commande à ré-expédier',
5 => 'Commande à rembourser',
);
$reasons = array(
// 1 => 'CLIENT : Annulation pré-envoi',

16
modules/ant_returnprocess/AdminAntReturnprocess.php
View File

@ -723,9 +723,13 @@ class AdminAntReturnprocess extends AdminTab
}
$instructions = array(
1 => 'Commande à ré-expédier',
2 => 'Commande à rembourser',
1 => 'Remboursement + Mise en stock',
2 => 'Échange',
3 => 'Défectueux',
4 => 'Commande à ré-expédier',
5 => 'Commande à rembourser',
);
$reasons = array(
// 1 => 'CLIENT : Annulation pré-envoi',
2 => 'CLIENT : Rétractation post-envoi',
@ -892,8 +896,11 @@ class AdminAntReturnprocess extends AdminTab
</a>
</td>
<td align="center" style="vertical-align:middle;color:#444;">'.$product['product_quantity'].'</td>
<td align="center" style="vertical-align:middle;color:#444;">'.$instructions[(int)$return_details['instruction']].'</td>
<td align="center" style="vertical-align:middle;color:#444;"><a style="color:#504d8b;" href="'.$currentIndex.'&deleteorder_return_detail&id_order_detail='.$product['id_order_detail'].'&id_order_return='.$orderReturn->id.'&token='.$this->token.'"><span class="anticon anticon-bin"></span></a></td>
<td align="center" style="vertical-align:middle;color:#444;font-size: 12px;">'.$instructions[(int)$return_details['instruction']].'</td>
<td align="center" style="vertical-align:middle;color:#444;">
<a style="color:#504d8b;" href="'.$currentIndex.'&deleteorder_return_detail&id_order_detail='.$product['id_order_detail'].'&id_order_return='.$orderReturn->id.'&token='.$this->token.'"><span class="anticon anticon-bin"></span></a>
<a style="cursor:pointer;color:#504d8b;" data-container="body" data-toggle="popover" data-placement="bottom" data-content="'.$reasons[(int)$return_details['reason']].'"><i class="glyphicon glyphicon-info-sign"></i></a>
</td>
</tr>';
}
}
@ -1377,6 +1384,7 @@ class AdminAntReturnprocess extends AdminTab
var p = window.open(url, "Modification Addresse de livraison", "width=720, height=360, resizable=1, scrollbars=1");
return false;
});
$(\'[data-toggle="popover"]\').popover();
});
</script>
';