Rohan Mitchell
|
efbf2c7ffa
|
Display extended variant name in quick cart
|
2015-03-13 12:58:53 +11:00 |
|
Rob Harrington
|
44511b8b61
|
Only display shipping description if it exists
|
2015-03-12 16:18:30 +11:00 |
|
Rob Harrington
|
6cd6b751c8
|
Merge branch 'master' into order-confirmation
|
2015-03-12 15:34:49 +11: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 |
|
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 |
|
summerscope
|
c3c1573f54
|
Adding a comment
|
2015-03-05 23:22:31 +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 |
|
Rohan Mitchell
|
b5ce056d06
|
Fix tax calculations for determining tax included in an amount
|
2015-03-05 13:03:53 +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 |
|
Matt-Yorkley
|
0f3723a923
|
Added currency symbols to sales tax report
|
2015-03-05 10:43:51 +11:00 |
|
Matt-Yorkley
|
623882a2a1
|
Config option for tax rate on shipping
|
2015-03-05 10:43:50 +11:00 |
|
Matt-Yorkley
|
371f966f63
|
sales tax view
|
2015-03-05 10:43:50 +11:00 |
|
Matt-Yorkley
|
be55f461d0
|
Report: sales tax on orders
|
2015-03-05 10:43:50 +11:00 |
|
summerscope
|
e6591be55c
|
More tweaking for email templates for use case of Collection from hub. Need to tweak logic on Order confiramtion page.
|
2015-03-04 17:34:24 +11:00 |
|
summerscope
|
5b6bff1691
|
Removing bad nasty overrides which are confusing and bad. and nasty.
|
2015-03-04 17:20:05 +11:00 |
|
summerscope
|
db2e5e7558
|
Add an extra class helper
|
2015-03-04 17:19:57 +11:00 |
|
summerscope
|
4867f45ee1
|
Add an extra style
|
2015-03-04 17:19:37 +11:00 |
|
summerscope
|
47b08269d6
|
Order confirmation page changes for responsive layout, adding in more content from the checkout page to match the emails.
|
2015-03-04 17:19:24 +11:00 |
|
summerscope
|
76f234ee4d
|
Order confirmation top page working on header label
|
2015-03-04 17:18:55 +11:00 |
|
summerscope
|
163035dcad
|
Tweaking email template to be more like order confirmation
|
2015-03-04 17:18:37 +11:00 |
|
Victor Nava
|
6e800341c3
|
Fixes issue #362 Change admin account link to point to account page instead of edit user.
|
2015-03-04 16:00:46 +11:00 |
|
summerscope
|
b097a62c7a
|
WIP adding variant name logic to the email templates
|
2015-03-04 12:37:57 +11:00 |
|
summerscope
|
f64684dc48
|
Tweak responsive heading columns now that container is a bit smaller
|
2015-03-04 11:14:29 +11:00 |
|
summerscope
|
397697d17c
|
Tweak layout. Remove unnecessary row which was messing up the responsive layout for left column on checkout.
|
2015-03-04 11:13:58 +11:00 |
|
Rob Harrington
|
85b8adb1aa
|
call to order_cycle_hub_enterprises has no arguments
|
2015-03-01 15:33:16 +11:00 |
|
Rob Harrington
|
c91699a11e
|
Using @order_cycle.coordinator instead of @coordinator
|
2015-02-27 17:24:37 +11:00 |
|
Rob Harrington
|
8d6c8791bb
|
Only hubs (sells any) are available for selection as outgoing enterprises
|
2015-02-27 17:24:36 +11:00 |
|
Rob Harrington
|
31054c7bf4
|
Split order_cycle_simple_view logic into index and form scopings
|
2015-02-27 17:24:36 +11:00 |
|
Rob Harrington
|
5563d23beb
|
Rename set_coordinator method to require_coordinator
|
2015-02-27 17:24:36 +11:00 |
|