Skip to content

Commit

Permalink
Merge pull request #21 from reidincom/fix-recurring-flag
Browse files Browse the repository at this point in the history
Recurring ödemelerde karşı tarafa her zaman (int) 1 gitmeli
  • Loading branch information
ibrahimgunduz34 committed Sep 7, 2015
2 parents d9d6c13 + fc1403c commit 7844a65
Showing 1 changed file with 37 additions and 36 deletions.
73 changes: 37 additions & 36 deletions src/Payu/Serializer/PaymentRequestSerializer.php
Expand Up @@ -12,24 +12,24 @@ private function serializeOrder()
$order = $this->request->getOrder();

$data = array(
'ORDER_REF' => $order->getCode(),
'ORDER_DATE' => $order->getDate(),
'PAY_METHOD' => $order->getPaymentMethod(),
'PRICES_CURRENCY' => $order->getCurrency(),
'ORDER_REF' => $order->getCode(),
'ORDER_DATE' => $order->getDate(),
'PAY_METHOD' => $order->getPaymentMethod(),
'PRICES_CURRENCY' => $order->getCurrency(),
'SELECTED_INSTALLMENTS_NUMBER' => $order->getInstallment(),
'ORDER_TIMEOUT' => $order->getTimeout(),
'CLIENT_IP' => $order->getClientIp()
'ORDER_TIMEOUT' => $order->getTimeout(),
'CLIENT_IP' => $order->getClientIp()
);

if((float) $order->getLoyaltyAmount() != 0) {
if ((float) $order->getLoyaltyAmount() != 0) {
$data['USE_LOYALTY_POINTS'] = 'YES';
if((float) $order->getLoyaltyAmount() != (float) $this->request->getBasket()->getTotalPrice()) {
if ((float) $order->getLoyaltyAmount() != (float) $this->request->getBasket()->getTotalPrice()) {
$data['LOYALTY_POINTS_AMOUNT'] = (float) $order->getLoyaltyAmount();
}
}

if( $order->isRecurringPayment() === true ){
$data['LU_ENABLE_TOKEN'] = true;
if ($order->isRecurringPayment() === true) {
$data['LU_ENABLE_TOKEN'] = 1;
}

return $data;
Expand All @@ -44,16 +44,16 @@ private function serializeBilling()
$billing = $this->request->getBilling();

return array(
'BILL_LNAME' => $billing->getLastName(),
'BILL_FNAME' => $billing->getFirstName(),
'BILL_EMAIL' => $billing->getEmail(),
'BILL_PHONE' => $billing->getPhone(),
'BILL_LNAME' => $billing->getLastName(),
'BILL_FNAME' => $billing->getFirstName(),
'BILL_EMAIL' => $billing->getEmail(),
'BILL_PHONE' => $billing->getPhone(),
'BILL_COUNTRYCODE' => $billing->getCountryCode(),
'BILL_FAX' => $billing->getFax(),
'BILL_ADDRESS' => $billing->getAddress(),
'BILL_ZIPCODE' => $billing->getZipCode(),
'BILL_CITY' => $billing->getCity(),
'BILL_STATE' => $billing->getState()
'BILL_FAX' => $billing->getFax(),
'BILL_ADDRESS' => $billing->getAddress(),
'BILL_ZIPCODE' => $billing->getZipCode(),
'BILL_CITY' => $billing->getCity(),
'BILL_STATE' => $billing->getState()
);
}

Expand All @@ -64,20 +64,20 @@ private function serializeDelivery()
{
/** @var $delivery \Payu\Component\Delivery */
$delivery = $this->request->getDelivery();
if(!$delivery) {
if (!$delivery) {
return array();
}

return array(
'DELIVERY_FNAME' => $delivery->getFirstName(),
'DELIVERY_LNAME' => $delivery->getLastName(),
'DELIVERY_EMAIL' => $delivery->getEmail(),
'DELIVERY_PHONE' => $delivery->getPhone(),
'DELIVERY_COMPANY' => $delivery->getCompany(),
'DELIVERY_ADDRESS' => $delivery->getAddress(),
'DELIVERY_ZIPCODE' => $delivery->getZipCode(),
'DELIVERY_CITY' => $delivery->getCity(),
'DELIVERY_STATE' => $delivery->getState(),
'DELIVERY_FNAME' => $delivery->getFirstName(),
'DELIVERY_LNAME' => $delivery->getLastName(),
'DELIVERY_EMAIL' => $delivery->getEmail(),
'DELIVERY_PHONE' => $delivery->getPhone(),
'DELIVERY_COMPANY' => $delivery->getCompany(),
'DELIVERY_ADDRESS' => $delivery->getAddress(),
'DELIVERY_ZIPCODE' => $delivery->getZipCode(),
'DELIVERY_CITY' => $delivery->getCity(),
'DELIVERY_STATE' => $delivery->getState(),
'DELIVERY_COUNTRYCODE' => $delivery->getCountryCode()
);
}
Expand All @@ -87,18 +87,19 @@ private function serializeDelivery()
*/
private function serializeBasket()
{
$i = 0;
$i = 0;
$data = array();
/** @var $product \Payu\Component\Product */
foreach($this->request->getBasket() as $product) {
foreach ($this->request->getBasket() as $product) {
$data['ORDER_PNAME[' . $i . ']'] = $product->getName();
$data['ORDER_PCODE[' . $i . ']'] = $product->getCode();
$data['ORDER_PRICE[' . $i . ']'] = $product->getPrice();
$data['ORDER_QTY[' . $i . ']'] = $product->getQuantity();
$data['ORDER_QTY[' . $i . ']'] = $product->getQuantity();
$data['ORDER_PINFO[' . $i . ']'] = $product->getInfo();
$data['ORDER_VER[' . $i . ']'] = $product->getVersion();
$data['ORDER_VER[' . $i . ']'] = $product->getVersion();
$i++;
}

return $data;
}

Expand All @@ -115,10 +116,10 @@ public function serialize()
$this->serializeBasket()
);

$filteredData = array_filter($concatenatedData);
$filteredData['MERCHANT'] = $this->configuration->getMerchantId();
$filteredData = array_filter($concatenatedData);
$filteredData['MERCHANT'] = $this->configuration->getMerchantId();
$filteredData['ORDER_HASH'] = $this->calculateHash($filteredData);

return $filteredData;
}
}
}

0 comments on commit 7844a65

Please sign in to comment.