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 |
|
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 |
|
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
|
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 |
|
Rohan Mitchell
|
fdde55f631
|
Add spec for ext_url filter, refactor
|
2015-02-23 10:06:42 +11:00 |
|
Maikel Linke
|
f8153c07b1
|
moving email from "web" to "contact" on group edit page
|
2015-02-22 16:20:11 +11:00 |
|
Maikel Linke
|
eade689070
|
linkToService directive to generate external links
|
2015-02-22 16:15:04 +11:00 |
|
summerscope
|
e05d64a0b4
|
WIP on groups index page. Needs work from Maikel or Rohan.
|
2015-02-20 16:43:36 +11:00 |
|
summerscope
|
985887334f
|
Tweak the padding between header and tabs.
|
2015-02-20 16:43:03 +11:00 |
|
summerscope
|
3aa06ee1e4
|
Tabs styling for groups page - making it pretty.
|
2015-02-20 16:14:50 +11:00 |
|
summerscope
|
3ab961a7e2
|
New mixin for gradients
|
2015-02-20 16:14:40 +11:00 |
|
summerscope
|
60b7a571c5
|
Tweak styling and markup for contact info in right column.
|
2015-02-20 15:35:07 +11:00 |
|
Rohan Mitchell
|
f58219eb3d
|
Split inputs into separate partials for each fieldset
|
2015-02-20 11:36:30 +11:00 |
|
Rohan Mitchell
|
176db78e64
|
Extract data fetching from views
|
2015-02-20 11:17:01 +11:00 |
|
Maikel Linke
|
98063dae60
|
setting default country by id in groups controller
|
2015-02-19 16:57:19 +11:00 |
|
Maikel Linke
|
c01d45e3af
|
Serialize move_up and move_down methods of groups
There have been race conditions in other projects using the acts_as_list
gem which could be solved by serializing.
|
2015-02-19 16:51:58 +11:00 |
|
Maikel Linke
|
d5c2abdd7e
|
stripping "undefined" in after_find and after_save callbacks instead of overriding getters
|
2015-02-19 16:33:43 +11:00 |
|
Maikel Linke
|
a0f0b3c93b
|
display only activated enterprises to add to groups
|
2015-02-19 11:14:25 +11:00 |
|
Maikel Linke
|
ecd7b16ef5
|
revert setting default country by name in enterprise controller
|
2015-02-19 11:09:43 +11:00 |
|