Оплатить
- {$uri} + {$uri}Отмена
/cancel.php diff --git a/example/recurrent.php b/example/recurrent.php new file mode 100644 index 0000000..55da129 --- /dev/null +++ b/example/recurrent.php @@ -0,0 +1,17 @@ +setOrderIdp(mt_rand(10000, 99999)) + ->setSubtotalP(15) + ->setParentOrderIdp(00000) // order id of any past payment + ->setParentShopIdp($uniteller->getShopId()); // optional + +$results = $uniteller->recurrent($builder); + +var_dump($results); diff --git a/src/Client.php b/src/Client.php index 4fef378..209ab6e 100644 --- a/src/Client.php +++ b/src/Client.php @@ -14,10 +14,12 @@ use Tmconsulting\Uniteller\Order\Order; use Tmconsulting\Uniteller\Payment\Payment; use Tmconsulting\Uniteller\Payment\PaymentInterface; +use Tmconsulting\Uniteller\Recurrent\RecurrentRequest; use Tmconsulting\Uniteller\Request\RequestInterface; use Tmconsulting\Uniteller\Results\ResultsRequest; -use Tmconsulting\Uniteller\Signature\Signature; use Tmconsulting\Uniteller\Signature\SignatureInterface; +use Tmconsulting\Uniteller\Signature\SignaturePayment; +use Tmconsulting\Uniteller\Signature\SignatureRecurrent; use GuzzleHttp\Client as GuzzleClient; use Http\Adapter\Guzzle6\Client as GuzzleAdapter; @@ -41,7 +43,12 @@ class Client implements ClientInterface /** * @var SignatureInterface */ - protected $signature; + protected $signaturePayment; + + /** + * @var SignatureInterface + */ + protected $signatureRecurrent; /** * @var RequestInterface @@ -53,6 +60,11 @@ class Client implements ClientInterface */ protected $resultsRequest; + /** + * @var RequestInterface + */ + protected $recurrentRequest; + /** * @var HttpManagerInterface */ @@ -66,7 +78,9 @@ public function __construct() $this->registerPayment(new Payment()); $this->registerCancelRequest(new CancelRequest()); $this->registerResultsRequest(new ResultsRequest()); - $this->registerSignature(new Signature()); + $this->registerRecurrentRequest(new RecurrentRequest()); + $this->registerSignaturePayment(new SignaturePayment()); + $this->registerSignatureRecurrent(new SignatureRecurrent()); } /** @@ -168,13 +182,35 @@ public function registerResultsRequest(RequestInterface $request) return $this; } + /** + * @param RequestInterface $request + * @return $this + */ + public function registerRecurrentRequest(RequestInterface $request) + { + $this->recurrentRequest = $request; + + return $this; + } + + /** + * @param \Tmconsulting\Uniteller\Signature\SignatureInterface $signature + * @return $this + */ + public function registerSignaturePayment(SignatureInterface $signature) + { + $this->signaturePayment = $signature; + + return $this; + } + /** * @param \Tmconsulting\Uniteller\Signature\SignatureInterface $signature * @return $this */ - public function registerSignature(SignatureInterface $signature) + public function registerSignatureRecurrent(SignatureInterface $signature) { - $this->signature = $signature; + $this->signatureRecurrent = $signature; return $this; } @@ -257,12 +293,28 @@ public function getResultsRequest() return $this->resultsRequest; } + /** + * @return \Tmconsulting\Uniteller\Request\RequestInterface + */ + public function getRecurrentRequest() + { + return $this->recurrentRequest; + } + /** * @return \Tmconsulting\Uniteller\Signature\SignatureInterface */ - public function getSignature() + public function getSignaturePayment() { - return $this->signature; + return $this->signaturePayment; + } + + /** + * @return \Tmconsulting\Uniteller\Signature\SignatureInterface + */ + public function getSignatureRecurrent() + { + return $this->signatureRecurrent; } /** @@ -282,22 +334,20 @@ public function getHttpManager() public function payment($parameters) { $array = $this->getParameters($parameters); - $array['Shop_IDP'] = $this->getShopId(); - $array['Password'] = $this->getPassword(); - - $array['Signature'] = $this->signature->create([ - 'Shop_IDP' => array_get($array, 'Shop_IDP'), - 'Order_IDP' => array_get($array, 'Order_IDP'), - 'Subtotal_P' => array_get($array, 'Subtotal_P'), - 'MeanType' => array_get($array, 'MeanType'), - 'EMoneyType' => array_get($array, 'EMoneyType'), - 'Lifetime' => array_get($array, 'Lifetime'), - 'Customer_IDP' => array_get($array, 'Customer_IDP'), - 'Card_IDP' => array_get($array, 'Card_IDP'), - 'IData' => array_get($array, 'IData'), - 'PT_Code' => array_get($array, 'PT_Code'), - 'Password' => array_get($array, 'Password'), - ]); + $array['Shop_IDP'] = $this->getShopId(); + $array['Signature'] = $this->signaturePayment + ->setShopIdp(array_get($array, 'Shop_IDP')) + ->setOrderIdp(array_get($array, 'Order_IDP')) + ->setSubtotalP(array_get($array, 'Subtotal_P')) + ->setMeanType(array_get($array, 'MeanType')) + ->setEMoneyType(array_get($array, 'EMoneyType')) + ->setLifeTime(array_get($array, 'Lifetime')) + ->setCustomerIdp(array_get($array, 'Customer_IDP')) + ->setCardIdp(array_get($array, 'Card_IDP')) + ->setIData(array_get($array, 'IData')) + ->setPtCode(array_get($array, 'PT_Code')) + ->setPassword($this->getPassword()) + ->create(); return $this->getPayment()->execute($array, $this->getOptions()); } @@ -324,15 +374,28 @@ public function results($parameters) } /** - * @param array $parameters + * @param \Tmconsulting\Uniteller\Recurrent\RecurrentBuilder|array $parameters * @return mixed * @throws \Tmconsulting\Uniteller\Exception\NotImplementedException */ - public function reccurent($parameters) + public function recurrent($parameters) { - throw new NotImplementedException(sprintf( - 'In current moment, feature [%s] not implemented.', __METHOD__ - )); + $array = $this->getParameters($parameters); + $array['Shop_IDP'] = $this->getShopId(); + + $this->signatureRecurrent + ->setShopIdp(array_get($array, 'Shop_IDP')) + ->setOrderIdp(array_get($array, 'Order_IDP')) + ->setSubtotalP(array_get($array, 'Subtotal_P')) + ->setParentOrderIdp(array_get($array, 'Parent_Order_IDP')) + ->setPassword($this->getPassword()); + if (array_get($array, 'Parent_Shop_IDP')) { + $this->signatureRecurrent->setParentShopIdp(array_get($array, 'Parent_Shop_IDP')); + } + + $array['Signature'] = $this->signatureRecurrent->create(); + + return $this->callRequestFor('recurrent', $array); } /** diff --git a/src/ClientInterface.php b/src/ClientInterface.php index 487424f..a7f66df 100644 --- a/src/ClientInterface.php +++ b/src/ClientInterface.php @@ -39,7 +39,7 @@ public function results($parameters); * @param array $parameters * @return mixed */ - public function reccurent($parameters); + public function recurrent($parameters); /** * @param array $parameters diff --git a/src/Error/Error.php b/src/Error/Error.php index 6ef99f4..7835146 100644 --- a/src/Error/Error.php +++ b/src/Error/Error.php @@ -62,7 +62,7 @@ class Error * Recurrent payment not allowed * Магазин не поддерживает рекуррентные платежи */ - const RECCURENT_PAY_NOT_ALLOWED = 22; + const RECURENT_PAY_NOT_ALLOWED = 22; /** * Incorrect Parent_Order_IDP diff --git a/src/Http/HttpManager.php b/src/Http/HttpManager.php index 31ee540..e14137c 100644 --- a/src/Http/HttpManager.php +++ b/src/Http/HttpManager.php @@ -14,6 +14,7 @@ use Psr\Http\Message\ResponseInterface; use Tmconsulting\Uniteller\Exception\ExceptionFactory; use Tmconsulting\Uniteller\Exception\UnitellerException; +use function Tmconsulting\Uniteller\csv_to_array; /** * Class HttpManager @@ -44,38 +45,60 @@ public function __construct(HttpClient $httpClient, array $options = []) $this->options = $options; } + /** + * @param string $format + * @return array + */ + protected function getDefaultHeaders($format) + { + $headers = [ + 'Content-Type' => 'application/x-www-form-urlencoded', + ]; + + switch ($format) { + case 'xml': + $headers['Accept'] = 'application/xml'; + break; + case 'csv': + $headers['Accept'] = 'text/csv'; + break; + case 'json': + $headers['Accept'] = 'application/json'; + break; + } + + return $headers; + } + /** * @param $uri * @param string $method * @param null $data * @param array $headers + * @param string $format * @return \Psr\Http\Message\ResponseInterface */ - public function request($uri, $method = 'POST', $data = null, array $headers = []) + public function request($uri, $method = 'POST', $data = null, array $headers = [], $format='xml') { $uri = sprintf('%s/%s?%s', $this->options['base_uri'], $uri, http_build_query([ 'Shop_ID' => $this->options['shop_id'], 'Login' => $this->options['login'], 'Password' => $this->options['password'], - 'Format' => Format::resolveXml($uri), + 'Format' => Format::{"resolve$format"}($uri), ])); - $defaultHeaders = [ - 'Accept' => 'application/xml', - 'Content-Type' => 'application/x-www-form-urlencoded', - ]; - - $request = new Request($method, $uri, array_merge($defaultHeaders, $headers), $data); + $request = new Request($method, $uri, array_merge($this->getDefaultHeaders($format), $headers), $data); try { $response = $this->httpClient->sendRequest($request); - } catch (RequestException $e) { + } + catch (RequestException $e) { throw UnitellerException::create($request, $e->getResponse()); } $this->basicError($request, $response); $body = $response->getBody()->getContents(); - $this->providerError($body, $request, $response); + $this->providerError($body, $request, $response, $format); return $body; } @@ -86,24 +109,38 @@ public function request($uri, $method = 'POST', $data = null, array $headers = [ * @param $response * @throws \ErrorException */ - protected function providerError($body, RequestInterface $request, ResponseInterface $response) + protected function providerError($body, RequestInterface $request, ResponseInterface $response, $format='xml') { - if (substr($body, 0, 6) === 'ERROR:') { - throw ExceptionFactory::createFromMessage( - substr($body, 7), $request, $response - ); - } + if ($format === 'csv') { + $data = csv_to_array($body, true); + + if (isset($data['ErrorMessage'])) { + throw ExceptionFactory::createFromMessage( + $data['ErrorMessage'], $request, $response + ); + } - $xml = new \SimpleXMLElement((string) $body); - if (($firstCode = (string) $xml->attributes()['firstcode']) == 0) { - return; } + elseif ($format === 'xml') { - $secondCode = (string) $xml->attributes()['secondcode']; + if (substr($body, 0, 6) === 'ERROR:') { + throw ExceptionFactory::createFromMessage( + substr($body, 7), $request, $response + ); + } - throw ExceptionFactory::create( - $firstCode, $secondCode, $request, $response - ); + $xml = new \SimpleXMLElement((string)$body); + if (($firstCode = (string)$xml->attributes()['firstcode']) == 0) { + return; + } + + $secondCode = (string)$xml->attributes()['secondcode']; + + throw ExceptionFactory::create( + $firstCode, $secondCode, $request, $response + ); + + } } /** diff --git a/src/Order/Order.php b/src/Order/Order.php index 0bfe83a..64e7f76 100644 --- a/src/Order/Order.php +++ b/src/Order/Order.php @@ -291,6 +291,11 @@ class Order implements ArraybleInterface */ protected $packetDate; + /** + * @var string + */ + protected $signature; + /** * @param string $address @@ -466,6 +471,8 @@ public function setDate($date) } // Ёбаный насрать, а даты зачем разного формата отдавать? + // Полностью разделяю и поддерживаю данное негодование, значит ебашим костыли)) + $date = str_replace('.', '-', $date); $this->date = DateTime::createFromFormat('U', strtotime($date)); return $this; @@ -1046,6 +1053,8 @@ public function setPacketDate($packetDate) } // 10.03.2017 15:42:42 - o_O + // 2018.07.16 10:54:05 - O_o + $packetDate = str_replace('.', '-', $packetDate); $this->packetDate = DateTime::createFromFormat('U', strtotime($packetDate)); return $this; @@ -1059,6 +1068,25 @@ public function getPacketDate() return $this->packetDate; } + /** + * @return string + */ + public function getSignature() + { + return $this->signature; + } + + /** + * @param string $signature + * @return Order + */ + public function setSignature($signature) + { + $this->signature = $signature; + + return $this; + } + /** * @return array */ @@ -1104,6 +1132,7 @@ public function toArray() 'Response_Message' => $this->getResponseMessage(), 'Status' => $this->getStatus(), 'Total' => $this->getTotal(), + 'Signature' => $this->getSignature(), ]; } } \ No newline at end of file diff --git a/src/Recurrent/RecurrentBuilder.php b/src/Recurrent/RecurrentBuilder.php new file mode 100644 index 0000000..fa0f6ad --- /dev/null +++ b/src/Recurrent/RecurrentBuilder.php @@ -0,0 +1,174 @@ +shopIdp = $shopIdp; + + return $this; + } + + /** + * @param string $orderIdp + * @return RecurrentBuilder + */ + public function setOrderIdp($orderIdp) + { + $this->orderIdp = $orderIdp; + + return $this; + } + + /** + * @param float|string $subtotalP + * @return RecurrentBuilder + */ + public function setSubtotalP($subtotalP) + { + $this->subtotalP = $subtotalP; + + return $this; + } + + /** + * @param string $parentOrderIdp + * @return RecurrentBuilder + */ + public function setParentOrderIdp($parentOrderIdp) + { + $this->parentOrderIdp = $parentOrderIdp; + + return $this; + } + + /** + * @param string $parentShopIdp + * @return RecurrentBuilder + */ + public function setParentShopIdp($parentShopIdp) + { + $this->parentShopIdp = $parentShopIdp; + + return $this; + } + + /** + * @return string + */ + public function getShopIdp() + { + return $this->shopIdp; + } + + /** + * @return string + */ + public function getOrderIdp() + { + return $this->orderIdp; + } + + /** + * @return float|string + */ + public function getSubtotalP() + { + return $this->subtotalP; + } + + /** + * @return string + */ + public function getParentOrderIdp() + { + return $this->parentOrderIdp; + } + + /** + * @return string + */ + public function getParentShopIdp() + { + return $this->parentShopIdp; + } + + /** + * @return array + */ + public function toArray() + { + return [ + 'Shop_IDP' => $this->getShopIdp(), + 'Parent_Shop_IDP' => $this->getParentShopIdp(), + 'Order_IDP' => $this->getOrderIdp(), + 'Parent_Order_IDP' => $this->getParentOrderIdp(), + 'Subtotal_P' => $this->getSubtotalP(), + ]; + } +} \ No newline at end of file diff --git a/src/Recurrent/RecurrentRequest.php b/src/Recurrent/RecurrentRequest.php new file mode 100644 index 0000000..ecc73f7 --- /dev/null +++ b/src/Recurrent/RecurrentRequest.php @@ -0,0 +1,79 @@ +request('recurrent', 'POST', http_build_query($parameters), [], 'csv'); + $csv = Uniteller\csv_to_array($response); + $array = []; + foreach ($csv as $item) { + $array[] = (new Order()) + ->setAddress(Uniteller\array_get($item, 'Address')) + ->setApprovalCode(Uniteller\array_get($item, 'ApprovalCode')) + ->setBankName(Uniteller\array_get($item, 'BankName')) + ->setBillNumber(Uniteller\array_get($item, 'BillNumber')) + //->setBookingcomId(Uniteller\array_get($item, 'bookingcom_id')) + //->setBookingcomPincode(Uniteller\array_get($item, 'bookingcom_pincode')) + //->setCardIdp(Uniteller\array_get($item, 'card_idp')) + ->setCardHolder(Uniteller\array_get($item, 'CardHolder')) + ->setCardNumber(Uniteller\array_get($item, 'CardNumber')) + ->setCardType(Uniteller\array_get($item, 'CardType')) + ->setComment(Uniteller\array_get($item, 'Comment')) + ->setCurrency(Uniteller\array_get($item, 'Currency')) + ->setCvc2((bool)Uniteller\array_get($item, 'CVC2', false)) + ->setDate(Uniteller\array_get($item, 'Date')) + ->setEmail(Uniteller\array_get($item, 'Email')) + //->setEMoneyType(Uniteller\array_get($item, 'emoneytype')) + //->setEOrderData(Uniteller\array_get($item, 'eorderdata')) + ->setErrorCode(Uniteller\array_get($item, 'Error_Code')) + ->setErrorComment(Uniteller\array_get($item, 'Error_Comment')) + ->setFirstName(Uniteller\array_get($item, 'FirstName')) + //->setGdsPaymentPurposeId(Uniteller\array_get($item, 'gds_payment_purpose_id')) + //->setIData(Uniteller\array_get($item, 'idata')) + ->setIp(Uniteller\array_get($item, 'IPAddress')) + ->setLastName(Uniteller\array_get($item, 'LastName')) + //->setLoanId(Uniteller\array_get($item, 'loan_id')) + ->setMessage(Uniteller\array_get($item, 'Message')) + ->setMiddleName(Uniteller\array_get($item, 'MiddleName')) + //->setNeedConfirm((bool)Uniteller\array_get($item, 'need_confirm')) + ->setOrderNumber(Uniteller\array_get($item, 'OrderNumber')) + //->setParentOrderNumber(Uniteller\array_get($item, 'parent_order_number')) + ->setPaymentType(Uniteller\array_get($item, 'PaymentType')) + ->setPhone(Uniteller\array_get($item, 'Phone')) + //->setPtCode(Uniteller\array_get($item, 'pt_code')) + ->setRecommendation(Uniteller\array_get($item, 'Recommendation')) + ->setResponseCode(Uniteller\array_get($item, 'Response_Code')) + ->setStatus(Uniteller\array_get($item, 'Status')) + ->setTotal(Uniteller\array_get($item, 'Total')) + ->setPacketDate(Uniteller\array_get($item, 'PacketDate')) + ->setSignature(Uniteller\array_get($item, 'Signature')); + } + + return $array; + } +} \ No newline at end of file diff --git a/src/Signature/Signature.php b/src/Signature/AbstractSignature.php similarity index 55% rename from src/Signature/Signature.php rename to src/Signature/AbstractSignature.php index 3c8e7df..43f5cec 100644 --- a/src/Signature/Signature.php +++ b/src/Signature/AbstractSignature.php @@ -7,38 +7,27 @@ namespace Tmconsulting\Uniteller\Signature; + +use Tmconsulting\Uniteller\ArraybleInterface; + /** * Class Signature * * @package Tmconsulting\Client */ -final class Signature implements SignatureInterface +abstract class AbstractSignature implements SignatureInterface, ArraybleInterface { + /** * Create signature for send payment request. * - * @param array $params * @return string */ - public function create(array $params) + public function create() { - $defaults = [ - 'Shop_IDP' => '', - 'Order_IDP' => '', - 'Subtotal_P' => '', - 'MeanType' => '', - 'EMoneyType' => '', - 'Lifetime' => '', - 'Customer_IDP' => '', - 'Card_IDP' => '', - 'IData' => '', - 'PT_Code' => '', - 'Password' => '', - ]; - $string = join('&', array_map(function ($item) { return md5($item); - }, array_merge($defaults, $params))); + }, $this->toArray())); return strtoupper(md5($string)); } diff --git a/src/Signature/SignatureInterface.php b/src/Signature/SignatureInterface.php index 5f46c37..ed949b0 100644 --- a/src/Signature/SignatureInterface.php +++ b/src/Signature/SignatureInterface.php @@ -17,10 +17,9 @@ interface SignatureInterface /** * Create signature for send payment request. * - * @param array $params * @return string */ - public function create(array $params); + public function create(); /** * Verify signature when Client will be send callback request. diff --git a/src/Signature/SignaturePayment.php b/src/Signature/SignaturePayment.php new file mode 100644 index 0000000..f7fd6fe --- /dev/null +++ b/src/Signature/SignaturePayment.php @@ -0,0 +1,302 @@ +shopIdp = $shopIdp; + + return $this; + } + + /** + * @param string $orderIdp + * @return SignaturePayment + */ + public function setOrderIdp($orderIdp) + { + $this->orderIdp = $orderIdp; + + return $this; + } + + /** + * @param string $subtotalP + * @return SignaturePayment + */ + public function setSubtotalP($subtotalP) + { + $this->subtotalP = $subtotalP; + + return $this; + } + + /** + * @param string $meanType + * @return SignaturePayment + */ + public function setMeanType($meanType) + { + $this->meanType = $meanType; + + return $this; + } + + /** + * @param string $eMoneyType + * @return SignaturePayment + */ + public function setEMoneyType($eMoneyType) + { + $this->eMoneyType = $eMoneyType; + + return $this; + } + + /** + * @param string $lifeTime + * @return SignaturePayment + */ + public function setLifeTime($lifeTime) + { + $this->lifeTime = $lifeTime; + + return $this; + } + + /** + * @param string $customerIdp + * @return SignaturePayment + */ + public function setCustomerIdp($customerIdp) + { + $this->customerIdp = $customerIdp; + + return $this; + } + + /** + * @param string $cardIdp + * @return SignaturePayment + */ + public function setCardIdp($cardIdp) + { + $this->cardIdp = $cardIdp; + + return $this; + } + + /** + * @param string $iData + * @return SignaturePayment + */ + public function setIData($iData) + { + $this->iData = $iData; + + return $this; + } + + /** + * @param string $ptCode + * @return SignaturePayment + */ + public function setPtCode($ptCode) + { + $this->ptCode = $ptCode; + + return $this; + } + + /** + * @param string $password + * @return SignaturePayment + */ + public function setPassword($password) + { + $this->password = $password; + + return $this; + } + + /** + * @return string + */ + public function getShopIdp() + { + return $this->shopIdp; + } + + /** + * @return string + */ + public function getOrderIdp() + { + return $this->orderIdp; + } + + /** + * @return string + */ + public function getSubtotalP() + { + return $this->subtotalP; + } + + /** + * @return string + */ + public function getMeanType() + { + return $this->meanType; + } + + /** + * @return string + */ + public function getEMoneyType() + { + return $this->eMoneyType; + } + + /** + * @return string + */ + public function getLifeTime() + { + return $this->lifeTime; + } + + /** + * @return string + */ + public function getCustomerIdp() + { + return $this->customerIdp; + } + + /** + * @return string + */ + public function getCardIdp() + { + return $this->cardIdp; + } + + /** + * @return string + */ + public function getIData() + { + return $this->iData; + } + + /** + * @return string + */ + public function getPtCode() + { + return $this->ptCode; + } + + /** + * @return string + */ + public function getPassword() + { + return $this->password; + } + + /** + * @return array + */ + public function toArray() + { + $array = []; + $array['Shop_IDP'] = $this->getShopIdp(); + $array['Order_IDP'] = $this->getOrderIdp(); + $array['Subtotal_P'] = $this->getSubtotalP(); + $array['MeanType'] = $this->getMeanType(); + $array['EMoneyType'] = $this->getEMoneyType(); + $array['Lifetime'] = $this->getLifeTime(); + $array['Customer_IDP'] = $this->getCustomerIdp(); + $array['Card_IDP'] = $this->getCardIdp(); + $array['IData'] = $this->getIData(); + $array['PT_Code'] = $this->getPtCode(); + $array['Password'] = $this->getPassword(); + + return $array; + } +} \ No newline at end of file diff --git a/src/Signature/SignatureRecurrent.php b/src/Signature/SignatureRecurrent.php new file mode 100644 index 0000000..adb9a1d --- /dev/null +++ b/src/Signature/SignatureRecurrent.php @@ -0,0 +1,179 @@ +shopIdp = $shopIdp; + + return $this; + } + + /** + * @param string $parentShopIdp + * @return SignatureRecurrent + */ + public function setParentShopIdp($parentShopIdp) + { + $this->parentShopIdp = $parentShopIdp; + + return $this; + } + + /** + * @param string $orderIdp + * @return SignatureRecurrent + */ + public function setOrderIdp($orderIdp) + { + $this->orderIdp = $orderIdp; + + return $this; + } + + /** + * @param string $subtotalP + * @return SignatureRecurrent + */ + public function setSubtotalP($subtotalP) + { + $this->subtotalP = $subtotalP; + + return $this; + } + + /** + * @param string $parentOrderIdp + * @return SignatureRecurrent + */ + public function setParentOrderIdp($parentOrderIdp) + { + $this->parentOrderIdp = $parentOrderIdp; + + return $this; + } + + /** + * @param string $password + * @return SignatureRecurrent + */ + public function setPassword($password) + { + $this->password = $password; + + return $this; + } + + /** + * @return string + */ + public function getShopIdp() + { + return $this->shopIdp; + } + + /** + * @return string + */ + public function getParentShopIdp() + { + return $this->parentShopIdp; + } + + /** + * @return string + */ + public function getOrderIdp() + { + return $this->orderIdp; + } + + /** + * @return string + */ + public function getSubtotalP() + { + return $this->subtotalP; + } + + /** + * @return string + */ + public function getParentOrderIdp() + { + return $this->parentOrderIdp; + } + + /** + * @return string + */ + public function getPassword() + { + return $this->password; + } + + /** + * @return array + */ + public function toArray() + { + $array = []; + $array['Shop_IDP'] = $this->getShopIdp(); + if($this->getParentShopIdp() !== null) + $array['Parent_Shop_IDP'] = $this->getParentShopIdp(); + $array['Order_IDP'] = $this->getOrderIdp(); + $array['Subtotal_P'] = $this->getSubtotalP(); + $array['Parent_Order_IDP'] = $this->getParentOrderIdp(); + $array['Password'] = $this->getPassword(); + + return $array; + } +} \ No newline at end of file diff --git a/src/helpers.php b/src/helpers.php index 2f9dd0a..ad2a671 100644 --- a/src/helpers.php +++ b/src/helpers.php @@ -39,4 +39,29 @@ function xml_get($object, $key, $default = null) } return (string) $object->{$key}; +} + +/** + * @param string $string + * @param bool $isFlat + * @return array|mixed + */ +function csv_to_array($string, $isFlat = false) +{ + $lines = explode("\n", trim($string)); + $headers = str_getcsv(array_shift($lines), ';'); + $data = []; + foreach ($lines as $line) { + $row = []; + foreach (str_getcsv($line, ';') as $key => $field) { + $row[$headers[$key]] = $field; + } + $data[] = array_filter($row); + } + + if ($isFlat && !empty($data)) { + $data = $data[0]; + } + + return $data; } \ No newline at end of file diff --git a/tests/ClientTest.php b/tests/ClientTest.php index 054d027..844d5b9 100644 --- a/tests/ClientTest.php +++ b/tests/ClientTest.php @@ -47,7 +47,8 @@ public function testDefaultObjectsIsRegistered() { $uniteller = new Client(); $this->assertInstanceOf(PaymentInterface::class, $uniteller->getPayment()); - $this->assertInstanceOf(SignatureInterface::class, $uniteller->getSignature()); + $this->assertInstanceOf(SignatureInterface::class, $uniteller->getSignaturePayment()); + $this->assertInstanceOf(SignatureInterface::class, $uniteller->getSignatureRecurrent()); } public function testSetOptionsUseArrayNotation() @@ -123,9 +124,11 @@ public function testCanRequestMethodsMayReturnCorrectResult() $client = new Client(); $client->registerCancelRequest($this->createMock(RequestInterface::class)); $client->registerResultsRequest($this->createMock(RequestInterface::class)); + $client->registerRecurrentRequest($this->createMock(RequestInterface::class)); $this->assertInstanceOf(RequestInterface::class, $client->getCancelRequest()); $this->assertInstanceOf(RequestInterface::class, $client->getResultsRequest()); + $this->assertInstanceOf(RequestInterface::class, $client->getRecurrentRequest()); } public function testShouldBePaymentMethodBuildCorrectArray() @@ -136,7 +139,6 @@ public function testShouldBePaymentMethodBuildCorrectArray() ->method('execute') ->willReturnCallback(function ($array) { $this->assertArrayHasKey('Shop_IDP', $array); - $this->assertArrayHasKey('Password', $array); $this->assertArrayHasKey('Signature', $array); }); @@ -160,6 +162,7 @@ public function testCanCancelMethodGiveControlToTheRequestClass() $client = new Client(); $client->registerCancelRequest($request); $client->registerResultsRequest($request); + $client->registerRecurrentRequest($request); $client->cancel([]); $client->results([]); @@ -189,7 +192,6 @@ public function testCanUseCustomHttpManager() public function provideUnsupportedRequestMethods() { return [ - ['reccurent'], ['confirm'], ['card'], ]; @@ -228,6 +230,7 @@ public function testShouldBeActionsAcceptClassesWhichImplementArraybleInterface( $client = new Client(); $client->registerResultsRequest($request); $client->registerCancelRequest($request); + $client->registerRecurrentRequest($request); $client->registerPayment($this->createMock(PaymentInterface::class)); $arrayble = $this->createMock(ArraybleInterface::class); diff --git a/tests/Recurrent/RecurrentBuilderTest.php b/tests/Recurrent/RecurrentBuilderTest.php new file mode 100644 index 0000000..794d8a5 --- /dev/null +++ b/tests/Recurrent/RecurrentBuilderTest.php @@ -0,0 +1,34 @@ +setShopIdp('FOO'); + $builder->setParentShopIdp('BAR'); + $builder->setOrderIdp('BAZ'); + $builder->setParentOrderIdp('old'); + $builder->setSubtotalP(10); + + $expected = [ + 'Shop_IDP' => 'FOO', + 'Parent_Shop_IDP' => 'BAR', + 'Order_IDP' => 'BAZ', + 'Parent_Order_IDP' => 'old', + 'Subtotal_P' => 10, + ]; + + $this->assertEquals($expected, $builder->toArray()); + } +} \ No newline at end of file diff --git a/tests/Recurrent/RecurrentRequestTest.php b/tests/Recurrent/RecurrentRequestTest.php new file mode 100644 index 0000000..59e8daa --- /dev/null +++ b/tests/Recurrent/RecurrentRequestTest.php @@ -0,0 +1,70 @@ +createMock(HttpManagerInterface::class); + $manager + ->expects($this->once()) + ->method('request') + ->willReturn($this->getStubContents('recurrent', 'csv')); + + $request = new RecurrentRequest(); + /** @var \Tmconsulting\Uniteller\Order\Order $order */ + foreach ($request->execute($manager) as $order) { + $this->assertInstanceOf(Order::class, $order); + $this->assertEquals('Value of address', $order->getAddress()); + $this->assertEquals('Value of approvalCode', $order->getApprovalCode()); + $this->assertEquals('Value of bankName', $order->getBankName()); + $this->assertEquals('Value of billNumber', $order->getBillNumber()); + $this->assertEquals(null, $order->getBookingcomId()); + $this->assertEquals(null, $order->getBookingcomPincode()); + $this->assertEquals(null, $order->getCardIdp()); + $this->assertEquals('Value of cardHolder', $order->getCardHolder()); + $this->assertEquals('Value of cardNumber', $order->getCardNumber()); + $this->assertEquals('Value of cardType', $order->getCardType()); + $this->assertEquals('Value of comment', $order->getComment()); + $this->assertEquals('Value of currency', $order->getCurrency()); + $this->assertEquals(true, $order->isCvc2()); + $this->assertInstanceOf(\DateTime::class, $order->getDate()); + $this->assertEquals('Value of email', $order->getEmail()); + $this->assertEquals(null, $order->getEMoneyType()); + $this->assertEquals(null, $order->getEOrderData()); + $this->assertEquals('Value of error_code', $order->getErrorCode()); + $this->assertEquals('Value of error_comment', $order->getErrorComment()); + $this->assertEquals('Value of firstName', $order->getFirstName()); + $this->assertEquals(null, $order->getGdsPaymentPurposeId()); + $this->assertEquals(null, $order->getIData()); + $this->assertEquals('Value of ipAddress', $order->getIp()); + $this->assertEquals('Value of lastName', $order->getLastName()); + $this->assertEquals(null, $order->getLoanId()); + $this->assertEquals('Value of message', $order->getMessage()); + $this->assertEquals('Value of middleName', $order->getMiddleName()); + $this->assertEquals(false, $order->isNeedConfirm()); + $this->assertEquals('Value of orderNumber', $order->getOrderNumber()); + $this->assertEquals(null, $order->getParentOrderNumber()); + $this->assertEquals('Value of paymentType', $order->getPaymentType()); + $this->assertEquals('Value of phone', $order->getPhone()); + $this->assertEquals(null, $order->getPtCode()); + $this->assertEquals('Value of recommendation', $order->getRecommendation()); + $this->assertEquals('Value of response_code', $order->getResponseCode()); + $this->assertEquals(Status::AUTHORIZED, $order->getStatus()); + $this->assertEquals('Value of total', $order->getTotal()); + $this->assertInstanceOf(\DateTime::class, $order->getPacketDate()); + } + } +} \ No newline at end of file diff --git a/tests/Signature/SignatureTest.php b/tests/Signature/SignatureTest.php index c1a8ba7..8e550e4 100644 --- a/tests/Signature/SignatureTest.php +++ b/tests/Signature/SignatureTest.php @@ -7,30 +7,43 @@ namespace Tmconsulting\Uniteller\Tests\Signature; -use Tmconsulting\Uniteller\Signature\Signature; +use Tmconsulting\Uniteller\Signature\SignaturePayment; +use Tmconsulting\Uniteller\Signature\SignatureRecurrent; use Tmconsulting\Uniteller\Tests\TestCase; class SignatureTest extends TestCase { - public function testSignatureCreation() + public function testPaymentSignatureCreation() { - $sig = new Signature; - - $created = $sig->create([ - 'Shop_IDP' => 'ACME', - 'Order_IDP' => 'FOO', - 'Subtotal_P' => '100', - 'Lifetime' => 300, - 'Customer_IDP' => 'short_shop_string', - 'Password' => 'LONG-PWD', - ]); + $sig = (new SignaturePayment) + ->setShopIdp('ACME') + ->setOrderIdp('FOO') + ->setSubtotalP(100) + ->setLifeTime(300) + ->setCustomerIdp('short_shop_string') + ->setPassword('LONG-PWD') + ->create(); + + $this->assertSame('3D1D6F830384886A81AD672F66392B03', $sig); + } - $this->assertSame('3D1D6F830384886A81AD672F66392B03', $created); + + public function testRecurrentSignatureCreation() + { + $sig = (new SignatureRecurrent()) + ->setShopIdp('ACME') + ->setOrderIdp('FOO') + ->setSubtotalP(100) + ->setParentOrderIdp('BAR') + ->setPassword('LONG-PWD') + ->create(); + + $this->assertSame('A5FE1C95A2819EBACFC2145EE83742F6', $sig); } public function testSignatureVerifying() { - $sig = new Signature; + $sig = new SignaturePayment; $results = $sig->verify('3F728AA479E50F5B10EE6C20258BFF88', [ 'Order_ID' => 'FOO', diff --git a/tests/TestCase.php b/tests/TestCase.php index f0b63ee..50ea4de 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -8,10 +8,11 @@ class TestCase extends PHPUnit_Framework_TestCase { /** * @param $filename + * @param string $type * @return bool|string */ - protected function getStubContents($filename) + protected function getStubContents($filename, $type='xml') { - return file_get_contents(__DIR__ . "/stub/$filename.xml"); + return file_get_contents(__DIR__ . "/stub/$filename.$type"); } } \ No newline at end of file diff --git a/tests/stub/recurrent.csv b/tests/stub/recurrent.csv new file mode 100644 index 0000000..a2fa330 --- /dev/null +++ b/tests/stub/recurrent.csv @@ -0,0 +1,2 @@ +OrderNumber;Response_Code;Recommendation;Message;Comment;Date;Total;Currency;CardType;CardNumber;LastName;FirstName;MiddleName;Address;Email;ApprovalCode;CVC2;CardHolder;IPAddress;BillNumber;BankName;Status;Error_Code;Error_Comment;PacketDate;PaymentType;Phone;Signature +Value of orderNumber;Value of response_code;Value of recommendation;Value of message;Value of comment;2018.07.16 10:54:05;Value of total;Value of currency;Value of cardType;Value of cardNumber;Value of lastName;Value of firstName;Value of middleName;Value of address;Value of email;Value of approvalCode;true;Value of cardHolder;Value of ipAddress;Value of billNumber;Value of bankName;authorized;Value of error_code;Value of error_comment;2018.07.16 10:54:05;Value of paymentType;Value of phone;Value of signature \ No newline at end of file