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

Merge branch 'ticket-13166-UpgradeReturnManager' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2017-06-21 15:54:48 +02:00
commit 3cc85eb363
1 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
modules/ant_returnprocess/AdminAntReturnprocess.php
View File

@ -890,6 +890,7 @@ class AdminAntReturnprocess extends AdminTab
3 => "anticon anticon-box-add text-orange",
4 => "anticon anticon-cross text-rose",
5 => "anticon anticon-checkmark text-green-light",
6 => "anticon anticon-warning text-danger",
);
$helper = new HelperFormBootstrap();
@ -971,6 +972,36 @@ class AdminAntReturnprocess extends AdminTab
$html .='</tbody>
</table>
</div>
<div class="col-md-offset-1 col-md-4">';
if($return_history && !empty($return_history)) {
$html .= '
<h5 style="background:#504D8B;color:#fff;padding:5px; text-align:center;">
'.$this->l('Statut').'
<a class="pull-right" style="color:#fff;" role="button" data-toggle="collapse" href="#collapseHistory" aria-expanded="false" aria-controls="collapseHistory">
<i class="anticon anticon-info"></i>
</a>
</h5>
<p class="text-center">
<b>'.$return_history[0]['state'].' <span style="font-size:24px;" class="'.$colorStates[$orderReturn->state].'"></span></b><br>('.$return_history[0]['employee'].' - '.date('d/m/Y H:i',strtotime($return_history[0]['date_add'])).')
</p>
<div class="collapse" id="collapseHistory">
<div class="well">
<table class="table">';
foreach ($return_history as $key => $history) {
$html .= '
<tr>
<td style="font-size:11px;">'.date('d/m/Y H:i',strtotime($history['date_add'])).'</td>
<td style="font-size:11px;font-weight:bold">'.$history['state'].'</td>
<td style="font-size:11px;">'.$history['employee'].'</td>
</tr>';
}
$html .= '
</table>
</div>
</div>';
}
$html.='</div>
</div>';
if($other_returnProducts && !empty($other_returnProducts)){
$html .= '
@ -1036,9 +1067,9 @@ class AdminAntReturnprocess extends AdminTab
</a>
<div class="clearfix"></div>
</div>
<div class="panel-content collapse" id="collapseOrder">
<div class="panel-content">
<div class="row">
<div class="col-md-12">
<div class="col-md-12 collapse" id="collapseOrder">
<div class="row"/>
<div class="col-md-6">
<h5 style="background:#504D8B;color:#fff;padding:5px; text-align:center;"><span class="anticon anticon-credit-card"></span> Détails paiement</h5>
@ -1078,7 +1109,7 @@ class AdminAntReturnprocess extends AdminTab
$html .= '</ul>
</div>
</div>
<div class="row"/>
<div class="row"/>
<div class="col-md-6">
<h5 style="background:#504D8B;color:#fff;padding:5px; text-align:center;">Adresse Facturation</h5>
<p style="padding:5px 20px;background:#efefef;">'.$data['order_invoice_address'].'</p>
@ -1095,6 +1126,8 @@ class AdminAntReturnprocess extends AdminTab
</div>
<div class="clearfix"></div>
<div class="ln_solid"></div>
</div>
<div class="col-md-12">
<div class="panel-content">
<form action="'.$currentIndex.'&submitCancelProduct=1&updateorder_return&id_order_return='.(int)$orderReturn->id.'&token='.$this->token.'" method="post">
<div class="table-responsive">
@ -1242,36 +1275,7 @@ class AdminAntReturnprocess extends AdminTab
<input type="submit" name="submitOrderState" value="'.$this->l('Change').'" class="btn btn-primary btn-block" />
</form>
</div>
<div class="col-md-6">';
if($return_history && !empty($return_history)) {
$html .= '
<h5 style="background:#504D8B;color:#fff;padding:5px; text-align:center;">
'.$this->l('Statut').'
<a class="pull-right" style="color:#fff;" role="button" data-toggle="collapse" href="#collapseHistory" aria-expanded="false" aria-controls="collapseHistory">
<i class="anticon anticon-info"></i>
</a>
</h5>
<p class="text-center">
<b>'.$return_history[0]['state'].' <span style="font-size:24px;" class="'.$colorStates[$orderReturn->state].'"></span></b><br>('.$return_history[0]['employee'].' - '.date('d/m/Y H:i',strtotime($return_history[0]['date_add'])).')
</p>
<div class="collapse" id="collapseHistory">
<div class="well">
<table class="table">';
foreach ($return_history as $key => $history) {
$html .= '
<tr>
<td style="font-size:11px;">'.date('d/m/Y H:i',strtotime($history['date_add'])).'</td>
<td style="font-size:11px;font-weight:bold">'.$history['state'].'</td>
<td style="font-size:11px;">'.$history['employee'].'</td>
</tr>';
}
$html .= '
</table>
</div>
</div>';
}
$html .= '
<div class="col-md-6">
<h5 style="background:#504D8B;color:#fff;padding:5px; text-align:center;">'.$this->l('Changer le statut du retour').'</h5>
<form style="padding:10px 20px;background:#efefef;" action="'.$currentIndex.'&submitAddorder_return=1&updateorder_return&id_order_return='.(int)$orderReturn->id.'&token='.$this->token.'" method="post">
<input type="hidden" name="id_order" value="'.$orderReturn->id_order.'" />