Ticket #2264

modules/boonex/payment/classes/BxPaymentConfig.php

@@ -18,97 +18,97 @@ class BxPaymentConfig extends BxBaseModPaymentConfig
         $sBaseUrl = BX_DOL_URL_ROOT . $this->getBaseUri();
 
         $this->CNF = array_merge($this->CNF, array(
-        	'URL_JOIN' => 'page.php?i=payment-join',
-        	'URL_CARTS' => 'page.php?i=payment-carts',
-        	'URL_CART' => 'page.php?i=payment-cart',
-        	'URL_CART_CHECKOUT' => $sBaseUrl . 'initialize_checkout/' . BX_PAYMENT_TYPE_SINGLE . '/',
-        	'URL_SUBSCRIBE' => $sBaseUrl . 'subscribe/',
-        	'URL_SUBSCRIPTIONS' => 'page.php?i=payment-sbs-list-my',
-        	'URL_HISTORY' => 'page.php?i=payment-history',
-        	'URL_ORDERS' => 'page.php?i=payment-orders',
-        	'URL_DETAILS' => 'page.php?i=payment-details',
-        	'URL_RETURN' => 'page.php?i=payment-cart-thank-you',
-        	'URL_RETURN_DATA' => $sBaseUrl . 'finalize_checkout/',
-        	'URL_NOTIFY' => $sBaseUrl . 'notify/',
-
-        	'KEY_ARRAY_PRICE_SINGLE' => 'price_single',
-        	'KEY_ARRAY_PRICE_RECURRING' => 'price_recurring',
-        	'KEY_ARRAY_TRIAL_RECURRING' => 'trial_recurring',
+            'URL_JOIN' => 'page.php?i=payment-join',
+            'URL_CARTS' => 'page.php?i=payment-carts',
+            'URL_CART' => 'page.php?i=payment-cart',
+            'URL_CART_CHECKOUT' => $sBaseUrl . 'initialize_checkout/' . BX_PAYMENT_TYPE_SINGLE . '/',
+            'URL_SUBSCRIBE' => $sBaseUrl . 'subscribe/',
+            'URL_SUBSCRIPTIONS' => 'page.php?i=payment-sbs-list-my',
+            'URL_HISTORY' => 'page.php?i=payment-history',
+            'URL_ORDERS' => 'page.php?i=payment-orders',
+            'URL_DETAILS' => 'page.php?i=payment-details',
+            'URL_RETURN' => 'page.php?i=payment-cart-thank-you',
+            'URL_RETURN_DATA' => $sBaseUrl . 'finalize_checkout/',
+            'URL_NOTIFY' => $sBaseUrl . 'notify/',
+
+            'KEY_ARRAY_PRICE_SINGLE' => 'price_single',
+            'KEY_ARRAY_PRICE_RECURRING' => 'price_recurring',
+            'KEY_ARRAY_TRIAL_RECURRING' => 'trial_recurring',
 
             'OBJECT_FORM_PRELISTS_CURRENCIES' => 'bx_payment_currencies',
 
-	        // some language keys
-        	'T' => array(
-        		'MSG_ITEM_ADDED' => '_bx_payment_msg_item_added',
-        		'MSG_ITEM_DELETED' => '_bx_payment_msg_item_deleted',
-        		'ERR_WRONG_DATA' => '_bx_payment_err_wrong_data',
-        		'ERR_REQUIRED_LOGIN' => '_bx_payment_err_required_login',
-        		'ERR_NOT_ACCEPT_PAYMENTS' => '_bx_payment_err_not_accept_payments',
-        		'ERR_SELF_PURCHASE' => '_bx_payment_err_self_purchase',
-        		'ERR_INACTIVE_VENDOR' => '_bx_payment_err_inactive_vendor',
-        		'ERR_UNKNOWN_VENDOR' => '_bx_payment_err_unknown_vendor',
+            // some language keys
+            'T' => array(
+                'MSG_ITEM_ADDED' => '_bx_payment_msg_item_added',
+                'MSG_ITEM_DELETED' => '_bx_payment_msg_item_deleted',
+                'ERR_WRONG_DATA' => '_bx_payment_err_wrong_data',
+                'ERR_REQUIRED_LOGIN' => '_bx_payment_err_required_login',
+                'ERR_NOT_ACCEPT_PAYMENTS' => '_bx_payment_err_not_accept_payments',
+                'ERR_SELF_PURCHASE' => '_bx_payment_err_self_purchase',
+                'ERR_INACTIVE_VENDOR' => '_bx_payment_err_inactive_vendor',
+                'ERR_UNKNOWN_VENDOR' => '_bx_payment_err_unknown_vendor',
 
-				'BLOCK_TITLE_CART' => '_bx_payment_page_block_title_cart',
+                'BLOCK_TITLE_CART' => '_bx_payment_page_block_title_cart',
 
-        		'POPUP_PROVIDERS_SELECT' => '_bx_payment_popup_title_crd_providers_select', 
+                'POPUP_PROVIDERS_SELECT' => '_bx_payment_popup_title_crd_providers_select', 
 
-        		'TXT_CART_PROVIDER' => '_bx_payment_txt_cart_'
-        	)
+                'TXT_CART_PROVIDER' => '_bx_payment_txt_cart_'
+            )
         ));
 
         $this->_aHtmlIds = array(
-        	'cart' => array(
-        		'providers_select' => $this->_sName . '-cart-providers-select-',
-        	),
-        	'history' => array(
-        		'order_history_view' => $this->_sName . '-order-view-history',
-        	),
-        	'subscription' => array(
-        		'order_subscription_view' => $this->_sName . '-order-view-subscription',
-        		'order_subscription_get_details' => $this->_sName . '-order-get-details-subscription',
-        	    'order_subscription_change_details' => $this->_sName . '-order-change-details-subscription',
-        		'order_subscription_get_billing' => $this->_sName . '-order-get-billing-subscription',
-        		'order_subscription_change_billing' => $this->_sName . '-order-change-billing-subscription',
-        		'form_subscription_change_billing' => $this->_sName . '-form-change-billing-subscription',
-        	    'form_subscription_change_details' => $this->_sName . '-form-change-details-subscription',
-        	),
-        	'pending' => array(
-        		'order_pending_view' => $this->_sName . '-order-view-pending',
-        		'order_pending_process' => $this->_sName . '-order-process',
-        	),
-        	'processed' => array(
-        		'order_processed_view' => $this->_sName . '-order-view-processed',
-        		'order_processed_add' => $this->_sName . '-order-add',
-        		'order_processed_client_id' => $this->_sName . '-oa-client-id',
-        		'order_processed_client' => $this->_sName . '-oa-client',
-        		'order_processed_items' => $this->_sName . '-oa-items',	
-        	),
+            'cart' => array(
+                'providers_select' => $this->_sName . '-cart-providers-select-',
+            ),
+            'history' => array(
+                'order_history_view' => $this->_sName . '-order-view-history',
+            ),
+            'subscription' => array(
+                'order_subscription_view' => $this->_sName . '-order-view-subscription',
+                'order_subscription_get_details' => $this->_sName . '-order-get-details-subscription',
+                'order_subscription_change_details' => $this->_sName . '-order-change-details-subscription',
+                'order_subscription_get_billing' => $this->_sName . '-order-get-billing-subscription',
+                'order_subscription_change_billing' => $this->_sName . '-order-change-billing-subscription',
+                'form_subscription_change_billing' => $this->_sName . '-form-change-billing-subscription',
+                'form_subscription_change_details' => $this->_sName . '-form-change-details-subscription',
+            ),
+            'pending' => array(
+                'order_pending_view' => $this->_sName . '-order-view-pending',
+                'order_pending_process' => $this->_sName . '-order-process',
+            ),
+            'processed' => array(
+                'order_processed_view' => $this->_sName . '-order-view-processed',
+                'order_processed_add' => $this->_sName . '-order-add',
+                'order_processed_client_id' => $this->_sName . '-oa-client-id',
+                'order_processed_client' => $this->_sName . '-oa-client',
+                'order_processed_items' => $this->_sName . '-oa-items',	
+            ),
         );
 
         $this->_aPerPage = array(
-        	'orders' => 10,
-        	'history' => 10
+            'orders' => 10,
+            'history' => 10
         );
         $this->_aHandlers = array();
 
         $this->_aJsClasses = array(
-        	'cart' => 'BxPaymentCart',
-        	'history' => 'BxPaymentOrders',
-        	'subscription' => 'BxPaymentSubscriptions',
-        	'pending' => 'BxPaymentOrders',
-        	'processed' => 'BxPaymentOrders',
-        	'chargebee_v3' => 'BxPaymentProviderChargebeeV3',
-        	'stripe' => 'BxPaymentProviderStripe'
+            'cart' => 'BxPaymentCart',
+            'history' => 'BxPaymentOrders',
+            'subscription' => 'BxPaymentSubscriptions',
+            'pending' => 'BxPaymentOrders',
+            'processed' => 'BxPaymentOrders',
+            'chargebee_v3' => 'BxPaymentProviderChargebeeV3',
+            'stripe' => 'BxPaymentProviderStripe'
         );
 
         $this->_aJsObjects = array(
-        	'cart' => 'oPaymentCart',
-        	'history' => 'oPaymentOrders',
-        	'subscription' => 'oBxPaymentSubscriptions',
-        	'pending' => 'oPaymentOrders',
-        	'processed' => 'oPaymentOrders',
-        	'chargebee_v3' => 'oPaymentProviderChargebeeV3',
-        	'stripe' => 'oPaymentProviderStripe'
+            'cart' => 'oPaymentCart',
+            'history' => 'oPaymentOrders',
+            'subscription' => 'oBxPaymentSubscriptions',
+            'pending' => 'oPaymentOrders',
+            'processed' => 'oPaymentOrders',
+            'chargebee_v3' => 'oPaymentProviderChargebeeV3',
+            'stripe' => 'oPaymentProviderStripe'
         );
     }
 
