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
dd61034908
Fix fractional cents appearing on sales tax report totals
2015-03-05 10:43:57 +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
54894fb222
Update spec with correct tax amounts
2015-03-05 10:43:56 +11:00
Rohan Mitchell
11f59c9f59
Add spec for calculating shipping tax. Fix incorrect formula.
2015-03-05 10:43:56 +11:00
Rohan Mitchell
27a730ef6c
Add spec for sales tax report totals calcs
2015-03-05 10:43:56 +11:00
Rohan Mitchell
10e5d09416
Use ReportsHelper for currency_symbol
2015-03-05 10:43:56 +11:00
Rohan Mitchell
3b4d73760b
Break up sales tax report into methods
2015-03-05 10:43:55 +11:00
Rohan Mitchell
89199ef30a
Use map instead of each and var
2015-03-05 10:43:55 +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
Rohan Mitchell
0b636c1d89
Combine spec cases for faster runtime
2015-03-05 10:43:54 +11:00
Rohan Mitchell
2b9fef6aec
Convert to Ruby 1.9 hash syntax
2015-03-05 10:43:53 +11:00
Rohan Mitchell
3aa30af199
Remove unneeded objects from spec setup
2015-03-05 10:43:53 +11:00
Rohan Mitchell
0212351d32
Tighten test
2015-03-05 10:43:53 +11:00
Rohan Mitchell
29653a5595
Fix spec infinite recursion issue
2015-03-05 10:43:52 +11:00
Matt-Yorkley
e6368af757
Update reports_spec.rb
2015-03-05 10:43:52 +11:00
Matt-Yorkley
2c80be7e9e
Update
2015-03-05 10:43:52 +11:00
Matt-Yorkley
d194e74eda
Rohan's suggested changes
2015-03-05 10:43:51 +11:00
Matt-Yorkley
3f61a5412c
Spec file attempt...
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
bbca674937
Update reports_spec.rb
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
Rohan Mitchell
503bd8f5dd
Merge pull request #400 from victornava/admin-account-link
...
Change admin account link to point to account page instead of edit user.
2015-03-04 16:08:26 +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
e8818c5191
Adding a ship address to order in spec
2015-03-01 12:22:06 +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
Maikel Linke
ff4bd449a2
Setting default_country_id by application.yml
...
The spree default_country_id was set using ENV["DEFAULT_COUNTRY"] for
production environment, but not for tests and development. Since tests
reset the default_country_id in specs/support/seeds.rb, only the
development environment had a fix id set to 12. This is removed now.
This fixes creating enterprises and enterprise groups without sample
data (12 is Australia).
2015-02-26 16:29:46 +11:00
