Ticket #908

modules/boonex/acl/classes/BxAclModule.php

@@ -74,15 +74,17 @@ class BxAclModule extends BxDolModule
 			return array();
 
 		return array (
-			'id' => $aItem['id'],
-			'author_id' => $this->_oConfig->getOwner(),
-			'name' => $aItem['name'],
-			'title' => _t('_bx_acl_txt_cart_item_title', _t($aItem['level_name']), $aItem['period'], $aItem['period_unit']),
-			'description' => _t($aItem['level_description']),
-			'url' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink($CNF['URL_VIEW']),
-			'price_single' => $aItem['price'],
-			'price_recurring' => $aItem['price'],
-			'trial_recurring' => $aItem['trial']
+            'id' => $aItem['id'],
+            'author_id' => $this->_oConfig->getOwner(),
+            'name' => $aItem['name'],
+            'title' => _t('_bx_acl_txt_cart_item_title', _t($aItem['level_name']), $aItem['period'], $aItem['period_unit']),
+            'description' => _t($aItem['level_description']),
+            'url' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink($CNF['URL_VIEW']),
+            'price_single' => $aItem['price'],
+            'price_recurring' => $aItem['price'],
+            'period_recurring' => $aItem['period'],
+            'period_unit_recurring' => $aItem['period_unit'],
+            'trial_recurring' => $aItem['trial']
         );
     }
 
@@ -100,15 +102,17 @@ class BxAclModule extends BxDolModule
         $aResult = array();
         foreach($aItems as $aItem)
             $aResult[] = array(
-				'id' => $aItem['id'],
-				'author_id' => $iSellerIdSetting,
-            	'name' => $aItem['name'],
-				'title' => _t('_bx_acl_txt_cart_item_title', _t($aItem['level_name']), $aItem['period'], $aItem['period_unit']),
-				'description' => _t($aItem['level_description']),
-				'url' => $sUrl,
-				'price_single' => $aItem['price'],
-            	'price_recurring' => $aItem['price'],
-            	'trial_recurring' => $aItem['trial']
+                'id' => $aItem['id'],
+                'author_id' => $iSellerIdSetting,
+                'name' => $aItem['name'],
+                'title' => _t('_bx_acl_txt_cart_item_title', _t($aItem['level_name']), $aItem['period'], $aItem['period_unit']),
+                'description' => _t($aItem['level_description']),
+                'url' => $sUrl,
+                'price_single' => $aItem['price'],
+                'price_recurring' => $aItem['price'],
+                'period_recurring' => $aItem['period'],
+                'period_unit_recurring' => $aItem['period_unit'],
+                'trial_recurring' => $aItem['trial']
            );
 
         return $aResult;

modules/boonex/market/classes/BxMarketModule.php

@@ -318,16 +318,18 @@ class BxMarketModule extends BxBaseModTextModule
         if(empty($aItem) || !is_array($aItem))
 			return array();
 
-		return array (
-			'id' => $aItem[$CNF['FIELD_ID']],
-			'author_id' => $aItem[$CNF['FIELD_AUTHOR']],
-			'name' => $aItem[$CNF['FIELD_NAME']],
-			'title' => $aItem[$CNF['FIELD_TITLE']],
-			'description' => $aItem[$CNF['FIELD_TEXT']],
-			'url' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=view-product&id=' . $aItem[$CNF['FIELD_ID']]),
-			'price_single' => $aItem[$CNF['FIELD_PRICE_SINGLE']],
-			'price_recurring' => $aItem[$CNF['FIELD_PRICE_RECURRING']],
-		    'trial_recurring' => $aItem[$CNF['FIELD_TRIAL_RECURRING']]
+        return array (
+            'id' => $aItem[$CNF['FIELD_ID']],
+            'author_id' => $aItem[$CNF['FIELD_AUTHOR']],
+            'name' => $aItem[$CNF['FIELD_NAME']],
+            'title' => $aItem[$CNF['FIELD_TITLE']],
+            'description' => $aItem[$CNF['FIELD_TEXT']],
+            'url' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=view-product&id=' . $aItem[$CNF['FIELD_ID']]),
+            'price_single' => $aItem[$CNF['FIELD_PRICE_SINGLE']],
+            'price_recurring' => $aItem[$CNF['FIELD_PRICE_RECURRING']],
+            'period_recurring' => 1,
+            'period_unit_recurring' => $aItem[$CNF['FIELD_DURATION_RECURRING']],
+            'trial_recurring' => $aItem[$CNF['FIELD_TRIAL_RECURRING']]
         );
     }
 
@@ -344,16 +346,18 @@ class BxMarketModule extends BxBaseModTextModule
         $aResult = array();
         foreach($aItems as $aItem)
             $aResult[] = array(
-				'id' => $aItem[$CNF['FIELD_ID']],
-				'author_id' => $aItem[$CNF['FIELD_AUTHOR']],
-            	'name' => $aItem[$CNF['FIELD_NAME']],
-				'title' => $aItem[$CNF['FIELD_TITLE']],
-				'description' => $aItem[$CNF['FIELD_TEXT']],
-				'url' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=view-product&id=' . $aItem[$CNF['FIELD_ID']]),
-				'price_single' => $aItem[$CNF['FIELD_PRICE_SINGLE']],
-            	'price_recurring' => $aItem[$CNF['FIELD_PRICE_RECURRING']],
-            	'trial_recurring' => $aItem[$CNF['FIELD_TRIAL_RECURRING']]
-           );
+                'id' => $aItem[$CNF['FIELD_ID']],
+                'author_id' => $aItem[$CNF['FIELD_AUTHOR']],
+                'name' => $aItem[$CNF['FIELD_NAME']],
+                'title' => $aItem[$CNF['FIELD_TITLE']],
+                'description' => $aItem[$CNF['FIELD_TEXT']],
+                'url' => BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink('page.php?i=view-product&id=' . $aItem[$CNF['FIELD_ID']]),
+                'price_single' => $aItem[$CNF['FIELD_PRICE_SINGLE']],
+                'price_recurring' => $aItem[$CNF['FIELD_PRICE_RECURRING']],
+                'period_recurring' => 1,
+                'period_unit_recurring' => $aItem[$CNF['FIELD_DURATION_RECURRING']],
+                'trial_recurring' => $aItem[$CNF['FIELD_TRIAL_RECURRING']]
+            );
 
         return $aResult;
     }