Ticket #643

cart.php

@@ -14,7 +14,11 @@ bx_import('BxDolLanguages');
 
 check_logged();
 
-$sUrl = BxDolPayments::getInstance()->getCartUrl();
+$iSellerId = 0;
+if(bx_get('seller_id') !== false)
+    $iSellerId = (int)bx_get('seller_id');
+
+$sUrl = BxDolPayments::getInstance()->getCartUrl($iSellerId);
 if(empty($sUrl))
 	BxDolTemplate::getInstance()->displayPageNotFound();
 

modules/boonex/english/data/langs/system/en.xml

@@ -1991,7 +1991,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_menu_item_title_account_settings_info"><![CDATA[Account]]></string>
 	<string name="_sys_menu_item_title_account_settings_pwd"><![CDATA[Password]]></string>
 	<string name="_sys_menu_item_title_add_content"><![CDATA[Add...]]></string>
-	<string name="_sys_menu_item_title_cart"><![CDATA[Cart]]></string>
+	<string name="_sys_menu_item_title_cart"><![CDATA[Shopping Cart]]></string>
 	<string name="_sys_menu_item_title_cmts_item_delete"><![CDATA[Delete]]></string>
 	<string name="_sys_menu_item_title_cmts_item_edit"><![CDATA[Edit]]></string>
 	<string name="_sys_menu_item_title_cmts_item_reply"><![CDATA[Reply]]></string>
@@ -2023,7 +2023,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_menu_item_title_system_account_settings_info"><![CDATA[Account]]></string>
 	<string name="_sys_menu_item_title_system_account_settings_pwd"><![CDATA[Password]]></string>
 	<string name="_sys_menu_item_title_system_add_content"><![CDATA[Add Content]]></string>
-	<string name="_sys_menu_item_title_system_cart"><![CDATA[Cart]]></string>
+	<string name="_sys_menu_item_title_system_cart"><![CDATA[Shopping Cart]]></string>
 	<string name="_sys_menu_item_title_system_cmts_item_delete"><![CDATA[Delete]]></string>
 	<string name="_sys_menu_item_title_system_cmts_item_edit"><![CDATA[Edit]]></string>
 	<string name="_sys_menu_item_title_system_cmts_item_reply"><![CDATA[Reply]]></string>

modules/boonex/market/classes/BxMarketMenuView.php

@@ -47,7 +47,7 @@ class BxMarketMenuView extends BxBaseModTextMenuView
 				if((float)$this->_aContentInfo[$CNF['FIELD_PRICE_SINGLE']] == 0) 
 					break;
 
-				$aJs = $oPayment->getAddToCartJs($this->_aContentInfo['author'], $this->MODULE, $this->_aContentInfo['id'], 1);
+				$aJs = $oPayment->getAddToCartJs($this->_aContentInfo['author'], $this->MODULE, $this->_aContentInfo['id'], 1, true);
 				if(empty($aJs) || !is_array($aJs))
 					break;
 

modules/boonex/market/classes/BxMarketTemplate.php

