Merge pull request #7 from lee-to/master

fixed currency, added nds, item types, fixed callback method

Author: 2Garin

wa-plugins/payment/unitpay/lib/config/settings.php

@@ -21,4 +21,12 @@
 		'description'  => 'Скопируйте SECRET KEY со страницы проекта в системе Unitpay',
 		'control_type' => 'input',
 		'class'        => 'keys',
-	));
+	),
+	'unit_item_type' => array(
+		'value'        => 'commodity',
+		'title'        => 'Тип товара',
+		'description'  => '',
+		'control_type' => 'input',
+		'class'        => 'keys',
+	)
+);

wa-plugins/payment/unitpay/lib/unitpayPayment.class.php

@@ -27,8 +27,10 @@ public function payment($payment_form_data, $order_data, $auto_submit = false)
         $sum = $order->total;
         $account = $order->id . unitpayPayment::DELIMITER . $this->merchant_id;
         $desc = $order->description;
+		$currencyCode = $order['currency'];
         $signature = hash('sha256', join('{up}', array(
             $account,
+			$currencyCode,
             $desc,
             $sum,
             $secret_key
@@ -38,6 +40,7 @@ public function payment($payment_form_data, $order_data, $auto_submit = false)
         $view = wa()->getView();
         $view->assign('domain', $domain);
         $view->assign('public_key', $public_key);
+		$view->assign('currency', $currencyCode);
         $view->assign('sum', $sum);
         $view->assign('account', $account);
         $view->assign('desc', urlencode($desc));
@@ -84,9 +87,10 @@ protected function callbackHandler($data)
     {
         if (!isset($data['params']) || !isset($data['method']) || !isset($data['params']['signature'])) {
             $result = array('error' => array('message' => 'Не переданы обязательные параметры запроса'));
+			
             return $this->returnJson($result);
         }
-
+		
         $params = $data['params'];
         $method = $data['method'];
 
@@ -116,7 +120,7 @@ protected function callbackHandler($data)
     public function pay($params)
     {
         $transaction_data = $this->formalizeData($params);
-
+		
         $transaction_data = $this->saveTransaction($transaction_data, $params);
 
         $result = $this->execAppCallback(self::CALLBACK_PAYMENT, $transaction_data);
@@ -133,7 +137,7 @@ public function formalizeData($params)
     {
         $transaction_data = parent::formalizeData($params);
         $transaction_data['order_id'] = $this->order_id;
-        $transaction_data['amount'] = $params['sum'];
+        $transaction_data['amount'] = $params['orderSum'];
         $transaction_data['native_id'] = $params['unitpayId'];
         $transaction_data['type'] = self::OPERATION_CAPTURE;
         $transaction_data['state'] = self::STATE_CAPTURED;
@@ -180,25 +184,25 @@ private function getCashItems($order)
         $orderProducts = array_map(function ($item) use ($currencyCode, $order) {
             $vat = 'none';
 
-            if (isset($order['tax_included']) && $order['tax_included']) {
-                $vat = 'vat20';
+            if (isset($item['tax_included']) && $item['tax_included'] && $item['tax_rate'] != "") {
+                $vat = $this->getTaxRates($item['tax_rate']);
             }
 
             return array(
                 'name'     => $item['name'],
                 'count'    => $item['quantity'],
                 'price'    => round($item['price'], 2),
                 'currency' => $currencyCode,
-                'type'     => 'commodity',
+                'type'     => $this->unit_item_type,
                 'nds'      => $vat,
             );
         }, $order['items']);
 
         if (isset($order['shipping']) && ($order['shipping'] > 0) && isset($order['shipping_name'])) {
             $vat = 'none';
 
-            if (isset($order['tax_included']) && $order['tax_included']) {
-                $vat = 'vat20';
+            if (isset($order['shipping_tax_included']) && $order['shipping_tax_included'] && $order['shipping_tax_rate'] != "") {
+                $vat = $this->getTaxRates($order['shipping_tax_rate']);
             }
 
             $orderProducts[] = array(
@@ -213,4 +217,22 @@ private function getCashItems($order)
 
         return base64_encode(json_encode($orderProducts));
     }
+	
+	private function getTaxRates($rate){
+        switch (intval($rate)){
+            case 10:
+                $vat = 'vat10';
+                break;
+            case 20:
+                $vat = 'vat20';
+                break;
+            case 0:
+                $vat = 'vat0';
+                break;
+            default:
+                $vat = 'none';
+        }
+
+        return $vat;
+    }
 }

wa-plugins/payment/unitpay/templates/payment.html

@@ -1,3 +1,3 @@
 <div class="pay-button">
-    <a href="https://{$domain}/pay/{$public_key}?sum={$sum}&account={$account}&signature={$signature}&desc={$desc}" style="background-color: #ffa500; padding: 10px 20px; color: white">Оплатить</a>
+    <a href="https://{$domain}/pay/{$public_key}?sum={$sum}&currency={$currency}&account={$account}&signature={$signature}&desc={$desc}" style="background-color: #ffa500; padding: 10px 20px; color: white">Оплатить</a>
 </div>

wa-plugins/payment/unitpay/templates/payment_with_both.html

@@ -1,3 +1,3 @@
 <div class="pay-button">
-    <a href="https://{$domain}/pay/{$public_key}?sum={$sum}&account={$account}&signature={$signature}&desc={$desc}&customerPhone={$customerPhone}&customerEmail={$customerEmail}&cashItems={$cashItems}" style="background-color: #ffa500; padding: 10px 20px; color: white">Оплатить</a>
+    <a href="https://{$domain}/pay/{$public_key}?sum={$sum}&currency={$currency}&account={$account}&signature={$signature}&desc={$desc}&customerPhone={$customerPhone}&customerEmail={$customerEmail}&cashItems={$cashItems}" style="background-color: #ffa500; padding: 10px 20px; color: white">Оплатить</a>
 </div>

wa-plugins/payment/unitpay/templates/payment_with_email.html

@@ -1,3 +1,3 @@
 <div class="pay-button">
-    <a href="https://{$domain}/pay/{$public_key}?sum={$sum}&account={$account}&signature={$signature}&desc={$desc}&customerEmail={$customerEmail}&cashItems={$cashItems}" style="background-color: #ffa500; padding: 10px 20px; color: white">Оплатить</a>
+    <a href="https://{$domain}/pay/{$public_key}?sum={$sum}&currency={$currency}&account={$account}&signature={$signature}&desc={$desc}&customerEmail={$customerEmail}&cashItems={$cashItems}" style="background-color: #ffa500; padding: 10px 20px; color: white">Оплатить</a>
 </div>

wa-plugins/payment/unitpay/templates/payment_with_phone.html

@@ -1,3 +1,3 @@
 <div class="pay-button">
-    <a href="https://{$domain}/pay/{$public_key}?sum={$sum}&account={$account}&signature={$signature}&desc={$desc}&customerPhone={$customerPhone}&cashItems={$cashItems}" style="background-color: #ffa500; padding: 10px 20px; color: white">Оплатить</a>
+    <a href="https://{$domain}/pay/{$public_key}?sum={$sum}&currency={$currency}&account={$account}&signature={$signature}&desc={$desc}&customerPhone={$customerPhone}&cashItems={$cashItems}" style="background-color: #ffa500; padding: 10px 20px; color: white">Оплатить</a>
 </div>