Skip to content

I
iwl-live
Commit ff349daa authored by iWallet Dev's avatar iWallet Dev
Browse files
Options

Processing History Revert Update

parent c7b3f310
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 12 deletions
system/logic/transaction/logic.php
View file @ ff349daa
......@@ -63,10 +63,10 @@ class LogicTransaction extends TransactionModelClass {
if ($this -> lang == "en") {
$rtn = ',,Withdrawal Account Information,,,,,Deposit Account Information,,,,,,' . "\n";
$rtn .= 'Processing Date,Transaction Item,Transaction Number,Name,Account Number,Currency,Amount,Fee,Name,Account Number,Currency,Amount,Fee,Type,Exchange Rate' . "\n";
$rtn .= 'Processing Date,Transaction Item,Name,Account Number,Currency,Amount,Fee,Name,Account Number,Currency,Amount,Fee,Type,Exchange Rate' . "\n";
} else {
$rtn = ',,出金口座情報,,,,,入金口座情報,,,,,,' . "\n";
$rtn .= '処理時間,取引科目,取引番号,名前,口座番号,通貨,金額,手数料,名前,口座番号,通貨,金額,手数料,種別,為替レート' . "\n";
$rtn .= '処理時間,取引科目,名前,口座番号,通貨,金額,手数料,名前,口座番号,通貨,金額,手数料,種別,為替レート' . "\n";
}
$rtn .= $this -> getExportDetails();
......
system/logic/transaction/model.php
View file @ ff349daa
......@@ -715,7 +715,6 @@ class TransactionModelClass extends ModelClassEx {
if($row[COLUMN_TRANSACTION_TYPE] == VAL_INT_1) { // 入金
$tType = VAL_STR_DEPOSIT;
$tNumber = $this -> getColumnData($row, COLUMN_TRANSACTION_NUMBER);
$depositCur = $this -> getColumnData($row, COLUMN_DEPOSIT_CURRENCY);
$withdrawCur = NO_STRING;
$deposit = $this -> getAmountString($this -> getColumnData($row, COLUMN_DEPOSIT_AMOUNT), $depositCur);
......@@ -725,7 +724,6 @@ class TransactionModelClass extends ModelClassEx {
&& $this -> getColumnData($row, COLUMN_TYPE) == VAR_WITHDRAW_TYPE_NORMAL) { // 通常出金
$tType = VAL_STR_WITHDARAW;
$tNumber = $this -> getColumnData($row, COLUMN_TRANSACTION_NUMBER);
$depositCur = NO_STRING;
$withdrawCur = $this -> getColumnData($row, COLUMN_DEBIT_CURRENCY);
$debitCur = $this -> getColumnData($row, COLUMN_WITHDRAW_CURRENCY);
......@@ -738,7 +736,6 @@ class TransactionModelClass extends ModelClassEx {
&& $this -> getColumnData($row, COLUMN_TYPE) == VAR_WITHDRAW_TYPE_CARD) { // 通常出金
$tType = VAL_STR_WITHDRAW_CARD;
$tNumber = $this -> getColumnData($row, COLUMN_TRANSACTION_NUMBER);
$depositCur = NO_STRING;
$withdrawCur = $this -> getColumnData($row, COLUMN_DEBIT_CURRENCY);
$debitCur = $this -> getColumnData($row, COLUMN_WITHDRAW_CURRENCY);
......@@ -750,7 +747,6 @@ class TransactionModelClass extends ModelClassEx {
} else if($this -> getColumnData($row, COLUMN_TRANSACTION_TYPE) == VAL_INT_4) { // 通貨両替
$tType = VAL_STR_EXCHANGE;
$tNumber = $this -> getColumnData($row, COLUMN_TRANSACTION_NUMBER);
$depositCur = $this -> getColumnData($row, COLUMN_DEPOSIT_CURRENCY);
$withdrawCur = $this -> getColumnData($row, COLUMN_WITHDRAW_CURRENCY);
$deposit = $this -> getAmountString($this -> getColumnData($row, COLUMN_DEPOSIT_AMOUNT), $depositCur);
......@@ -760,7 +756,6 @@ class TransactionModelClass extends ModelClassEx {
&& $this -> getColumnData($row, COLUMN_TYPE) == VAR_WITHDRAW_TYPE_FEE) { // 手数料出金
$tType = VAL_STR_FEE;
$tNumber = $this -> getColumnData($row, COLUMN_TRANSACTION_NUMBER);
$depositCur = NO_STRING;
$withdrawCur = $this -> getColumnData($row, COLUMN_WITHDRAW_CURRENCY);
$deposit = NO_STRING;
......@@ -769,7 +764,6 @@ class TransactionModelClass extends ModelClassEx {
} else if($row[COLUMN_TRANSACTION_TYPE] == VAL_INT_3) { // 口座振替（出金）
$tType = VAL_STR_TRANSFER;
$tNumber = $this -> getColumnData($row, COLUMN_TRANSACTION_NUMBER);
$depositCur = $this -> getColumnData($row, COLUMN_DEPOSIT_CURRENCY);
$withdrawCur = $this -> getColumnData($row, COLUMN_WITHDRAW_CURRENCY);
$deposit = $this -> getAmountString($this -> getColumnData($row, COLUMN_DEPOSIT_AMOUNT), $depositCur);
......@@ -778,7 +772,6 @@ class TransactionModelClass extends ModelClassEx {
} else if($this -> getColumnData($row, COLUMN_TRANSACTION_TYPE) == VAL_INT_5) { // 引落（出金）
$tType = VAL_STR_REQUEST;
$tNumber = $this -> getColumnData($row, COLUMN_TRANSACTION_NUMBER);
$depositCur = $this -> getColumnData($row, COLUMN_DEPOSIT_CURRENCY);
$withdrawCur = $this -> getColumnData($row, COLUMN_WITHDRAW_CURRENCY);
$deposit = $this -> getAmountString($this -> getColumnData($row, COLUMN_DEPOSIT_AMOUNT), $depositCur);
......@@ -788,7 +781,6 @@ class TransactionModelClass extends ModelClassEx {
|| $this -> getColumnData($row, COLUMN_TRANSACTION_TYPE) == VAL_INT_8) { // 出金差戻し
$tType = VAL_STR_WITHDRAW_REFUND;
$tNumber = $this -> getColumnData($row, COLUMN_TRANSACTION_NUMBER);
$depositCur = $this -> getColumnData($row, COLUMN_DEPOSIT_CURRENCY);
$withdrawCur = NO_STRING;
$deposit = $this -> getAmountString($this -> getColumnData($row, COLUMN_DEPOSIT_AMOUNT), $depositCur);
......@@ -797,7 +789,6 @@ class TransactionModelClass extends ModelClassEx {
} else if($this -> getColumnData($row, COLUMN_TRANSACTION_TYPE) == VAL_INT_11) { // 出金差戻し
$tType = VAL_STR_FEE;
$tNumber = $this -> getColumnData($row, COLUMN_TRANSACTION_NUMBER);
$depositCur = NO_STRING;
$withdrawCur = $this -> getColumnData($row, COLUMN_DEPOSIT_CURRENCY);
$deposit = NO_STRING;
......@@ -820,7 +811,6 @@ class TransactionModelClass extends ModelClassEx {
$rtn .= $this -> getColumnData($row, COLUMN_TRANSACTION_TIME) . ','
. $tType . ','
. $tNumber . ','
. $this -> getColumnData($row, COLUMN_WITHDRAW_ACCOUNT_NAME) . ','
. $this -> getColumnData($row, COLUMN_WITHDRAW_ACCOUNT_NUMBER) . ','
. $withdrawCur . ','
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment