Maikel Linke
711f525d98
Remove from locale en.yml
2016-03-11 14:45:43 +11:00
Maikel Linke
b7320a0bd7
Translate "Price" in Bulk Order Management
2016-03-11 12:48:35 +11:00
Maikel Linke
071ee9ab54
Add brackets to t call in js line items controller
...
The missing brackets made all columns of the bulk order management
invisible.
Also removed trailing whitespaces.
2016-03-09 18:39:23 +11:00
Maikel Linke
61fb34e738
Use user's email address as enterprise.email
...
During registration, use the given email address only as public visible
profile email address. Set the internal notification email address
`enterprise.email` to the owner's email address. That can be changed
later.
2016-03-09 14:52:52 +11:00
Maikel
f2c8ea9722
Auto-merged master into uk/account-balances on deployment.
2016-03-09 14:43:05 +11:00
Maikel Linke
d925c2aefc
Translate Spree payment, shipment and order states
...
- Copied translations for payment_states, shipment_states and order_states
into locale en.yml.
- Enabled global Javascript function `translate` to deal with scopes like
'spree.shipment_states'.
- Removed `humanize` call from order serializer and added translation
scopes to accounts page.
- Test OrderSerializer for untranslated attributes
- Require spec helper in serializer specs
2016-03-09 14:29:54 +11:00
Maikel Linke
c1647ccd2c
Set public enterprise.email_address at registration
...
Sets the public email address to the given email address as well as the
internal enterprise.email (notification email address).
The field is not mandatory any more since enterprise.email is populated
from the owner's email address if no value was given.
2016-03-04 17:50:04 +11:00
Steve Pettitt
4966290f87
Check missing lat/long instead of zero
2016-03-03 06:41:59 +00:00
Steve Pettitt
6a2319e16d
Remove producers without lat + long from map
2016-03-02 19:08:57 +00:00
Maikel Linke
587d06dced
Merge remote-tracking branch 'origin/master' into groups
...
Conflicts:
db/schema.rb
2016-03-02 15:31:35 +11:00
Rob Harrington
aff346071f
Automatically selecting a hub on inventory page when it is the only option
2016-03-02 12:10:49 +11:00
Rob Harrington
3f466e86b6
Renaming 'Override Variant Details' permission to 'Add Products To Inventory'
...
Style changes to make enterprise relationships page more useable
2016-03-02 12:10:49 +11:00
Rob Harrington
6ee4e4190e
New product count for inventory takes permissions into account
2016-03-02 12:10:22 +11:00
Rob Harrington
f288c09380
Moving inventory settings to their own section within the enterprise edit form
2016-03-02 12:10:22 +11:00
Rob Harrington
f05f88c1cb
Adding global config to allow shop users to only select from inventory variants in OC interface
2016-03-02 12:10:22 +11:00
Rob Harrington
28b143da73
WIP: Splitting Variant overrides into views
2016-03-02 12:10:22 +11:00
Rob Harrington
8f37aa0522
WIP: Adding Loading flash to variant overrides page
2016-03-02 12:10:22 +11:00
Rob Harrington
7008d26f68
WIP: Alerting user to presence of new variant for inventory, new variants can be filtered + limited
2016-03-02 12:10:22 +11:00
Rob Harrington
f06d909c23
WIP: Adding infrastructure to show/hide variants + overrides using inventory items
2016-03-02 12:10:22 +11:00
Rob Harrington
caa8818f02
Adding option to 'Inherit From Product' for enterprise_fee tax categories
2016-03-02 11:56:46 +11:00
Rob Harrington
a66582a8fb
WIP: Using directive for EnterpriseFee index select elements, to properly bind data to the model
2016-03-02 11:56:46 +11:00
Rob Harrington
0bd9dc7af0
Enterprise Fees: Splitting ng controllers and directives into separate files, reanming module and coffee-ising
2016-03-02 11:56:46 +11:00
Nicolas Blanc
4621f625a0
new validation6 02/25/2016
2016-02-25 12:36:21 +00:00
Maikel Linke
4feb7c893b
Introduce contact email address for enterprises
...
Add a new column email_address to enterprises.
Use this new field for public display of contact details.
The old field enterprise.email is still used internally.
It is still displayed on orders and emails sent to customers.
A new enterprise has the owner's email address by default now.
Fix GH #757
2016-02-24 15:14:07 +11:00
Rohan Mitchell
6193bb896b
Sanitize input for ofnTaxonAutocomplete and userSelect directives
2016-02-24 11:26:38 +11:00
Rohan Mitchell
4314bfb99c
Fix karma fail due to file load order change
2016-02-24 11:26:38 +11:00
Rohan Mitchell
ae03170984
Sanitize input for ofn-select2
2016-02-24 11:26:38 +11:00
Rohan Mitchell
977ff7b35d
Fix compatibility issues with new version of select2
2016-02-24 11:26:37 +11:00
Rohan Mitchell
258e84fc0a
Replace with-tip with ofn-with-tip: misc
2016-02-24 11:26:37 +11:00
Rohan Mitchell
b4976a5445
Replace with-tip with ofn-with-tip: enterprise forms
2016-02-24 11:26:37 +11:00
Rohan Mitchell
e2722710de
Clean up syntax
2016-02-24 11:26:37 +11:00
Rohan Mitchell
45d4dd6b88
Add ofnWithTip directive to sanitise HTML going into tooltips
2016-02-24 11:26:37 +11:00
Rohan Mitchell
6a2e07064b
Fix stomped spree JS file
2016-02-24 11:26:37 +11:00
Nicolas Blanc
c91eb9f345
new validation3 02/22/2016
2016-02-22 14:31:31 +00:00
Nicolas Blanc
44508f0f1e
new validation2 02/22/2016
2016-02-22 13:38:19 +00:00
Nicolas Blanc
1738db9e1f
new validation 02/22/2016
2016-02-22 13:00:27 +00:00
Steve Pettitt
92cfcb8fc9
remove debug statement
2016-02-20 21:22:10 +00:00
Nicolas Blanc
614f83799e
new test 2016/02/20
2016-02-20 19:23:22 +00:00
Steve Pettitt
d39b62aa31
Fallback to a default tractor logo if missing
2016-02-20 19:00:37 +00:00
Steve Pettitt
ec3e158781
Merge current master
2016-02-20 17:24:57 +00:00
Steve Pettitt
23e774bede
Styling, fewer columns in small/medium screen, logo resize
2016-02-20 17:20:43 +00:00
stveep
83d248469f
Running balances
2016-02-16 20:32:09 +00:00
Maikel Linke
bd19bf5f3c
Refactoring filter selectors
...
The FilterSelectorsService is now able to create multiple independent
lists of selectors. These lists are explicitly given to the
filter-selector directive.
For example a group's page has one set for the group's producers and one
set for the group's shops.
2016-02-04 16:08:19 +11:00
Nicolas Blanc
2be005d344
i18n from berlin hackathon
2016-01-31 12:16:33 +00:00
Steve Pettitt
4438cbd5d0
Merge branch 'uk/account-balances' of https://github.com/openfoodfoundation/openfoodnetwork into uk/account-balances
2016-01-30 19:53:53 +00:00
Steve Pettitt
ccd66bba9c
Credit/debit formatting, use filters for money formatting, use full page width for table
2016-01-28 22:42:45 +00:00
Maikel
3dd3cfa7ec
Auto-merged master into uk/account-balances on deployment.
2016-01-25 04:43:25 +11:00
Maikel Linke
d5aea1b00d
Taxon filter for group producers
2016-01-20 13:32:08 +11:00
Maikel
eeb31f65c3
Auto-merged master into combined/cart-fit-to-screen_preserve-max-quantity on deployment.
2016-01-15 16:15:09 +11:00
Rob Harrington
669642292b
Refactoring VariantOverridesController#bulk_reset to only reset VOs for a specified hub
2016-01-15 09:07:51 +11:00
