Rohan Mitchell
|
36fa4896ed
|
Syntax
|
2015-03-12 12:28:35 +11:00 |
|
Rohan Mitchell
|
7c723c04b6
|
Show yes/no instead of true/false
|
2015-03-12 12:23:02 +11:00 |
|
Rohan Mitchell
|
1a97df1d21
|
Fix whitespace issues
|
2015-03-12 12:17:15 +11:00 |
|
Rohan Mitchell
|
a5716cf2c2
|
Merge branch 'ordercyclemanagementreports2' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-ordercyclemanagementreports2
|
2015-03-12 12:15:22 +11:00 |
|
Rohan Mitchell
|
eccd97fc28
|
Merge branch 'master' into reduce-supplier-list-in-order-cycles
|
2015-03-12 11:55:14 +11:00 |
|
Rohan Mitchell
|
c4d4d10873
|
Reuse supplier/distributor list
|
2015-03-12 11:53:13 +11:00 |
|
Liv Galendez
|
266d6ef834
|
Fixed handling of distributors field
|
2015-03-06 11:55:35 +11:00 |
|
Rohan Mitchell
|
b5ce056d06
|
Fix tax calculations for determining tax included in an amount
|
2015-03-05 13:03:53 +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 |
|
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 |
|
Lynne Davis
|
cfa281478a
|
Adding ability to edit ShippingCategory.temperature_controlled from admin interface
|
2015-03-04 12:02:07 +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
|
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 |
|