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

+ 3 - 0
inc/classes/BxDolPayments.php

@@ -242,6 +242,9 @@ class BxDolPayments extends BxDol implements iBxDolSingleton
 		return BxDolService::call($this->_sActive, 'initialize_checkout', $aSrvParams);
     }
 
+    /**
+     * Isn't used anywhere for now. Is needed when license 'prolong' is requested from license keeping module like Market and ACL.  
+     */
 	public function prolongSubscription($sOrderId)
     {
     	if(!BxDolRequest::serviceExists($this->_sActive, 'prolong_subscription'))

+ 1 - 1
modules/base/payment/classes/BxBaseModPaymentModule.php

@@ -89,7 +89,7 @@ class BxBaseModPaymentModule extends BxDolModule
         $oAccount = $oProfile->getAccountObject();
 
         return array(
-        	'id' => $iUserId,
+        	'id' => $oProfile->id(),
             'name' => $oProfile->getDisplayName(),
         	'email' => $oAccount->getEmail(),
             'link' => $oProfile->getUrl(),

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

@@ -430,12 +430,12 @@ class BxPaymentModule extends BxBaseModPaymentModule
     	if(empty($aPending) || !is_array($aPending))
     		return false;
 
-		if((int)$aPending['processed'] == 1)
-			return true;
-
 		$sType = $aPending['type'];
 		$bTypeSingle = $sType == BX_PAYMENT_TYPE_SINGLE;
 
+		if($bTypeSingle && (int)$aPending['processed'] == 1)
+			return true;
+
 		$iClientId = (int)$aPending['client_id'];
 		$sLicense = $this->_oConfig->getLicense();
 

+ 2 - 2
modules/boonex/payment/classes/BxPaymentProviderStripe.php

@@ -357,7 +357,7 @@ class BxPaymentProviderStripe extends BxBaseModPaymentProvider implements iBxBas
 		return $oSubscription;
 	}
 
-	public function _retrieveCoupon($sId) {
+	protected function _retrieveCoupon($sId) {
 		try {
 			$oCoupon = \Stripe\Coupon::retrieve($sId);
 		}
@@ -368,7 +368,7 @@ class BxPaymentProviderStripe extends BxBaseModPaymentProvider implements iBxBas
 		return $oCoupon;
 	}
 
-	public function _retrieveEvent($sId) {
+	protected function _retrieveEvent($sId) {
 		try {
 			$oEvent = \Stripe\Event::retrieve($sId);
 		}