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

continuation

Browse Source
This commit is contained in:
Marion Muszynski 2017-11-20 11:11:18 +01:00
parent 3a9f7ef77c
commit 60b061fc47
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
adm/helpers/includes/css/custom.css
View File

@ -130,6 +130,12 @@ h2 {
font-size: 18px;
font-weight: 400;
}
.label-purple{
background-color: #504d8b;
}
.label-rose{
background-color: #E36EA2;
}
label{
color: #504d8b;
}

3
adm/tabs/AdminOrders.php
View File

@ -1291,6 +1291,7 @@ class AdminOrders extends AdminTab
<div class="row">
<div class="col-md-6" style="padding-right:0;">
<div style="background:#efefef;padding:10px;">
'.($order->appli?'<p style="margin-bottom:0px;"><span class="anticon anticon-apple"></span> <span class="anticon anticon-android"></span> '.$this->l('Commande faite via l\'appli').'</p>':'').'
<p style="margin-bottom:0px;"><span class="anticon anticon-credit-card"></span> '.Tools::substr($order->payment, 0, 32).' '.($order->module ? '('.$order->module.')' : '').'</p>
<p><span class="anticon anticon-cart"></span> <a href="?tab=AdminCarts&id_cart='.$cart->id.'&viewcart&token='.Tools::getAdminToken('AdminCarts'.(int)(Tab::getIdFromClassName('AdminCarts')).(int)($cookie->id_employee)).'">'.$this->l('Cart #').sprintf('%06d', $cart->id).'</a></p>
<p style="margin-bottom:0px;"><span class="anticon anticon-cross '.($order->recyclable ? 'text-green-light' : 'text-rose').'"></span> '.$this->l('Recycled package').'</p>
@ -1497,7 +1498,7 @@ class AdminOrders extends AdminTab
.'</a>
</td>
<td style=" width:70px;vertical-align:middle;color:#444;">'.Tools::displayPrice($product_price,$currency).'</td>
<td style="vertical-align:middle;color:#444;">'.$quantity.'</td>
<td style="vertical-align:middle;color:#444;"><span class="label '.($quantity>1?'label-rose':'label-purple').'">'.$quantity.'</span></td>
'.($order->hasBeenPaid() ? '<td style="vertical-align:middle;color:#444;" align="center" class="productQuantity"><span class="text-rose">'.(int)($product['product_quantity_refunded']).'</span> | <span class="text-rose">'.(int)($product['product_quantity_return']).'</span></td>' : '').'
<td style="vertical-align:middle;color:#444;" align="center" class="productQuantity">'.(int)$stock['quantity'].'</td>
<td style=" width:70px;vertical-align:middle;color:#444;" align="center">'.Tools::displayPrice(Tools::ps_round($product_price, 2) * ((int)($product['product_quantity']) - $product['customizationQuantityTotal']), $currency, false).'</td>

8
modules/paypal/paypal.php
View File

@ -670,6 +670,14 @@ class PayPal extends PaymentModule
return $this->_html;
}
public function hookAdminOrderNew($params)
{
if (Tools::isSubmit('submitPayPalRefund')){
echo '<pre>';var_dump('test');echo '</pre>';die();
$this->_doTotalRefund($params['id_order']);
}
}
public function hookCancelProduct($params)
{
// if (Tools::isSubmit('generateDiscount') || !$this->isPayPalAPIAvailable())