@@ -248,7 +248,7 @@ class BxMarketTemplate extends BxBaseModTextTemplate
     	$bTmplVarsSingle = (float)$aData[$CNF['FIELD_PRICE_SINGLE']] != 0;
     	$aTmplVarsSingle = array();
     	if($bTmplVarsSingle) {
-    		$aJsSingle = $oPayment->getAddToCartJs($aData[$CNF['FIELD_AUTHOR']], $this->_oConfig->getName(), $aData[$CNF['FIELD_ID']], 1);
+    		$aJsSingle = $oPayment->getAddToCartJs($aData[$CNF['FIELD_AUTHOR']], $this->_oConfig->getName(), $aData[$CNF['FIELD_ID']], 1, true);
     		if(!empty($aJsSingle) && is_array($aJsSingle)) {
     			list($sJsCode, $sSingleOnclick) = $aJsSingle;
     			

modules/boonex/payment/classes/BxPaymentProviderPayPal.php

@@ -138,6 +138,9 @@ class BxPaymentProviderPayPal extends BxBaseModPaymentProvider implements iBxBas
         $aPending = array();
         $aResult = $this->_validateCheckout($aData, $aPending);
 
+        if(empty($aPending) || !is_array($aPending))
+            return $aResult;
+
         if(!empty($aPending['order']) || !empty($aPending['error_code']) || !empty($aPending['error_msg']) || (int)$aPending['processed'] != 0)
             return array('code' => 11, 'message' => $this->_sLangsPrefix . 'err_already_processed');
 
@@ -176,7 +179,7 @@ class BxPaymentProviderPayPal extends BxBaseModPaymentProvider implements iBxBas
 
             $sRequest = 'cmd=_notify-validate';
             foreach($aData as $sKey => $sValue) {
-                if(in_array($sKey, array('cmd')))
+                if(in_array($sKey, array('cmd', 'r')))
                     continue;
 
                 $sRequest .= '&' . urlencode($sKey) . '=' . urlencode(bx_process_pass($sValue));
@@ -241,6 +244,9 @@ class BxPaymentProviderPayPal extends BxBaseModPaymentProvider implements iBxBas
 
     protected function _readValidationData($sConnectionUrl, $sRequest)
     {
+        $this->log('Validation Request: ');
+        $this->log($sRequest);
+
 		$rConnect = curl_init('https://' . $sConnectionUrl . '/cgi-bin/webscr');
 		curl_setopt($rConnect, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
 		curl_setopt($rConnect, CURLOPT_POST, 1);
@@ -266,7 +272,12 @@ class BxPaymentProviderPayPal extends BxBaseModPaymentProvider implements iBxBas
 		}
 
 		curl_close($rConnect);
-		return array('code' => 0, 'content' => explode("\n", $sResponse));
+
+		$aResponse = explode("\n", $sResponse);
+
+		$this->log('Validation Response: ');
+        $this->log($aResponse);
+		return array('code' => 0, 'content' => $aResponse);
     }
 
     protected function _getReceivedAmount($sCurrencyCode, &$aResultData)

modules/boonex/payment/install/langs/en.xml

@@ -115,7 +115,7 @@
 	<string name="_bx_payment_grid_action_title_sbs_actions"><![CDATA[Actions]]></string>
 	<string name="_bx_payment_grid_action_title_sbs_view_order"><![CDATA[View]]></string>
 	<string name="_bx_payment_grid_action_title_crts_delete"><![CDATA[Delete]]></string>
-	<string name="_bx_payment_grid_action_title_crts_continue"><![CDATA[Continue]]></string>
+	<string name="_bx_payment_grid_action_title_crts_continue"><![CDATA[Continue to checkout]]></string>
 	<string name="_bx_payment_grid_action_title_crt_checkout"><![CDATA[Checkout with {0}]]></string>
 	<string name="_bx_payment_grid_action_title_crt_delete"><![CDATA[Delete]]></string>
 
@@ -177,10 +177,10 @@
 
 	<!-- EMAIL TEMPLATES -->
 	<string name="_bx_payment_et_txt_name_paid_need_join"><![CDATA[Paid and need to join.]]></string>
-	<string name="_bx_payment_et_txt_subject_paid_need_join"><![CDATA[Payment was accepted.]]></string>
+	<string name="_bx_payment_et_txt_subject_paid_need_join"><![CDATA[Payment was processed.]]></string>
 	<string name="_bx_payment_et_txt_body_paid_need_join"><![CDATA[{email_header}
 <p>Hello, {RealName}.</p>
-<p>Your payment was accepted. If you did not fill in the join form yet, then you may do it using the following link.</p>
+<p>Your payment was processed. If you did not fill in the join form yet, then you may do it using the following link.</p>
 <p><a href="{JoinLink}">Join Now</a></p>
 {email_footer}]]></string>
 
@@ -263,7 +263,7 @@
 	<string name="_bx_payment_pp_err_wrong_verification_status"><![CDATA[No verification status received.]]></string>
 	<string name="_bx_payment_pp_err_wrong_amount"><![CDATA[Wrong amount.]]></string>
 	<string name="_bx_payment_pp_err_wrong_custom_data"><![CDATA[Incorrect custom data.]]></string>
-	<string name="_bx_payment_pp_msg_verified"><![CDATA[Payment was successfully accepted.]]></string>
+	<string name="_bx_payment_pp_msg_verified"><![CDATA[Payment was successfully processed.]]></string>
 	<string name="_bx_payment_txt_name_paypal"><![CDATA[PayPal]]></string>
 	<string name="_bx_payment_txt_cart_paypal"><![CDATA[PayPal]]></string>
 
@@ -423,7 +423,7 @@
 	<string name="_bx_payment_strp_ssl_cpt"><![CDATA[Enable SSL]]></string>
 	<string name="_bx_payment_strp_ssl_dsc"><![CDATA[Enable SSL connection to communicate with Stripe. Note. URLs below will be updated after saving.]]></string>
 	<string name="_bx_payment_strp_notify_url_cpt"><![CDATA[Webhooks URL]]></string>
-	<string name="_bx_payment_strp_msg_charged"><![CDATA[Payment was successfully accepted.]]></string>
+	<string name="_bx_payment_strp_msg_charged"><![CDATA[Payment was successfully processed.]]></string>
 	<string name="_bx_payment_strp_msg_subscribed"><![CDATA[Thank you! Subscription created. Please, check your email for further instructions.]]></string>
 	<string name="_bx_payment_strp_msg_details_changed"><![CDATA[Subscription details were changed.]]></string>
     <string name="_bx_payment_strp_err_details_changed"><![CDATA[Cannot change subscription details. Recheck provided data and try again.]]></string>

modules/boonex/payment/js/cart.js

@@ -49,7 +49,7 @@ BxPaymentCart.prototype.addToCart = function(iSellerId, iModuleId, iItemId, iIte
                 */
 
             	if(iNeedRedirect == 1)
-            		window.location.href = sUrlRoot + 'cart.php';
+            		window.location.href = sUrlRoot + 'cart.php?seller_id=' + iSellerId;
             }
         },
         'json'

modules/boonex/russian/data/langs/bx_payment/ru.xml

@@ -115,7 +115,7 @@
 	<string name="_bx_payment_grid_action_title_sbs_actions"><![CDATA[Действия]]></string>
 	<string name="_bx_payment_grid_action_title_sbs_view_order"><![CDATA[Детали выплаты]]></string>
 	<string name="_bx_payment_grid_action_title_crts_delete"><![CDATA[Удалить]]></string>
-	<string name="_bx_payment_grid_action_title_crts_continue"><![CDATA[Продолжить]]></string>
+	<string name="_bx_payment_grid_action_title_crts_continue"><![CDATA[Продолжить оплату]]></string>
 	<string name="_bx_payment_grid_action_title_crt_checkout"><![CDATA[Оплатить через {0}]]></string>
 	<string name="_bx_payment_grid_action_title_crt_delete"><![CDATA[Удалить]]></string>