may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Popravek preusmeritve po paypal nakupu za angleski jezik

Browse Source
This commit is contained in:
pero1203 2020-10-29 07:40:48 +01:00
parent f460da4a71
commit 96bf296f5b
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/payments/classes/class.UserNarocilaPaypal.php
View File

@ -124,6 +124,7 @@ class UserNarocilaPaypal{
// Posljemo podatke za placilo paypalu // Posljemo podatke za placilo paypalu
private function paypalCreateOrder($orderDetails){ private function paypalCreateOrder($orderDetails){
global $site_url; global $site_url;
global $lang;
$response = array(); $response = array();
@ -132,6 +133,15 @@ class UserNarocilaPaypal{
$request->prefer('return=representation'); $request->prefer('return=representation');
//$request->headers["prefer"] = "return=representation"; //$request->headers["prefer"] = "return=representation";
if($lang['id'] == '2'){
$drupal_url_confirm = $site_url.'/d/en/paypal-purchase/success?narocilo_id='.$orderDetails['narocilo_id'];
$drupal_url_cancel = $site_url.'/d/en/paypal-purchase/cancel?narocilo_id='.$orderDetails['narocilo_id'];
}
else{
$drupal_url_confirm = $site_url.'/d/narocilo/paypal?narocilo_id='.$orderDetails['narocilo_id'];
$drupal_url_cancel = $site_url.'/d/narocilo/paypal-cancel?narocilo_id='.$orderDetails['narocilo_id'];
}
$request->body = [ $request->body = [
"intent" => "CAPTURE", "intent" => "CAPTURE",
"purchase_units" => [[ "purchase_units" => [[
@ -144,8 +154,8 @@ class UserNarocilaPaypal{
] ]
]], ]],
"application_context" => [ "application_context" => [
"cancel_url" => $site_url . '/d/narocilo/paypal-cancel?narocilo_id='.$orderDetails['narocilo_id'], "cancel_url" => $drupal_url_cancel,
"return_url" => $site_url . '/d/narocilo/paypal?narocilo_id='.$orderDetails['narocilo_id'], "return_url" => $drupal_url_confirm,
'brand_name' => '1KA' 'brand_name' => '1KA'
] ]

2
function.php
View File

@ -413,7 +413,7 @@ function login()
else { else {
$r = mysqli_fetch_row($result); $r = mysqli_fetch_row($result);
if ($cookie_pass == base64_encode((hash(SHA256, base64_decode($r[0]) . $pass_salt)))) { if ($cookie_pass == base64_encode((hash('SHA256', base64_decode($r[0]) . $pass_salt)))) {
$is_meta = 1; $is_meta = 1;
$admin_type = "0"; $admin_type = "0";