Victor Nava
|
208fa02ec0
|
Create a 'Show More' button at the top of the page, next to New Order on on admin order cycles index page
|
2015-03-11 13:14:45 +11:00 |
|
Victor Nava
|
2c89573441
|
Shave off a few seconds when showing order_cycles#index by loading order_cycle_enterprises only once.
|
2015-03-11 11:59:25 +11:00 |
|
Paul Mackay
|
717b3b6494
|
#275: Fixes for testing aggregated orders.
|
2015-03-10 19:19:57 +00:00 |
|
summerscope
|
ea96759306
|
Take styling out of template into SASS
|
2015-03-10 14:59:46 +11:00 |
|
summerscope
|
d967905b83
|
Tweaking copy styles and removing references to Open Sans which not using. Silly laura mixing up repos
|
2015-03-10 14:59:26 +11:00 |
|
summerscope
|
f698408d40
|
Logic for delivery vs collection - making template
|
2015-03-10 14:58:58 +11:00 |
|
summerscope
|
75b0b290ae
|
More WIP trying to work on the cart template logic with Rohan
|
2015-03-10 14:12:43 +11:00 |
|
summerscope
|
21b18a8cc5
|
WIP commit so i can see what i messed up.
|
2015-03-10 12:31:53 +11:00 |
|
summerscope
|
91bf588bcc
|
Order details page add in mini thumbnail for product image
|
2015-03-10 12:03:21 +11:00 |
|
summerscope
|
a8de4dc039
|
WIP checkout page and order confirmation page. Working on making these pages more consistent to each other, to email confirmation, and to shopping experience.
|
2015-03-10 11:35:53 +11:00 |
|
summerscope
|
c7cf9695bc
|
WIP on cart menu trying to add the master name back in where a product has variante
|
2015-03-10 11:35:35 +11:00 |
|
summerscope
|
b9a0579397
|
Add styling for image thumbnail - hide for small, show small thumbnail for big screens.
|
2015-03-10 11:35:03 +11:00 |
|
summerscope
|
de6abc3464
|
Turning off z-index this causes problems on shopping cart page. Needs testing to confirm does not break elsewhere.
|
2015-03-10 11:34:31 +11:00 |
|
Rob Harrington
|
0a300d1802
|
Rewriting small cart, so that it doesn't break all of the dropdowns on the page (can't use .row within li elements it seems...)
|
2015-03-06 19:03:46 +11:00 |
|
Rob Harrington
|
12c6878cbe
|
Using vanilla foundation
|
2015-03-06 19:02:15 +11:00 |
|
Rob Harrington
|
578475a403
|
Filter products list on shop by active properties
|
2015-03-06 16:14:11 +11:00 |
|
summerscope
|
881313edf9
|
Changing the logic on Shipping accordion on checkout to try to show shipping price against option. Not working.
|
2015-03-06 16:05:42 +11:00 |
|
Liv Galendez
|
266d6ef834
|
Fixed handling of distributors field
|
2015-03-06 11:55:35 +11:00 |
|
Victor Nava
|
3e2142c3cf
|
Remove the hover / pop-up over the # variants on admin order cycles index page
|
2015-03-06 11:33:03 +11:00 |
|
Rob Harrington
|
e948bf1591
|
Only render selector icons if the icon exists
|
2015-03-06 11:32:01 +11:00 |
|
Rob Harrington
|
06f10398da
|
Adding product property filter to shop page
|
2015-03-06 11:22:52 +11:00 |
|
summerscope
|
c3c1573f54
|
Adding a comment
|
2015-03-05 23:22:31 +11:00 |
|
Rob Harrington
|
55b8918ea1
|
Updating comment
|
2015-03-05 18:38:01 +11:00 |
|
Rob Harrington
|
067b814daa
|
Making legacy filters work properly with filter-selector directive
|
2015-03-05 18:29:12 +11:00 |
|
Rob Harrington
|
c992937608
|
Moving taxon-selector directive to correct location
|
2015-03-05 18:28:49 +11:00 |
|
Rob Harrington
|
cb623b75c1
|
Generalising taxons-selector -> filter-selector
|
2015-03-05 18:15:14 +11:00 |
|
Victor Nava
|
d6c30ae1ef
|
OrderCycle#recently_closed doesn't return orders that are open
|
2015-03-05 17:28:24 +11:00 |
|
summerscope
|
a0af22350d
|
Order conf page WIP
|
2015-03-05 17:21:25 +11:00 |
|
summerscope
|
e3b660abb9
|
Shopping cart page update to simplify, improve and expose fees
|
2015-03-05 17:21:13 +11:00 |
|
summerscope
|
9a86e41942
|
Adding more helper classes
|
2015-03-05 17:20:02 +11:00 |
|
Rob Harrington
|
e7854bcd8e
|
Moving single line selectors to template, making sure other users of taxons-selector still work
|
2015-03-05 16:38:21 +11:00 |
|
Victor Nava
|
a21bfc909a
|
Remove the suppliers column on admin order cycles index page
|
2015-03-05 16:12:31 +11:00 |
|
Victor Nava
|
1b709a3e03
|
Do not load Order Cycles that closed more than a month a go
|
2015-03-05 16:04:36 +11:00 |
|
Rob Harrington
|
0142f9467a
|
Improve display of overflow selectors
|
2015-03-05 16:00:53 +11:00 |
|
Rob Harrington
|
24b40182b5
|
clearAll for product page also clears any text search filter
|
2015-03-05 15:34:27 +11:00 |
|
Rob Harrington
|
ed94cf57d3
|
Adding the 'more' box for single-line-selectors
|
2015-03-05 15:10:42 +11:00 |
|
Rohan Mitchell
|
b5ce056d06
|
Fix tax calculations for determining tax included in an amount
|
2015-03-05 13:03:53 +11:00 |
|
Rob Harrington
|
5bddada013
|
Removing unnecessary setter
|
2015-03-05 12:18:34 +11:00 |
|
Rob Harrington
|
4afef8215a
|
Basic implementation of single line selectors
|
2015-03-05 12:12:36 +11:00 |
|
summerscope
|
574a215525
|
Order Confirmation Page WIP
|
2015-03-05 11:26:29 +11:00 |
|
summerscope
|
2cdab7af25
|
More label tweaks and logic tweaks to templates
|
2015-03-05 11:26:15 +11:00 |
|
summerscope
|
235bb009e8
|
Tweaking styling for order confirmation page
|
2015-03-05 11:25:57 +11:00 |
|
Rohan Mitchell
|
dfb855bd14
|
Record the tax included in shipping.
|
2015-03-05 10:44:27 +11:00 |
|
Rohan Mitchell
|
9395f6c808
|
Record the tax included in adjustments. TaxRate adjustments consist of 100% tax.
|
2015-03-05 10:44:26 +11:00 |
|
Rohan Mitchell
|
53fa71d1f3
|
Admin can set enterprise fee's tax category
|
2015-03-05 10:44:25 +11:00 |
|
Rohan Mitchell
|
61c08997a1
|
EnterpriseFee has a TaxCategory
|
2015-03-05 10:44:22 +11:00 |
|
Rohan Mitchell
|
ec22f4c09f
|
Sales tax report pulls sales tax from adjustments instead of recalculating it at report-time
|
2015-03-05 10:43:57 +11:00 |
|
Rohan Mitchell
|
67c77cea81
|
Tidy up haml
|
2015-03-05 10:43:54 +11:00 |
|
Rohan Mitchell
|
cc7d6cde1d
|
Shorter syntax
|
2015-03-05 10:43:54 +11:00 |
|
Matt-Yorkley
|
d194e74eda
|
Rohan's suggested changes
|
2015-03-05 10:43:51 +11:00 |
|