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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
David 2017-12-18 15:55:59 +01:00
commit a04d0712cb
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
css/admin.css
View File

@ -3814,3 +3814,7 @@ form.form-forward-message .button:focus{
.tab_customer_thread .button:focus{
background-color: rgba(86,84,133,0.6);
}
span.anticon {
color: #000;
}

1
modules/lapostews/predis

@ -1 +0,0 @@
Subproject commit b26d6103a62b0eff495b785ec15edf0ad7020ea8

1
modules/logistics/libs/predis

@ -1 +0,0 @@
Subproject commit b26d6103a62b0eff495b785ec15edf0ad7020ea8

1
modules/print_ean/libs/predis

@ -1 +0,0 @@
Subproject commit b26d6103a62b0eff495b785ec15edf0ad7020ea8

5
override/classes/Order.php
View File

@ -97,16 +97,19 @@ class Order extends OrderCore
default:
case 0:
$name = 'computer';
$icon = 'display';
break;
case 1:
$name = 'application';
$icon = 'android';
break;
case 2:
$name = 'mobile';
$icon = 'mobile';
break;
}
return '<img src="/img/'.$name.'.png" alt="" width="18px"/>';
return '<span title="'.$name.'" class="anticon anticon-'.$icon.'"></span>';
}
public function printCarrier($value, $params)