Commit Graph

2027 Commits

Author SHA1 Message Date
Rohan Mitchell
32ffd05ba0 Order cycle can have the same enterprise participating as supplier, coordinator and distributor 2014-04-02 11:54:28 +11:00
Rohan Mitchell
98d599e5f7 Fix order cycle failing to save after a failing submit to server 2014-04-02 11:38:59 +11:00
Rohan Mitchell
9e74a72985 Fix silent fail when order cycle coordinator not filled out 2014-04-02 10:35:16 +11:00
Rohan Mitchell
e2fb593baf Fix deployment issue: sass-rails needs to be in default group for application.rb config, and in assets group so that it's required. 2014-04-02 08:55:25 +11:00
Will Marshall
d9e86ae395 Some more minor refactoring 2014-04-01 16:58:50 +11:00
Will Marshall
bd4623bc71 Reworking the tests a little more for FASTER 2014-04-01 14:11:48 +11:00
Will Marshall
749abd82e8 Undoing previous change: no performance fix 2014-04-01 14:02:25 +11:00
Will Marshall
da479b7534 Fast version of OC selection 2014-04-01 14:01:57 +11:00
Will Marshall
5153c44aa0 Refactoring checkout specs some more 2014-04-01 13:53:37 +11:00
Will Marshall
f8f37abe32 Reworking the checkout spec slightly 2014-04-01 13:44:36 +11:00
Will Marshall
02fd21d99e gs 2014-04-01 13:29:35 +11:00
Will Marshall
a4e19ddc98 Tweaking the change hub text 2014-04-01 13:12:16 +11:00
Will Marshall
403ad797ac Tidying up the cart 2014-04-01 12:42:42 +11:00
Will Marshall
e51f1b508d Fixing the empty cart button 2014-04-01 12:39:47 +11:00
Will Marshall
e203d811b9 Adding some links to account sidebar 2014-04-01 12:31:02 +11:00
Will Marshall
1b69087a1c Loading indicator 2014-04-01 12:01:51 +11:00
Will Marshall
11a6470d6d Patching modals 2014-04-01 11:39:08 +11:00
Will Marshall
bda1ef5513 Adding a cart icon with count 2014-03-28 17:09:16 +11:00
Will Marshall
5d36dc5b4f Moving User Account to darkswarm 2014-03-28 16:02:32 +11:00
Will Marshall
784df982d6 Disabling the link when the previous distributor is the old distributor 2014-03-28 16:02:32 +11:00
Will Marshall
6f50c45bba Adding the last checkout distributor to the account link 2014-03-28 16:02:32 +11:00
Will Marshall
197f1cfa72 Further improving the navigation 2014-03-28 16:02:32 +11:00
Will Marshall
e1465352d0 Improving the navigation by moving it all to a service, adding a generic icon 2014-03-28 16:02:31 +11:00
Will Marshall
12b1a1b0e9 Switching our recover password form to Darkswarm 2014-03-28 16:02:31 +11:00
Rohan Mitchell
a97f0439e1 Fix 'undefined method sass' - we need sass-rails in production env 2014-03-28 15:57:29 +11:00
Rohan Mitchell
da6ba04780 Update variant weight from unit value when unit is weight 2014-03-28 15:34:26 +11:00
Rohan Mitchell
466b10e797 Select all distributed products on order cycle admin page 2014-03-28 15:34:26 +11:00
Rohan Mitchell
fddfdf8050 Select all supplied products on order cycle admin page 2014-03-28 15:34:26 +11:00
Rohan Mitchell
b8147474e8 Add label tags around order cycle admin checkboxes and labels 2014-03-28 15:34:26 +11:00
Rob H
b74a845875 Merge branch 'master' into bom 2014-03-28 14:42:15 +11:00
Rob H
ee147c232e WIP: Remove changes to variant bulk show casuing issues 2014-03-28 14:41:03 +11:00
Rob H
771ccc6e76 Merge branch 'capybara-fails' into bom 2014-03-28 13:52:17 +11:00
Rob H
73271fa45a Fix BOM regression bugs caused by capybara upgrade 2014-03-28 13:50:10 +11:00
Rob H
4d65427d18 Fix BPE regression bugs caused by capybara upgrade 2014-03-28 12:11:36 +11:00
Will Marshall
89fcf50762 Tidying up tabs 2014-03-27 16:36:12 +11:00
Will Marshall
08c25b1604 Getting a success message in place 2014-03-27 16:26:22 +11:00
Will Marshall
54491e0de2 Syncing up the email addresses between the SpreeUser tabs 2014-03-27 16:17:51 +11:00
Will Marshall
d8160bc6d5 Partially fixing the visible issue 2014-03-27 16:12:18 +11:00
Rob H
ab14bf70ab Merge branch 'bpe_issues' into bom 2014-03-27 15:39:37 +11:00
Rob H
dae2d9db9e BPE: Set defaults for price and on_hand to prevent 'I'm a teapot' error (418) on update 2014-03-27 15:38:44 +11:00
Rob H
2b035459fd BPE: Adding blank filters alerts the user 2014-03-27 15:13:00 +11:00
Will Marshall
e48a25983a Starting a working forgot password system 2014-03-27 15:11:11 +11:00
Will Marshall
adcd5e1c8d Fixing a regression issue 2014-03-27 14:30:52 +11:00
Rob H
9c65dd2ace BOM: add warning message about missing unit values to group buy calc box 2014-03-27 14:18:00 +11:00
Rob H
0c2e215fef BOM: Add a method to check that all selected variants have a unit_value 2014-03-27 14:11:19 +11:00
Will Marshall
2be9ad7dd0 Starting with our own passwords controller 2014-03-27 13:52:02 +11:00
Will Marshall
2158937f82 Adding a sidebar tab 2014-03-27 13:34:38 +11:00
Rob H
a260a3fa56 BOM: Fixed bug causing Order Cycles filter to break in some cases 2014-03-27 13:32:26 +11:00
Will Marshall
b5f1464ce9 Patching more regression issues 2014-03-27 13:01:06 +11:00
Will Marshall
3976694dad Patching up some regressions 2014-03-27 13:01:05 +11:00