From 5642ba596c79c14620b923ad863d8c0a79800da4 Mon Sep 17 00:00:00 2001 From: Vaidas Lungis Date: Thu, 21 May 2015 10:35:08 +0300 Subject: [PATCH 1/4] sale_id parameter is not available in hosted checkout --- src/bb-library/Payment/Adapter/TwoCheckout.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/bb-library/Payment/Adapter/TwoCheckout.php b/src/bb-library/Payment/Adapter/TwoCheckout.php index 86ba826f7..139b4869c 100644 --- a/src/bb-library/Payment/Adapter/TwoCheckout.php +++ b/src/bb-library/Payment/Adapter/TwoCheckout.php @@ -122,13 +122,11 @@ class Payment_Adapter_TwoCheckout implements \Box\InjectionAwareInterface $api_admin->invoice_transaction_update(array('id' => $id, 'type' => 'ORDER CREATED')); $invoice_id = null; - if($tx['invoice_id']) { + if(isset($tx['invoice_id'])) { $invoice_id = $tx['invoice_id']; - } elseif($ipn['bb_invoice_id']) { + } elseif(isset($ipn['bb_invoice_id'])) { $invoice_id = $ipn['bb_invoice_id']; $api_admin->invoice_transaction_update(array('id'=>$id, 'invoice_id'=>$invoice_id)); - } elseif(!isset($ipn['bb_invoice_id']) && isset($ipn['sale_id'])) { - $invoice_id = R::getCell('SELECT invoice_id FROM transaction WHERE txn_id = :id AND invoice_id IS NOT NULL', array('id'=>$ipn['sale_id'])); } elseif(!isset($ipn['bb_invoice_id']) && isset($ipn['order_number'])) { $invoice_id = R::getCell('SELECT invoice_id FROM transaction WHERE txn_id = :id AND invoice_id IS NOT NULL', array('id'=>$ipn['order_number'])); } @@ -260,11 +258,6 @@ class Payment_Adapter_TwoCheckout implements \Box\InjectionAwareInterface } elseif(isset($ipn['order_number']) && isset($ipn['total']) && isset($ipn['key'])) { $md5_hash = $ipn["key"]; $check_key = strtoupper(md5($secret.$ipn['order_number'].$ipn["total"])); - - // The following code would be applicable to orders placed using our Plug and Play cart and our proprietary third party set of parameters. - } elseif(isset($ipn['invoice_id']) && isset($ipn['sale_id']) && $ipn["md5_hash"]) { - $md5_hash = $ipn["md5_hash"]; - $check_key = strtoupper(md5($ipn["sale_id"] . $vendorNumber . $ipn["invoice_id"] . $secret)); } error_log(sprintf('Returned MD5 Hash %s should be equal to %s', $md5_hash, $check_key)); From 89335eafdbf9030dd78fec3a288a56e36ffe6508 Mon Sep 17 00:00:00 2001 From: Vaidas Lungis Date: Thu, 21 May 2015 10:48:15 +0300 Subject: [PATCH 2/4] not needed conditional statement as previously is loaded transaction data. Moreover order_number as txn_id is set latter. --- src/bb-library/Payment/Adapter/TwoCheckout.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/bb-library/Payment/Adapter/TwoCheckout.php b/src/bb-library/Payment/Adapter/TwoCheckout.php index 139b4869c..99b98e51c 100644 --- a/src/bb-library/Payment/Adapter/TwoCheckout.php +++ b/src/bb-library/Payment/Adapter/TwoCheckout.php @@ -127,8 +127,6 @@ class Payment_Adapter_TwoCheckout implements \Box\InjectionAwareInterface } elseif(isset($ipn['bb_invoice_id'])) { $invoice_id = $ipn['bb_invoice_id']; $api_admin->invoice_transaction_update(array('id'=>$id, 'invoice_id'=>$invoice_id)); - } elseif(!isset($ipn['bb_invoice_id']) && isset($ipn['order_number'])) { - $invoice_id = R::getCell('SELECT invoice_id FROM transaction WHERE txn_id = :id AND invoice_id IS NOT NULL', array('id'=>$ipn['order_number'])); } if(!$invoice_id) { From 6e6da26742341ac7230ab23c724b45eaf5a0147d Mon Sep 17 00:00:00 2001 From: Vaidas Lungis Date: Thu, 21 May 2015 11:01:27 +0300 Subject: [PATCH 3/4] remove parameters from single payment which 2co is not accepting --- src/bb-library/Payment/Adapter/TwoCheckout.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/bb-library/Payment/Adapter/TwoCheckout.php b/src/bb-library/Payment/Adapter/TwoCheckout.php index 99b98e51c..99234e901 100644 --- a/src/bb-library/Payment/Adapter/TwoCheckout.php +++ b/src/bb-library/Payment/Adapter/TwoCheckout.php @@ -271,7 +271,6 @@ class Payment_Adapter_TwoCheckout implements \Box\InjectionAwareInterface $data['mode'] = '2CO'; foreach($invoice['lines'] as $i=>$item) { - $data['li_'.$i.'_id'] = $invoice['id']; $data['li_'.$i.'_type'] = 'product'; $data['li_'.$i.'_name'] = $item['title']; $data['li_'.$i.'_product_id'] = $item['id']; @@ -290,11 +289,8 @@ class Payment_Adapter_TwoCheckout implements \Box\InjectionAwareInterface $data['merchant_order_id'] = $invoice['id']; - $data['return_url'] = $this->config['redirect_url']; $data['x_receipt_link_url'] = $this->config['redirect_url']; - $data['fixed'] = 'Y'; - $data['skip_landing'] = 1; - + return $data; } From 4709323acc7e2611542e1aa28b1949de1e52a13a Mon Sep 17 00:00:00 2001 From: Vaidas Lungis Date: Thu, 21 May 2015 11:39:31 +0300 Subject: [PATCH 4/4] remove parameters from recurrent payment which 2co is not accepting https://www.2checkout.com/documentation/checkout/parameters --- src/bb-library/Payment/Adapter/TwoCheckout.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/bb-library/Payment/Adapter/TwoCheckout.php b/src/bb-library/Payment/Adapter/TwoCheckout.php index 99234e901..ff6fc86dd 100644 --- a/src/bb-library/Payment/Adapter/TwoCheckout.php +++ b/src/bb-library/Payment/Adapter/TwoCheckout.php @@ -319,7 +319,6 @@ class Payment_Adapter_TwoCheckout implements \Box\InjectionAwareInterface } foreach($invoice['lines'] as $i => $item) { - $data['li_' . $i . '_id'] = $invoice['id']; $data['li_' . $i . '_type'] = 'product'; $data['li_' . $i . '_name'] = $item['title']; $data['li_' . $i . '_quantity'] = $item['quantity']; @@ -340,10 +339,7 @@ class Payment_Adapter_TwoCheckout implements \Box\InjectionAwareInterface $data['merchant_order_id'] = $invoice['id']; - $data['return_url'] = $this->config['redirect_url']; $data['x_receipt_link_url'] = $this->config['redirect_url']; - $data['fixed'] = 'Y'; - $data['skip_landing'] = 1; return $data; }