Ticket #3399 - Related changes in Payments core and module.

modules/base/payment/classes/BxBaseModPaymentGridOrders.php

@@ -206,7 +206,7 @@ class BxBaseModPaymentGridOrders extends BxTemplGrid
             )
         );
 
-        $oForm = new BxTemplStudioFormView(array());
+        $oForm = new BxTemplFormView(array());
         return $oForm->genRow($aInput);
     }
 }

modules/boonex/payment/classes/BxPaymentFormCommissions.php

@@ -9,7 +9,7 @@
  * @{
  */
 
-class BxPaymentFormCommissions extends BxTemplStudioFormView
+class BxPaymentFormCommissions extends BxTemplFormView
 {
     protected $_sModule;
     protected $_oModule;

modules/boonex/payment/classes/BxPaymentFormView.php

@@ -9,7 +9,7 @@
  * @{
  */
 
-class BxPaymentFormView extends BxTemplStudioFormView
+class BxPaymentFormView extends BxTemplFormView
 {
     function __construct($aInfo, $oTemplate = false)
     {

modules/boonex/payment/classes/BxPaymentGridCommissions.php

@@ -51,7 +51,7 @@ class BxPaymentGridCommissions extends BxBaseModPaymentGridCommissions
         $sId = $this->_oModule->_oConfig->getHtmlIds('commission', 'popup_' . $sAction);
         $sTitle = _t($this->_sLangsPrefix . 'popup_title_cms_' . $sAction);
 
-        $sContent = BxTemplStudioFunctions::getInstance()->popupBox($sId, $sTitle, $this->_oModule->_oTemplate->parseHtmlByName('commission_form.html', array(
+        $sContent = BxTemplFunctions::getInstance()->popupBox($sId, $sTitle, $this->_oModule->_oTemplate->parseHtmlByName('commission_form.html', array(
             'form_id' => $oForm->aFormAttrs['id'],
             'form' => $oForm->getCode(true),
             'object' => $this->_sObject,
@@ -95,7 +95,7 @@ class BxPaymentGridCommissions extends BxBaseModPaymentGridCommissions
         $sId = $this->_oModule->_oConfig->getHtmlIds('commission', 'popup_' . $sAction);
         $sTitle = _t($this->_sLangsPrefix . 'popup_title_cms_' . $sAction);
 
-        $sContent = BxTemplStudioFunctions::getInstance()->popupBox($sId, $sTitle, $this->_oModule->_oTemplate->parseHtmlByName('commission_form.html', array(
+        $sContent = BxTemplFunctions::getInstance()->popupBox($sId, $sTitle, $this->_oModule->_oTemplate->parseHtmlByName('commission_form.html', array(
             'form_id' => $oForm->aFormAttrs['id'],
             'form' => $oForm->getCode(true),
             'object' => $this->_sObject,

modules/boonex/payment/classes/BxPaymentGridInvoices.php

@@ -52,7 +52,7 @@ class BxPaymentGridInvoices extends BxBaseModPaymentGridInvoices
         $sId = $this->_oModule->_oConfig->getHtmlIds('invoice', 'popup_' . $sAction);
         $sTitle = _t($this->_sLangsPrefix . 'popup_title_cms_' . $sAction);
 
-        $sContent = BxTemplStudioFunctions::getInstance()->popupBox($sId, $sTitle, $this->_oModule->_oTemplate->parseHtmlByName('commission_form.html', array(
+        $sContent = BxTemplFunctions::getInstance()->popupBox($sId, $sTitle, $this->_oModule->_oTemplate->parseHtmlByName('commission_form.html', array(
             'form_id' => $oForm->aFormAttrs['id'],
             'form' => $oForm->getCode(true),
             'object' => $this->_sObject,

modules/boonex/payment/classes/BxPaymentGridPending.php

@@ -21,7 +21,7 @@ class BxPaymentGridPending extends BxBaseModPaymentGridOrders
         $this->_sOrdersType = 'pending';
     }
 
-	public function performActionProcess()
+    public function performActionProcess()
     {
     	$aIds = bx_get('ids');
         if(!$aIds || !is_array($aIds)) {
@@ -46,13 +46,13 @@ class BxPaymentGridPending extends BxBaseModPaymentGridOrders
 
         $oForm->initChecker();
         if($oForm->isSubmittedAndValid()) {
-        	$iId = $oForm->getCleanValue('id');
+            $iId = $oForm->getCleanValue('id');
 
-			$this->_oModule->_oDb->updateOrderPending($iId, array(
-				'order' => $oForm->getCleanValue('order'),
-				'error_code' => 0,
-				'error_msg' => 'Manually processed'
-			));
+            $this->_oModule->_oDb->updateOrderPending($iId, array(
+                'order' => $oForm->getCleanValue('order'),
+                'error_code' => 0,
+                'error_msg' => 'Manually processed'
+            ));
 
             if($this->_oModule->registerPayment($iId))
                 $aRes = array('grid' => $this->getCode(false), 'blink' => $iId);
@@ -66,22 +66,22 @@ class BxPaymentGridPending extends BxBaseModPaymentGridOrders
         $sId = $this->_oModule->_oConfig->getHtmlIds('pending', $sKey);
     	$sTitle = _t($this->_sLangsPrefix . 'popup_title_ods_' . $sKey);
 
-		$sContent = BxTemplStudioFunctions::getInstance()->popupBox($sId, $sTitle, $this->_oModule->_oTemplate->parseHtmlByName('order_pending_process.html', array(
-			'form_id' => $oForm->aFormAttrs['id'],
-			'form' => $oForm->getCode(true),
-			'object' => $this->_sObject,
-			'action' => $sAction
-		)));
+        $sContent = BxTemplFunctions::getInstance()->popupBox($sId, $sTitle, $this->_oModule->_oTemplate->parseHtmlByName('order_pending_process.html', array(
+            'form_id' => $oForm->aFormAttrs['id'],
+            'form' => $oForm->getCode(true),
+            'object' => $this->_sObject,
+            'action' => $sAction
+        )));
 
-		echoJson(array('popup' => array('html' => $sContent, 'options' => array('closeOnOuterClick' => false))));
+        echoJson(array('popup' => array('html' => $sContent, 'options' => array('closeOnOuterClick' => false))));
     }
 
-	protected function _getDataSql($sFilter, $sOrderField, $sOrderDir, $iStart, $iPerPage)
+    protected function _getDataSql($sFilter, $sOrderField, $sOrderDir, $iStart, $iPerPage)
     {
     	if(empty($this->_aQueryAppend['seller_id']))
-    		return array();
+            return array();
 
-		$this->_aOptions['source'] .= $this->_oModule->_oDb->prepareAsString(" AND `tt`.`seller_id`=?", $this->_aQueryAppend['seller_id']);
+        $this->_aOptions['source'] .= $this->_oModule->_oDb->prepareAsString(" AND `tt`.`seller_id`=?", $this->_aQueryAppend['seller_id']);
 
         return parent::_getDataSql($sFilter, $sOrderField, $sOrderDir, $iStart, $iPerPage);
     }

modules/boonex/payment/classes/BxPaymentGridProcessed.php

@@ -116,7 +116,7 @@ class BxPaymentGridProcessed extends BxBaseModPaymentGridOrders
         $sId = $this->_oModule->_oConfig->getHtmlIds('processed', $sKey);
         $sTitle = _t($this->_sLangsPrefix . 'popup_title_ods_' . $sKey);
 
-        $sContent = BxTemplStudioFunctions::getInstance()->popupBox($sId, $sTitle, $this->_oModule->_oTemplate->parseHtmlByName('order_processed_add.html', array(
+        $sContent = BxTemplFunctions::getInstance()->popupBox($sId, $sTitle, $this->_oModule->_oTemplate->parseHtmlByName('order_processed_add.html', array(
             'js_object' => $sJsObject,
             'form_id' => $oForm->aFormAttrs['id'],
             'form' => $oForm->getCode(true),

modules/boonex/payment/classes/BxPaymentProviderRecurly.php

@@ -9,6 +9,8 @@
  * @{
  */
 
+require_once(BX_DIRECTORY_PATH_PLUGINS . 'recurly/recurly.php');
+
 define('RCRL_MODE_LIVE', 1);
 define('RCRL_MODE_TEST', 2);
 
@@ -165,23 +167,23 @@ class BxPaymentProviderRecurly extends BxBaseModPaymentProvider implements iBxBa
         
         $sId = 'bx-payment-rcrl-card-add';
     	$sTitle = _t($this->_sLangsPrefix . 'popup_title_rcrl_card_add');
-		$sContent = BxTemplStudioFunctions::getInstance()->popupBox($sId, $sTitle, $this->_oModule->_oTemplate->parseHtmlByName('rcrl_card_popup_add.html', array(
-			'public_key' => $this->getOption('api_key_public'),
-			'font_family' => $aTmplConfig['bx-font-family'],
-			'font_size' => $aTmplConfig['bx-font-size-default'],
-			'font_color' => $aTmplConfig['bx-font-color-default'],
-			'form_id' => $oForm->aFormAttrs['id'],
-			'form' => $oForm->getCode(true),
-		)));
-
-		return array('popup' => array(
-			'html' => $sContent, 
-			'options' => array(
-				'closeOnOuterClick' => false, 
-				'onBeforeShow' => 'bxRecurlyFieldsInit();', 
-				'onHide' => 'bxRecurlyFieldsDestroy();'
-			)
-		));
+        $sContent = BxTemplFunctions::getInstance()->popupBox($sId, $sTitle, $this->_oModule->_oTemplate->parseHtmlByName('rcrl_card_popup_add.html', array(
+            'public_key' => $this->getOption('api_key_public'),
+            'font_family' => $aTmplConfig['bx-font-family'],
+            'font_size' => $aTmplConfig['bx-font-size-default'],
+            'font_color' => $aTmplConfig['bx-font-color-default'],
+            'form_id' => $oForm->aFormAttrs['id'],
+            'form' => $oForm->getCode(true),
+        )));
+
+        return array('popup' => array(
+            'html' => $sContent, 
+            'options' => array(
+                'closeOnOuterClick' => false, 
+                'onBeforeShow' => 'bxRecurlyFieldsInit();', 
+                'onHide' => 'bxRecurlyFieldsDestroy();'
+            )
+        ));
     }
 
 	public function createSubscription($sToken, $sItem, $aClient)

modules/boonex/payment/classes/BxPaymentSubscriptions.php

@@ -242,7 +242,7 @@ class BxPaymentSubscriptions extends BxBaseModPaymentSubscriptions
             $sId = $this->_oModule->_oConfig->getHtmlIds('cart', 'providers_select') . BX_PAYMENT_TYPE_RECURRING;
             $sTitle = _t($CNF['T']['POPUP_PROVIDERS_SELECT']);
             return array('popup' => array(
-                'html' => BxTemplStudioFunctions::getInstance()->popupBox($sId, $sTitle, $this->_oModule->_oTemplate->displayProvidersSelector($aCartItem, $aSellerProviders, $sRedirect, $aCustom)), 
+                'html' => BxTemplFunctions::getInstance()->popupBox($sId, $sTitle, $this->_oModule->_oTemplate->displayProvidersSelector($aCartItem, $aSellerProviders, $sRedirect, $aCustom)), 
                 'options' => array('closeOnOuterClick' => true)
             ));
         }

modules/boonex/payment/classes/BxPaymentTemplate.php

@@ -389,11 +389,31 @@ class BxPaymentTemplate extends BxBaseModPaymentTemplate
     {
         $aTmplVarsItems = array();
 
+        $oForm = new BxTemplFormView(array());
+
         if(!empty($aItems) && is_array($aItems))
             foreach($aItems as $aItem) {
+                $fPrice = $this->_oConfig->getPrice($sType, $aItem);
+
+                $aInputHidden = array(
+                    'type' => 'hidden',
+                    'name' => 'item-price-' . $aItem['id'],
+                    'value' => $fPrice
+                );
+                $aInputCheckbox = array(
+                    'type' => 'checkbox',
+                    'name' => 'items[]',
+                    'value' => $aItem['id']
+                );
+                $aInputText = array(
+                    'type' => 'text',
+                    'name' => 'item-quantity-' . $aItem['id'],
+                    'value' => 1
+                );
+
                 $aTmplVarsItems[$aItem['title']] = array(
                     'id' => $aItem['id'],
-                    'price' => $this->_oConfig->getPrice($sType, $aItem),
+                    'price' => $fPrice,
                     'bx_if:link' => array(
                         'condition' => !empty($aItem['url']),
                         'content' => array(
@@ -407,6 +427,9 @@ class BxPaymentTemplate extends BxBaseModPaymentTemplate
                             'title' => $aItem['title']
                         )
                     ),
+                    'input_hidden' => $oForm->genRow($aInputHidden),
+                    'input_checkbox' => $oForm->genRow($aInputCheckbox),
+                    'input_text' => $oForm->genRow($aInputText),
                 );
             }
 
@@ -415,11 +438,11 @@ class BxPaymentTemplate extends BxBaseModPaymentTemplate
             $aTmplVarsItems = array_values($aTmplVarsItems);
         }
         else 
-        	$aTmplVarsItems = MsgBox(_t($this->_sLangsPrefix . 'msg_no_results'));
+            $aTmplVarsItems = MsgBox(_t($this->_sLangsPrefix . 'msg_no_results'));
 
         return $this->parseHtmlByName('items.html', array(
-        	'html_id' => $this->_oConfig->getHtmlIds('processed', 'order_processed_items'),
-        	'bx_repeat:items' => $aTmplVarsItems
+            'html_id' => $this->_oConfig->getHtmlIds('processed', 'order_processed_items'),
+            'bx_repeat:items' => $aTmplVarsItems
         ));
     }
 

modules/boonex/payment/template/items.html

@@ -1,23 +1,17 @@
 <div id="__html_id__" class="bx-payment-pa-items">
-	<div class="bx-payment-pa-items-cnt">
-		<bx_repeat:items>
-		    <div class="bx-payment-pa-item bx-def-margin-thd-top-auto bx-clearfix">
-		        <div class="bx-payment-pa-item-chb">
-		            <input type="checkbox" name="items[]" value="__id__" />
-		            <input type="hidden" name="item-price-__id__" value="__price__" />
-		        </div><div class="bx-payment-pa-item-title">
-		        	<div class="bx-payment-pa-item-title-cnt bx-def-padding-sec-leftright">
-			            <bx_if:link>
-			                <a href="__url__" target="_blank" title="__title__">__title__</a>
-			            </bx_if:link>
-			            <bx_if:text>__title__</bx_if:text>
-					</div>
-		        </div><div class="bx-payment-pa-item-quantity">
-		        	<div class="bx-form-input-wrapper bx-form-input-wrapper-text">
-	                    <input type="text" class="bx-def-font-inputs bx-form-input-text" name="item-quantity-__id__" value="1" />
-	                </div>
-		        </div>
-		    </div>
-		</bx_repeat:items>
-	</div>
+    <div class="bx-payment-pa-items-cnt">
+        <bx_repeat:items>
+            <div class="bx-payment-pa-item bx-def-margin-thd-top-auto bx-clearfix">
+                <div class="bx-payment-pa-item-chb">__input_hidden____input_checkbox__</div><div class="bx-payment-pa-item-title">
+                    <div class="bx-payment-pa-item-title-cnt bx-def-padding-sec-leftright">
+                        <bx_if:link>
+                            <a href="__url__" target="_blank" title="__title__">__title__</a>
+                        </bx_if:link>
+                        <bx_if:text>__title__</bx_if:text>
+                    </div>
+                </div><div class="bx-payment-pa-item-quantity">__input_text__</div>
+                </div>
+            </div>
+        </bx_repeat:items>
+    </div>
 </div>