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

Merge branch 'ticket-15062-confirmAlert' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2017-12-07 16:29:50 +01:00
commit 62ad2de197
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
adm/tabs/AdminOrders.php
View File

@ -1559,7 +1559,7 @@ class AdminOrders extends AdminTab
</form>';
if($order->module && $order->module=="paypal"){
$html.='
<form style="margin-top:10px;" action="" method="post">
<form style="margin-top:10px;" action="" method="post" id="form_refund_paypal">
<div class="form-horizontal text-right col-md-offset-9 col-md-3">
<input type="hidden" name="id_order" value="'.$order->id.'" />
<button type="submit" class="btn btn-primary pull-right" name="submitPayPalRefund">Remboursement Total Paypal <span class="anticon anticon-paypal"></span></button>
@ -1823,7 +1823,7 @@ class AdminOrders extends AdminTab
<ul style="list-style: outside none; margin: 0; padding: 0;">';
foreach($returnable as $id_order_detail => $product) {
$html.= '
<li style="padding: 5px; background: #eee;"><input data-order-detail="'.(int) $id_order_detail.'" class="return_input" style="width: 30px; text-align: right; border: 1px solid #E0D0B1; padding: 2px 4px;" type="number" name="return_product['.(int) $id_order_detail.']" value="0" autocomplete="off" step="1" max="'.(int) $product[1].'" min="0" /> x '.$product[0]. '</li>
<li style="padding: 5px; background: #eee;"><input data-order-detail="'.(int) $id_order_detail.'" class="return_input" style="width: 35px; text-align: right; border: 1px solid #E0D0B1; padding: 2px 1px;" type="number" name="return_product['.(int) $id_order_detail.']" value="0" autocomplete="off" step="1" max="'.(int) $product[1].'" min="0" /> x '.$product[0]. '</li>
<li id="reason_'.$id_order_detail.'">';
for($i = 1; $i <= $product[1]; $i++) {
$html.= '
@ -1985,6 +1985,15 @@ class AdminOrders extends AdminTab
}
});
$("#form_refund_paypal").submit(function(){
var x = confirm("Êtes-vous sûr de vouloir rembourser l\'ensemble de la commande ?");
if(x){
return true;
} else {
return false;
}
});
$("#generateDiscount, #generateDiscount2, #generateCreditSlip").click(function(){
if($(this).is(":checked")){
$("#spanShippingBack").css("display", "block");

3
modules/ant_canonical/ant_canonical.php
View File

@ -48,7 +48,8 @@ class Ant_Canonical extends Module
$domain = Configuration::get('PS_SSL_ENABLED') ?
Configuration::get('PS_SHOP_DOMAIN_SSL') : Configuration::get('PS_SHOP_DOMAIN');
$host = str_replace('bebeboutik.com', 'bebeboutik.'.$tld, $domain);
$host = (Configuration::get('PS_SSL_ENABLED') ? 'https://' : 'http://').$host;
//$host = (Configuration::get('PS_SSL_ENABLED') ? 'https://' : 'http://').$host;
$host = 'https://'.$host;
// Page category
if ($page_name == 'category') {

2
override/classes/Order.php
View File

@ -87,7 +87,7 @@ class Order extends OrderCore {
public function printAppliIcons($value, $params)
{
$name = ((int)$value?'computer':'mobile');
$name = ((int)$value?'mobile':'computer');
return '<img src="/img/'.$name.'.png" alt="" width="18px"/>';
}