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 |
|
Paul Mackay
|
ca665dc6bc
|
Merge master into producer-emails.
|
2015-03-04 19:09:43 +00: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 |
|
Lynne Davis
|
cfa281478a
|
Adding ability to edit ShippingCategory.temperature_controlled from admin interface
|
2015-03-04 12:02:07 +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 |
|
Liv Galendez
|
c940a34ec9
|
Created order_cycle_permitted_in helper
|
2015-03-03 21:03:01 +11:00 |
|
Liv Galendez
|
fc63d8719c
|
Used order_cycle_permitted_enterprises helper in order cycles row
|
2015-03-03 20:53:39 +11:00 |
|
Lynne Davis
|
2a8ba0bf42
|
Fixing merge conflicts after rebase
|
2015-03-03 16:12:07 +11:00 |
|
Lynne Davis
|
39c5f8febe
|
Updating Customer model with validations
|
2015-03-03 16:01:42 +11:00 |
|
Lynne Davis
|
87b1ab9a1a
|
LD: Adding additional functionality for order cycle management reports - adding hub code model, adding temp_controlled bool, adding delivery report
|
2015-03-03 16:01:42 +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 |
|
Rob Harrington
|
8de6f983a2
|
User must set the coordinator first when creating an order cycle
|
2015-02-27 17:24:36 +11:00 |
|
Rob Harrington
|
53594b3a0f
|
Cannot add unconfirmed enterprises to order cycles
|
2015-02-27 17:24:36 +11:00 |
|
summerscope
|
f8619092bd
|
Merge branch 'order-confirmation' into master.
Global email tweak - light header, black logo.
This updates the order confirmation emails for better content and styling.
|
2015-02-27 17:16:35 +11:00 |
|
summerscope
|
2c2352cd4e
|
Final tweaks to different layout use cases for these emails.
|
2015-02-27 17:14:33 +11:00 |
|
summerscope
|
12bfb9301a
|
More updates dealing with pick up instructions.
|
2015-02-27 17:09:59 +11:00 |
|
summerscope
|
ba0d4c2111
|
More order confirmation email updates. Making language correct for hub vs user.
|
2015-02-27 16:55:36 +11:00 |
|
summerscope
|
4eee86a240
|
Tweak label
|
2015-02-27 16:09:14 +11:00 |
|
summerscope
|
587e4ae86d
|
WIP getting all the confirmation details right for collection, delivery, etc.
|
2015-02-27 16:08:20 +11:00 |
|
Maikel Linke
|
60c246f104
|
fixing side menu ng-show of items
|
2015-02-27 15:21:23 +11:00 |
|
summerscope
|
87842ecaf5
|
More WIP confirmation email for customer and shopfront. fixing up the order summary table. overall design improvements.
|
2015-02-27 14:00:49 +11:00 |
|
summerscope
|
2ba632456f
|
WIP email mailer updates for customer email confirmation etc.
|
2015-02-27 12:40:13 +11:00 |
|
Maikel Linke
|
3beff77164
|
Merge remote-tracking branch 'origin/master' into group-pages
|
2015-02-26 17:22:13 +11:00 |
|
Maikel Linke
|
69fd3f0b60
|
Fix link to group pages if someone enters "/groups/" instead of "/group"
|
2015-02-26 16:41:51 +11:00 |
|
Rohan Mitchell
|
fa4741eb65
|
Update auto-creation of E2E links: more specific and restricted link creation
|
2015-02-26 13:49:15 +11:00 |
|
Maikel Linke
|
1f7aec0c1d
|
group owner select box in own tab
|
2015-02-26 13:09:46 +11:00 |
|
summerscope
|
fc7abd5d02
|
Changing order of tabs at top of shopfront, leaving more room for long shopfront names in about tab
|
2015-02-25 16:20:10 +11:00 |
|
summerscope
|
469b383781
|
Properties and shopfront filters with taxons WIP.
|
2015-02-25 16:04:32 +11:00 |
|
summerscope
|
15144bdddd
|
WIP search input on shopfront page.
|
2015-02-25 13:18:45 +11:00 |
|
summerscope
|
d43f367f30
|
Shopfront Properties - WIP layout work
|
2015-02-25 11:11:09 +11:00 |
|
summerscope
|
304bde3b9e
|
Working on the filters for shopfront properties and updates.
|
2015-02-25 10:46:51 +11:00 |
|
summerscope
|
e9fca885db
|
WIP layout changes for shopfront top
|
2015-02-25 10:46:43 +11:00 |
|
summerscope
|
122cf6c065
|
Groups index page styling for responsive use cases.
|
2015-02-25 10:22:33 +11:00 |
|
summerscope
|
9daf7e3955
|
Removing spans on follow icons as these show up as blank spaces when no data to fill.
|
2015-02-25 09:38:07 +11:00 |
|