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 |
|
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 |
|
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 |
|
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 |
|
Liv Galendez
|
7ba366e2a6
|
Added select for coordinator since there are 2 now
|
2015-03-03 20:46:25 +11:00 |
|
Lynne Davis
|
b26c46d7db
|
Removing default false from temp_controlled - shipping categories
|
2015-03-03 16:39:55 +11:00 |
|
Lynne Davis
|
72a568ffad
|
Adding not null to temp_controlled field of shipping_categories
|
2015-03-03 16:33:49 +11:00 |
|
Lynne Davis
|
3ea7ff766a
|
Removing additional merge conflicts
|
2015-03-03 16:29:17 +11:00 |
|
Lynne Davis
|
3d491d7b5e
|
LD: Adding additional functionality for order cycle management reports - adding hub code model, adding temp_controlled bool, adding delivery report
Conflicts:
app/models/customer.rb
db/migrate/20150122145607_create_customers.rb
db/schema.rb
lib/open_food_network/order_cycle_management_report.rb
|
2015-03-03 16:21:17 +11:00 |
|
Lynne Davis
|
1710c8726e
|
Fixing conflict on attempting to rebase and pull
|
2015-03-03 16:13:44 +11:00 |
|
Lynne Davis
|
2a8ba0bf42
|
Fixing merge conflicts after rebase
|
2015-03-03 16:12:07 +11:00 |
|
Lynne Davis
|
3279003fd3
|
Updating logic on temperature_controlled lookup
|
2015-03-03 16:01:42 +11:00 |
|
Lynne Davis
|
f2a35e219e
|
Updating migration on customers table with extra validation
|
2015-03-03 16:01:42 +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
|
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 |
|