Merge fix for buy now taxes

This commit is contained in:
Hillel Coren 2017-08-02 20:25:27 +03:00
parent 196e5ef026
commit 9c770c392e

View File

@ -360,10 +360,10 @@ class OnlinePaymentController extends BaseController
'notes' => $product->notes, 'notes' => $product->notes,
'cost' => $product->cost, 'cost' => $product->cost,
'qty' => 1, 'qty' => 1,
'tax_rate1' => $account->tax_rate1, 'tax_rate1' => $product->tax_rate1,
'tax_name1' => $account->tax_name1 ?: '', 'tax_name1' => $product->tax_name1 ?: '',
'tax_rate2' => $account->tax_rate2, 'tax_rate2' => $product->tax_rate2,
'tax_name2' => $account->tax_name2 ?: '', 'tax_name2' => $product->tax_name2 ?: '',
'custom_value1' => Input::get('custom_product1') ?: $product->custom_value1, 'custom_value1' => Input::get('custom_product1') ?: $product->custom_value1,
'custom_value2' => Input::get('custom_product2') ?: $product->custom_value2, 'custom_value2' => Input::get('custom_product2') ?: $product->custom_value2,
]], ]],