Rafael Schouten
|
64fdbcf04f
|
update enterprise type spec
|
2014-09-18 18:17:31 +10:00 |
|
Rafael Schouten
|
21628ed069
|
Merge branch 'master' into ent_types_frontend2
|
2014-09-17 17:45:55 +10:00 |
|
Rafael Schouten
|
4a93e9e94f
|
Merge branch 'master' into currency
|
2014-09-17 12:49:10 +10:00 |
|
Rob Harrington
|
0fdbcc0023
|
Make dates consistent
|
2014-09-17 11:39:39 +10:00 |
|
Rob Harrington
|
eead8d665f
|
Pending bulk order mgmt specs
|
2014-09-17 11:39:20 +10:00 |
|
Rafael Schouten
|
01c98bf6e4
|
refactor and bugfix for tests
|
2014-09-17 01:07:34 +10:00 |
|
Rob Harrington
|
22e61d9834
|
TEMP: spit out variables in failing oc spec
|
2014-09-16 23:47:34 +10:00 |
|
Rob Harrington
|
279c5925ef
|
Add helpers to registration spec to counter JS weirdness
|
2014-09-16 23:46:34 +10:00 |
|
Rafael Schouten
|
1aa80e53b1
|
Merge branch 'master' into currency
Conflicts:
app/helpers/injection_helper.rb
db/suburb_seeds.rb
|
2014-09-16 10:25:22 +10:00 |
|
Rob H
|
143545da0d
|
Try newer syntax to fix spec failing on CI
|
2014-09-12 23:41:26 +10:00 |
|
Rob H
|
0815775bc3
|
Temporary fix for race condition in registration spec
|
2014-09-12 17:22:54 +10:00 |
|
Rob H
|
cb7033eea0
|
Registration spec checks enterprise created and updated
|
2014-09-12 16:42:10 +10:00 |
|
Rohan Mitchell
|
25a889375c
|
Fix unreliable spec
|
2014-09-12 16:39:47 +10:00 |
|
Rohan Mitchell
|
b41029d5d0
|
Spec reliability: Explicitly set a $0 calculator for shipping method
|
2014-09-12 16:11:31 +10:00 |
|
Rob H
|
d2c5533549
|
Remove use_short_wait
|
2014-09-12 16:10:38 +10:00 |
|
Rob H
|
05d8c825c7
|
Enterprise User should NOT see form elements for changing type
|
2014-09-12 13:40:47 +10:00 |
|
Rob H
|
bcca8c5c0d
|
Merging master into all the things
|
2014-09-12 13:28:30 +10:00 |
|
Rob H
|
f5048ecf7c
|
Sends confirmation email when Enterprise is created
|
2014-09-12 13:24:17 +10:00 |
|
Rohan Mitchell
|
4fb30f2942
|
When removing outgoing exchanges, do not removing variants from other outgoing exchanges
|
2014-09-12 12:50:04 +10:00 |
|
Rob H
|
cc65faadd0
|
Specing out enterprise registration service properly
|
2014-09-12 11:48:17 +10:00 |
|
Rohan Mitchell
|
e50bbeaefb
|
Edit product form shows permitted suppliers
|
2014-09-12 11:33:47 +10:00 |
|
Rohan Mitchell
|
a6556f3a4f
|
Fix broken JS specs
|
2014-09-12 11:12:35 +10:00 |
|
Rohan Mitchell
|
033fe88513
|
New product form shows permitted suppliers
|
2014-09-12 11:07:59 +10:00 |
|
Rob H
|
6ee3010fa7
|
Differentiation of on-boarding process by url
|
2014-09-12 11:00:34 +10:00 |
|
Rafael Schouten
|
3ea29df111
|
12 option entity categories
|
2014-09-12 10:11:59 +10:00 |
|
Rob H
|
043cc915e7
|
Removing save_screenshot calls
|
2014-09-11 22:40:03 +10:00 |
|
Rob H
|
5007fd8ec3
|
Shipping method 1 is used, so shipping method amount is zero
|
2014-09-11 22:27:05 +10:00 |
|
Rob H
|
a7a99b5048
|
Pending registration spec
|
2014-09-11 18:15:33 +10:00 |
|
Rob H
|
98f7e58f9d
|
Registration spec expects the correct url
|
2014-09-11 17:58:05 +10:00 |
|
Rob H
|
800eecea33
|
Fix failing bulk specs
|
2014-09-11 17:10:58 +10:00 |
|
Rob H
|
ef8f611458
|
Adding countries and states to registration
|
2014-09-11 17:07:05 +10:00 |
|
Rob H
|
7dc42c9e39
|
Creating an enterprise works in registration process
|
2014-09-11 17:07:05 +10:00 |
|
Rob H
|
c92aa41e28
|
Adding introduction and details pages to registration process
|
2014-09-11 16:34:19 +10:00 |
|
Rob H
|
ad56594fe9
|
Removing obsolete spec
|
2014-09-11 15:19:24 +10:00 |
|
Rob H
|
c0e4a22a6e
|
Adding enterprise_limit form element to user edit page
|
2014-09-11 15:19:24 +10:00 |
|
Rob H
|
9085741f3c
|
Removing enterprises form from user edit page
|
2014-09-11 15:19:23 +10:00 |
|
Rob H
|
eb6af408d7
|
Trailing spaces crusader: one man, a million trailing spaces
|
2014-09-11 15:19:23 +10:00 |
|
Rob H
|
60297eb5c8
|
Hide 'New Enterprise' link on index page when user has reached limit
|
2014-09-11 15:19:23 +10:00 |
|
Rob H
|
41b286f80f
|
Delete specific E2ER in spec
|
2014-09-11 14:54:51 +10:00 |
|
Rob H
|
f1c19ea64c
|
Enterprise validates owner enterprise_limit
|
2014-09-11 14:54:51 +10:00 |
|
Rob H
|
7fbc9aa680
|
User validates the number of enterprises owned
|
2014-09-11 14:54:51 +10:00 |
|
Rob H
|
e83e2295ed
|
Adding some extra controller-level specs for enterprise ownership
|
2014-09-11 14:54:51 +10:00 |
|
Rob H
|
3e1f4628e3
|
Can change owner of enterprises from index page
|
2014-09-11 14:51:22 +10:00 |
|
Rob H
|
7983b2f45a
|
Adding changing ownership to enterprise update spec
|
2014-09-11 14:39:15 +10:00 |
|
Rob H
|
13d814ff23
|
Adding user autocomplete directive to speed up specification of owner for enterprises
|
2014-09-11 14:39:15 +10:00 |
|
Rob H
|
73a32fdaf1
|
Remove distributor_info: 'how does it work' from enterprises edit page
|
2014-09-11 14:39:14 +10:00 |
|
Rob H
|
4bde6a0a3d
|
WIP: VERY SLOW PAGE LOAD: Super admin can edit owner of enterprise from edit screen
|
2014-09-11 14:39:14 +10:00 |
|
Rob H
|
138e0281a3
|
Specify owner for enterprise create action
|
2014-09-11 14:39:14 +10:00 |
|
Rob H
|
31de5d45ea
|
Adding owner to enterprise
|
2014-09-11 14:36:09 +10:00 |
|
Rafael Schouten
|
0fa4540cec
|
Merge branch 'master' into currency
|
2014-09-11 12:09:18 +10:00 |
|