dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// MERGE with 1.4 r7770

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-07-28 09:20:57 +00:00
parent df255f66c1
commit a875fecb20
968 changed files with 26082 additions and 3937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/paysafecard/PrepaidServices.php
+3 -3
View File
@@ -453,7 +453,7 @@ abstract class PrepaidServices extends PaymentModule
else
$order->total_paid_real += $amount;
$os = _PS_OS_PAYMENT_;
$os = Configuration::get('PS_OS_PAYMENT');
if ($order->total_paid != $order->total_paid_real)
$os = Configuration::get($this->prefix.'ORDER_STATE_PART_ID');
@@ -559,7 +559,7 @@ abstract class PrepaidServices extends PaymentModule
'payment_name' => $this->displayName,
'module_name' => $this->name));
return $this->display(__FILE__, 'payment.tpl');
return $this->display(_MODULE_DIR_.'/'.$this->name.'/', 'payment.tpl');
}
@@ -571,7 +571,7 @@ abstract class PrepaidServices extends PaymentModule
return;
$smarty->assign('payment_name', $this->displayName);
return $this->display(__FILE__, $this->name.'-confirmation.tpl');
return $this->display(_MODULE_DIR_.'/'.$this->name.'/', $this->name.'-confirmation.tpl');
}