rabin před 1 rokem
rodič
revize
94c980fe6f
2 změnil soubory, kde provedl 4 přidání a 2 odebrání
  1. 3 1
      lib/Yspay.php
  2. 1 1
      yspay/Cash.php

+ 3 - 1
lib/Yspay.php

@@ -196,13 +196,15 @@ class Yspay extends Core
 				if ($request['platformAmount'] > 0) {
 					$mid = Dever::load('pay/yspay/cash')->getMid($this->config['id']);
 					if ($mid) {
-						$request['subOrders'][] = array
+						$subOrders = array
 						(
 							'totalAmount' => $request['platformAmount'],
 							'mid' => $mid,
 							'merOrderId' => $request['merOrderId'] . '_0',
 						);
+						$request['subOrders'][] = $subOrders;
 						$request['platformAmount'] = 0;
+						Dever::load('pay/yspay/cash')->add($order_id, $request, $subOrders);
 					}
 				}
 			}

+ 1 - 1
yspay/Cash.php

@@ -12,7 +12,7 @@ class Cash
     		$yspay = Dever::db('pay/yspay')->one(array('account_id' => $merchant['account_id']));
     		if ($yspay) {
     			$cash_per = 0;
-    			if ($yspay['type'] == 2) {
+    			if ($merchant['type'] == 1 && $yspay['type'] == 2) {
     				$cash_per = $merchant['cash_per'];
 		    		if (!$cash_per) {
 		    			if ($yspay && $yspay['cash_per']) {