GX-Bug #60044 » OTPaymentFix.patch
| src/includes/modules/order_total/ot_payment.php (date 1539178254000) | ||
|---|---|---|
| 123 | 123 |
// BOF GM_MOD: |
| 124 | 124 |
$od_amount = round($amount*100)/100*$od_pc/100; |
| 125 | 125 |
// $od_amount = $od_amount + $tod_amount; //auskommentieren, da sonst die Steuer 2x rabattiert wird |
| 126 |
$discount['amount1'] = $od_amount; |
|
| 127 |
$discount['pro1'] = $od_pc; |
|
| 126 | 128 |
} |
| 127 | 129 |
} |
| 128 | 130 |
|
| ... | ... | |
| 153 | 155 |
// BOF GM_MOD: |
| 154 | 156 |
$od_amount2 = round($amount2*100)/100*$od_pc2/100; |
| 155 | 157 |
// $od_amount2 = $od_amount2 + $tod_amount2; //auskommentieren, da sonst die Steuer 2x rabattiert wird |
| 156 |
} |
|
| 157 |
} |
|
| 158 |
// $order->info['tax'] = $order->info['tax'] - $tod_amount - $tod_amount2; //diese Zeile auskommentieren, wenn die Prozente nacheinander berechnet werden sollen |
|
| 159 |
$discount['sum'] = -($od_amount + $od_amount2); |
|
| 160 |
$discount['amount1'] = $od_amount; |
|
| 161 |
$discount['amount2'] = $od_amount2; |
|
| 162 |
$discount['pro1'] = $od_pc; |
|
| 163 |
$discount['pro2'] = $od_pc2; |
|
| 158 |
$discount['amount2'] = $od_amount2; |
|
| 159 |
$discount['pro2'] = $od_pc2; |
|
| 160 |
} |
|
| 161 |
} |
|
| 162 |
// $order->info['tax'] = $order->info['tax'] - $tod_amount - $tod_amount2; //diese Zeile auskommentieren, wenn die Prozente nacheinander berechnet werden sollen |
|
| 163 |
$discount['sum'] = -($od_amount + $od_amount2); |
|
| 164 |
|
|
| 164 | 165 |
return $discount; |
| 165 | 166 |
} |
| 166 | 167 |
|