diff --git a/src/filters/currency.js b/src/filters/currency.js
index aeb48f7a..7e369875 100644
--- a/src/filters/currency.js
+++ b/src/filters/currency.js
@@ -15,7 +15,7 @@ export default function ({i18n}, value, currencyCode) {
const currencyDisplayMode = settings.getCurrencyDisplayMode();
- if (currencyDisplayMode === 'symbol') {
+ if (currencyCode && currencyDisplayMode === 'symbol') {
const currencyInfo = currency.all[currencyCode];
let currencySymbol = currency.defaultCurrencySymbol;
@@ -29,9 +29,9 @@ export default function ({i18n}, value, currencyCode) {
amount: value,
symbol: currencySymbol
});
- } else if (currencyDisplayMode === 'code') {
+ } else if (currencyCode && currencyDisplayMode === 'code') {
return `${value} ${currencyCode}`;
- } else if (currencyDisplayMode === 'name') {
+ } else if (currencyCode && currencyDisplayMode === 'name') {
const currencyName = i18n.t(`currency.${currencyCode}`);
return `${value} ${currencyName}`;
} else {
diff --git a/src/lib/utils.js b/src/lib/utils.js
index 6a7899d7..681539b4 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -1,5 +1,7 @@
import CryptoJS from "crypto-js";
+import moment from 'moment';
import uaParser from 'ua-parser-js';
+
import accountConstants from '../consts/account.js';
import settings from "./settings.js";
@@ -31,6 +33,10 @@ function isBoolean(val) {
return typeof(val) === 'boolean';
}
+function formatDate(date, format) {
+ return moment(date).format(format);
+}
+
function copyObjectTo(fromObject, toObject) {
if (!isObject(fromObject)) {
return toObject;
@@ -340,6 +346,7 @@ export default {
isString,
isNumber,
isBoolean,
+ formatDate,
copyObjectTo,
copyArrayTo,
appendThousandsSeparator,
diff --git a/src/locales/en.js b/src/locales/en.js
index eb9f7b7e..8e4057fd 100644
--- a/src/locales/en.js
+++ b/src/locales/en.js
@@ -443,7 +443,6 @@ export default {
'Sign Up': 'Sign Up',
'Transaction Details': 'Transaction Details',
'Account List': 'Account List',
- 'New Transaction': 'New Transaction',
'Net assets': 'Net assets',
'Total assets': 'Total assets',
'Total liabilities': 'Total liabilities',
@@ -495,6 +494,19 @@ export default {
'Unable to move account': 'Unable to move account',
'Are you sure you want to delete this account?': 'Are you sure you want to delete this account?',
'Unable to delete this account': 'Unable to delete this account',
+ 'Add Transaction': 'Add Transaction',
+ 'Edit Transaction': 'Edit Transaction',
+ 'Expense Amount': 'Expense Amount',
+ 'Income Amount': 'Income Amount',
+ 'Transfer Out Amount': 'Transfer Out Amount',
+ 'Transfer In Amount': 'Transfer In Amount',
+ 'Category': 'Category',
+ 'Account': 'Account',
+ 'Source Account': 'Source Account',
+ 'Destination Account': 'Destination Account',
+ 'Transaction Time': 'Transaction Time',
+ 'Tags': 'Tags',
+ 'Your transaction description (optional)': 'Your transaction description (optional)',
'User Profile': 'User Profile',
'Language': 'Language',
'Auto Update Exchange Rates Data': 'Auto Update Exchange Rates Data',
diff --git a/src/locales/zh_Hans.js b/src/locales/zh_Hans.js
index 960da513..3d40e2c4 100644
--- a/src/locales/zh_Hans.js
+++ b/src/locales/zh_Hans.js
@@ -443,7 +443,6 @@ export default {
'Sign Up': '注册',
'Transaction Details': '交易详情',
'Account List': '账户列表',
- 'New Transaction': '新交易',
'Net assets': '净资产',
'Total assets': '总资产',
'Total liabilities': '总负债',
@@ -495,6 +494,19 @@ export default {
'Unable to move account': '无法移动账户',
'Are you sure you want to delete this account?': '您确定要删除该账户？',
'Unable to delete this account': '无法删除该账户',
+ 'Add Transaction': '添加交易',
+ 'Edit Transaction': '编辑交易',
+ 'Expense Amount': '支出金额',
+ 'Income Amount': '收入金额',
+ 'Transfer Out Amount': '转出金额',
+ 'Transfer In Amount': '转入金额',
+ 'Category': '分类',
+ 'Account': '账户',
+ 'Source Account': '来源账户',
+ 'Destination Account': '目标账户',
+ 'Transaction Time': '交易时间',
+ 'Tags': '标签',
+ 'Your transaction description (optional)': '你的交易描述 (可选)',
'User Profile': '用户信息',
'Language': '语言',
'Auto Update Exchange Rates Data': '自动更新汇率数据',
diff --git a/src/views/mobile/transactions/New.vue b/src/views/mobile/transactions/New.vue
index 7eac5483..a68041a4 100644
--- a/src/views/mobile/transactions/New.vue
+++ b/src/views/mobile/transactions/New.vue
@@ -1,8 +1,14 @@
-
+
+
+
+
+
+
+
-
+
@@ -11,21 +17,301 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+