Sfoglia il codice sorgente

Ticket #4175 - Ads: Auction mode issue and improvements: Core changes.

AntonLV 3 anni fa
parent
commit
f0c442ed99

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

@@ -140,7 +140,7 @@ class BxBaseModPaymentGridOrders extends BxTemplGrid
         if(empty($aRow['module_id']) || empty($aRow['item_id']))
             return parent::_getCellDefault($sTxtUnknown, $sKey, $aField, $aRow);
 
-        $aItemInfo = $this->_oModule->callGetCartItem((int)$aRow['module_id'], array((int)$aRow['item_id']));
+        $aItemInfo = $this->_oModule->callGetCartItem((int)$aRow['module_id'], array((int)$aRow['item_id'], $aRow['client_id']));
         if(empty($aItemInfo) || !is_array($aItemInfo))
             return parent::_getCellDefault($sTxtUnknown, $sKey, $aField, $aRow);
 

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

@@ -306,10 +306,10 @@ class BxPaymentCart extends BxBaseModPaymentCart
         $fItemsPrice = 0;
         $aItemsInfo = array();
         foreach($aItems as $aItem) {
-            $aCustom = isset($aItem['custom']) ? $aItem['custom'] : array();
+            $aCustom = isset($aItem['custom']) ? $aItem['custom'] : array(123);
 
             //--- Get item main info
-            $aItemInfo = $this->_oModule->callGetCartItem((int)$aItem['module_id'], array($aItem['item_id'], $aCustom));
+            $aItemInfo = $this->_oModule->callGetCartItem((int)$aItem['module_id'], array($aItem['item_id'], $iClientId, $aCustom));
             if(empty($aItemInfo) || !is_array($aItemInfo)) {
                 if($bTypeSingle) {
                     $sCartItems = $this->_oModule->_oDb->getCartItems($iClientId);
@@ -333,7 +333,7 @@ class BxPaymentCart extends BxBaseModPaymentCart
                         continue;
                     }
 
-                    $aAddonInfo = $this->_oModule->callGetCartItem((int)$aItem['module_id'], array($sAddon, $aCustom));
+                    $aAddonInfo = $this->_oModule->callGetCartItem((int)$aItem['module_id'], array($sAddon, $iClientId, $aCustom));
                     if(empty($aAddonInfo) || !is_array($aAddonInfo))
                         continue;
 

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

@@ -1194,7 +1194,7 @@ class BxPaymentModule extends BxBaseModPaymentModule
     {
         $iUserId = (int)$this->getProfileId();
 
-        $aItemInfo = $this->callGetCartItem((int)$aItem['module_id'], array($aItem['item_id'], isset($aItem['custom']) ? $aItem['custom'] : array()));
+        $aItemInfo = $this->callGetCartItem((int)$aItem['module_id'], array($aItem['item_id'], $iUserId, isset($aItem['custom']) ? $aItem['custom'] : array()));
         if(empty($aItemInfo))
             return false;
 
@@ -1214,7 +1214,7 @@ class BxPaymentModule extends BxBaseModPaymentModule
         if(!$iUserId)
             return false;
 
-        $aItemInfo = $this->callGetCartItem((int)$aItem['module_id'], array($aItem['item_id']));
+        $aItemInfo = $this->callGetCartItem((int)$aItem['module_id'], array($aItem['item_id'], $iUserId));
         if(empty($aItemInfo))
             return false;
 

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

@@ -214,7 +214,7 @@ class BxPaymentProviderStripeBasic extends BxBaseModPaymentProvider
             $aPending = $this->_oModule->_oDb->getOrderPending(array('type' => 'id', 'id' => $iPendingId));
             list($iVendorId, $iModuleId, $iItemId, $iItemCount) = $this->_oModule->_oConfig->descriptorS2A($aPending['items']);
 
-            $aItem = $this->_oModule->callGetCartItem($iModuleId, array($oForm->getCleanValue('item_id')));
+            $aItem = $this->_oModule->callGetCartItem($iModuleId, array($oForm->getCleanValue('item_id'), $aPending['client_id']));
     		if(empty($aItem) || !is_array($aItem))
     			return $aResultError;
 

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

@@ -347,7 +347,7 @@ class BxPaymentTemplate extends BxBaseModPaymentTemplate
             $aItems = $this->_oConfig->descriptorsM2A($this->_oConfig->descriptorA2S(array($aOrder['seller_id'], $aOrder['module_id'], $aOrder['item_id'], $aOrder['item_count'])));
 
         foreach($aItems as $aItem) {
-            $aInfo = $oModule->callGetCartItem((int)$aItem['module_id'], array($aItem['item_id']));
+            $aInfo = $oModule->callGetCartItem((int)$aItem['module_id'], array($aItem['item_id'], $aOrder['client_id']));
             if(!empty($aInfo) && is_array($aInfo))
 	            $aResult['bx_repeat:items'][] = array(
 	                'bx_if:link' => array(