Merge branch 'master' of https://github.com/unaio/una

inc/params.inc.php

@@ -51,10 +51,12 @@ if (!defined('BX_DOL_MODULE_TYPE_MODULE')) {
     define('BX_DOL_MODULE_TYPE_TEMPLATE', 'template');
 }
 
-//--- Payment types ---//
+//--- Payment settings ---//
 define('BX_PAYMENT_TYPE_SINGLE', 'single');
 define('BX_PAYMENT_TYPE_RECURRING', 'recurring');
 
+define('BX_PAYMENT_EMPTY_ID', 0);
+
 //--- Studio settings ---//
 define('BX_DOL_STUDIO_FOLDER', 'studio');
 

modules/boonex/payment/classes/BxPaymentModule.php

@@ -14,8 +14,6 @@ define('BX_PAYMENT_ORDERS_TYPE_PROCESSED', 'processed');
 define('BX_PAYMENT_ORDERS_TYPE_SUBSCRIPTION', 'subscription');
 define('BX_PAYMENT_ORDERS_TYPE_HISTORY', 'history');
 
-define('BX_PAYMENT_EMPTY_ID', 0);
-
 define('BX_PAYMENT_RESULT_SUCCESS', 0);
 
 define('BX_PAYMENT_SBS_STATUS_SCHEDULED', 'scheduled');

modules/boonex/payment/classes/BxPaymentProviderChargebeeV3.php

@@ -39,9 +39,15 @@ class BxPaymentProviderChargebeeV3 extends BxPaymentProviderChargebee
             $aItemAddons = $this->_oModule->_oConfig->s2a($sItemAddons);
 
             foreach($aItemAddons as $sItemAddon)
-                $aItem['addons'][] = array(
-                    'id' => $sItemAddon
-                );
+                if(!isset($aItem['addons'][$sItemAddon]))
+                    $aItem['addons'][$sItemAddon] = array(
+                        'id' => $sItemAddon,
+                        'quantity' => 1
+                    );
+                else 
+                    $aItem['addons'][$sItemAddon]['quantity'] += 1;
+
+            $aItem['addons'] = array_values($aItem['addons']);
         }
         $aClient = $this->_oModule->getProfileInfo($iClientId);