From 043439abcfac4667b8c47ea2872e9c30a9ab5c18 Mon Sep 17 00:00:00 2001 From: metoro Date: Mon, 30 Sep 2013 00:14:47 -0700 Subject: Add phone too --- views/users/new.html | 3 +++ 1 file changed, 3 insertions(+) (limited to 'views') diff --git a/views/users/new.html b/views/users/new.html index 04ebb9d0..29283514 100644 --- a/views/users/new.html +++ b/views/users/new.html @@ -21,6 +21,9 @@ Email: + + Phone: + First Name: -- cgit v1.2.3 From 055b82b9e58c2e2939c1185fef4863b57d54d6fc Mon Sep 17 00:00:00 2001 From: metoro Date: Mon, 30 Sep 2013 00:23:39 -0700 Subject: Update new.html Add phone --- views/users/new.html | 3 +++ 1 file changed, 3 insertions(+) (limited to 'views') diff --git a/views/users/new.html b/views/users/new.html index 04ebb9d0..e336af9e 100644 --- a/views/users/new.html +++ b/views/users/new.html @@ -22,6 +22,9 @@ Email: + Phone: + + First Name: -- cgit v1.2.3 From 9b3c0d1c05e2447e5dc09d480e26deba22d96766 Mon Sep 17 00:00:00 2001 From: metoro Date: Wed, 2 Oct 2013 16:26:58 -0700 Subject: Let's have website on here too --- views/users/new.html | 3 +++ 1 file changed, 3 insertions(+) (limited to 'views') diff --git a/views/users/new.html b/views/users/new.html index 29283514..3adfe651 100644 --- a/views/users/new.html +++ b/views/users/new.html @@ -302,6 +302,9 @@ + Website: + +
-- cgit v1.2.3 From f0a8f70a8d4d2e529f3137e125711c86d1da2e6f Mon Sep 17 00:00:00 2001 From: metoro Date: Wed, 2 Oct 2013 16:39:32 -0700 Subject: Fix merge issue --- views/users/new.html | 3 --- 1 file changed, 3 deletions(-) (limited to 'views') diff --git a/views/users/new.html b/views/users/new.html index 47ad247b..3adfe651 100644 --- a/views/users/new.html +++ b/views/users/new.html @@ -25,9 +25,6 @@ Phone: - Phone: - - First Name: -- cgit v1.2.3 From 676a9c336a8cda838d7350134d2781c176731e6a Mon Sep 17 00:00:00 2001 From: metoro Date: Thu, 3 Oct 2013 13:55:52 -0700 Subject: Draw merchant types from DB --- routes/users.coffee | 16 +- views/users/new.html | 600 ++++++++++++++++++++++++++------------------------- 2 files changed, 317 insertions(+), 299 deletions(-) (limited to 'views') diff --git a/routes/users.coffee b/routes/users.coffee index 2397c4a8..380379e3 100644 --- a/routes/users.coffee +++ b/routes/users.coffee @@ -24,11 +24,19 @@ module.exports = (sessions) -> ) new: (req, res) -> - res.render('users/new', - js: (-> global.js), - css: (-> global.css), + db.smembers('mts', (err, keys) -> + mts = [] + for mt in keys + db.hgetall(mt, (err, it) -> + mts.push(it) + if keys.length==mts.length + res.render('users/new', + js: (-> global.js), + css: (-> global.css), + mtypes: mts + ) + ) ) - create: (req, res) -> userkey = "user:"+req.body.username db.hgetall(userkey, (err, obj) -> diff --git a/views/users/new.html b/views/users/new.html index 3adfe651..f0d87f67 100644 --- a/views/users/new.html +++ b/views/users/new.html @@ -11,303 +11,313 @@

Register

+
+

Register

+ +

+ Username: + + + Password: + + + Contact First Name: + + + Contact Last Name: + + + Email: + + + Phone: + + +

+ Company Name: + + + Company Type: + + + + + + Website: + - Username: - - Password: - - - Email: - - - Phone: - - - First Name: - - - Last Name: - - - Company Name: - - - Company Type: - - - Address Line 1: - - - Address Line 2: - - - City: - - - Post Code: - - - State/Province: - - - Country: - - - Website: - - -
- + Address Line 1: + + + Address Line 2: + + + City: + + + Post Code: + + + State/Province: + + + Country: + +

+
+

- + \ No newline at end of file -- cgit v1.2.3 From 2ac0bef9c4515eb5e8dd3fabb82357de07932522 Mon Sep 17 00:00:00 2001 From: metoro Date: Thu, 3 Oct 2013 15:30:31 -0700 Subject: Treat blank as Other for merchant type --- views/users/new.html | 1 + 1 file changed, 1 insertion(+) (limited to 'views') diff --git a/views/users/new.html b/views/users/new.html index f0d87f67..7211c31a 100644 --- a/views/users/new.html +++ b/views/users/new.html @@ -44,6 +44,7 @@ {{#mtypes}} {{/mtypes}} + -- cgit v1.2.3