Просмотр исходного кода

Ticket #259 - Subscriptions and Chargebee.

AntonLV 10 лет назад
Родитель
Сommit
17dd41b3ee

+ 1 - 1
modules/boonex/payment/classes/BxPaymentModule.php

@@ -407,7 +407,7 @@ class BxPaymentModule extends BxBaseModPaymentModule
                 'module_id' => $aItem['module_id'],
                 'item_id' => $aItem['item_id'],
                 'item_count' => $aItem['item_count'],
-                'amount' => $this->_oConfig->getPrice($sType, $aItem) * $aItem['item_count'],
+                'amount' => $aItem['item_count'] * $this->_oConfig->getPrice($sType, $aItemInfo),
             	'license' => $sLicense,
             ));
 

+ 7 - 4
modules/boonex/payment/classes/BxPaymentTemplate.php

@@ -131,7 +131,9 @@ class BxPaymentTemplate extends BxBaseModPaymentTemplate
 
             //--- Get Items ---//
             $aItems = array();
-            foreach($aVendor['items'] as $aItem)
+            foreach($aVendor['items'] as $aItem) {
+            	$fPrice = $this->_oConfig->getPrice(BX_PAYMENT_TYPE_SINGLE, $aItem);
+
                 $aItems[] = array(
                     'vendor_id' => $aVendor['vendor_id'],
                     'vendor_currency_code' => $aVendor['vendor_currency_code'],
@@ -141,18 +143,19 @@ class BxPaymentTemplate extends BxBaseModPaymentTemplate
                     'item_url' => $aItem['url'],
                     'item_quantity' => $aItem['quantity'],
                 	'bx_if:show_price_paid' => array(
-                		'condition' => (int)$aItem['price'] != 0,
+                		'condition' => $fPrice != 0,
                 		'content' => array(
-                			'item_price' => $aItem['quantity'] * $aItem['price'],
+                			'item_price' => $aItem['quantity'] * $fPrice,
                 			'vendor_currency_code' => $aVendor['vendor_currency_code'],
                 		)
                 	),
                 	'bx_if:show_price_free' => array(
-                		'condition' => (int)$aItem['price'] == 0,
+                		'condition' => $fPrice == 0,
                 		'content' => array()
                 	),
                     'js_object' => $sJsObject
                 );
+            }
 
             //--- Get Control Panel ---//
             $aButtons = array(