@@ -119,52 +119,52 @@ class BxPaymentConfig extends BxBaseModPaymentConfig
         $sPrefix = $this->getPrefix('options');
 
         $aCurrencies = BxDolForm::getDataItems($this->CNF['OBJECT_FORM_PRELISTS_CURRENCIES'], false, BX_DATA_VALUES_ADDITIONAL);
-        $this->_sCurrencyCode = $this->_oDb->getParam($sPrefix . 'default_currency_code');
-        $this->_sCurrencySign = $aCurrencies[$this->_sCurrencyCode];
+        $this->_sCurrencyCode = (string)$this->_oDb->getParam($sPrefix . 'default_currency_code');
+        $this->_sCurrencySign = !empty($this->_sCurrencyCode) && isset($aCurrencies[$this->_sCurrencyCode]) ? $aCurrencies[$this->_sCurrencyCode] : '';
     }
 
     public function getPrice($sType, $aItem)
     {
     	$fPrice = 0;
 
-		switch($sType) {
-			case BX_PAYMENT_TYPE_SINGLE:
-				$fPrice = $aItem[$this->getKey('KEY_ARRAY_PRICE_SINGLE')];
-				break;
+        switch($sType) {
+            case BX_PAYMENT_TYPE_SINGLE:
+                $fPrice = $aItem[$this->getKey('KEY_ARRAY_PRICE_SINGLE')];
+                break;
 
-			case BX_PAYMENT_TYPE_RECURRING:
-				$fPrice = $aItem[$this->getKey('KEY_ARRAY_PRICE_RECURRING')];
-				break;
-		}
+            case BX_PAYMENT_TYPE_RECURRING:
+                $fPrice = $aItem[$this->getKey('KEY_ARRAY_PRICE_RECURRING')];
+                break;
+        }
 
-		return (float)$fPrice;
+        return (float)$fPrice;
     }
 
     public function getTrial($sType, $aItem)
     {
         $iTrial = 0;
 
-		switch($sType) {
-			case BX_PAYMENT_TYPE_RECURRING:
-				$iTrial = $aItem[$this->getKey('KEY_ARRAY_TRIAL_RECURRING')];
-				break;
-		}
+        switch($sType) {
+            case BX_PAYMENT_TYPE_RECURRING:
+                $iTrial = $aItem[$this->getKey('KEY_ARRAY_TRIAL_RECURRING')];
+                break;
+        }
 
-		return (int)$iTrial;
+        return (int)$iTrial;
     }
 
     public function getModuleId($mixedId)
     {
-    	if(is_numeric($mixedId))
-    		return (int)$mixedId;
+        if(is_numeric($mixedId))
+            return (int)$mixedId;
 
-		if(is_string($mixedId)) {
+        if(is_string($mixedId)) {
             $aInfo = $this->_oDb->getModuleByName($mixedId);
             if(!is_array($aInfo) || empty($aInfo['id']))
-            	$aInfo = $this->_oDb->getModuleByUri($mixedId);
+                $aInfo = $this->_oDb->getModuleByUri($mixedId);
 
             if(is_array($aInfo) && !empty($aInfo['id']))
-            	return (int)$aInfo['id'];
+                return (int)$aInfo['id'];
         } 
 
         return 0;
@@ -175,7 +175,7 @@ class BxPaymentConfig extends BxBaseModPaymentConfig
     	return implode($this->getDivider('DIVIDER_DESCRIPTOR'), $a);
     }
 
-	public function descriptorS2A($s) 
+    public function descriptorS2A($s) 
     {
     	return explode($this->getDivider('DIVIDER_DESCRIPTOR'), $s);
     }