|
@@ -14,7 +14,14 @@ $project = function()
|
|
|
return Dever::db('pay/yspay_project')->state();
|
|
|
};
|
|
|
|
|
|
-$account_id = Dever::input('search_option_account_id');
|
|
|
+$merchant_id = Dever::input('search_option_merchant_id');
|
|
|
+if ($merchant_id) {
|
|
|
+ $merchant = Dever::db('pay/yspay_merchant')->find($merchant_id);
|
|
|
+ $account_id = $merchant['account_id'];
|
|
|
+} else {
|
|
|
+ $account_id = Dever::input('search_option_account_id');
|
|
|
+}
|
|
|
+
|
|
|
$yspay_type = 1;
|
|
|
if ($account_id) {
|
|
|
$yspay = Dever::db('pay/yspay')->find(array('account_id' => $account_id));
|