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
Rohan Mitchell
e16ca82e76
Extract product JSON rendering to lib class. Fix HTML stripping that never actually worked.
2016-03-02 12:10:22 +11:00
Rob Harrington
77e74c5642
OC Coordinators can opt to restrict products in an order cycle to those in their inventory only
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
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
Steve Pettitt
b84f49a1c3
Satisfy style police
2016-02-24 20:39:26 +00:00
Steve Pettitt
8e88cd6255
Localise dates
2016-02-24 20:33:37 +00:00
Steve Pettitt
d5e51dada6
Don't serialize payment ID (not used)
2016-02-20 17:22:26 +00:00
Steve Pettitt
79808acd9f
Merge branch 'uk/account-balances' of https://github.com/openfoodfoundation/openfoodnetwork into uk/account-balances
2016-01-31 11:00:18 +00:00
Steve Pettitt
dcb07237d8
Spec worked, links didn't :)
2016-01-31 11:00:07 +00:00
Maikel
381fb6291e
Auto-merged master into uk/account-balances on deployment.
2016-01-31 21:35:44 +11:00
Steve Pettitt
e3b9ce4d80
Delegate url helper to pass specs
2016-01-31 10:28:19 +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
Rohan Mitchell
533124fe91
Display receival instructions when editing order cycle
2016-01-29 12:17:20 +11: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
Steve Pettitt
c9a8d7efa5
Message for users with no orders
2016-01-22 19:49:03 +00: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
Steve Pettitt
e423e890e0
Changed name enable_reset to resettable in Variant Overrides table & updated views, specs accordingly
2016-01-15 09:07:50 +11:00
Steve Pettitt
0ee078e232
Added toggle to enable/disable reset stock. Updated specs
2016-01-15 09:07:48 +11:00
Steve Pettitt
34c603a9c3
Added angular service tests for variant overrides stock reset
2016-01-15 09:07:48 +11:00
Rob Harrington
521f227f74
Adding sku and on_demand to VariantOverride
2016-01-13 18:49:33 +11:00
Steve Pettitt
f5db1cd921
Images, first attempt at column formatting
2016-01-10 15:53:14 +00:00
Steve Pettitt
262a8e75f9
slugs
2016-01-10 07:58:04 +00:00
Rohan Mitchell
037c524df2
Preserve max quantity when reloading shopfront
2016-01-07 16:35:54 +11:00
stveep
6992d66202
Add payments data, reformat dates
2016-01-01 09:37:21 -05:00
stveep
da0810382b
Sorting by most orders, currency symbol, hide until clicked, reformatting table headers
2015-12-21 22:19:00 +00:00
stveep
90e627ad60
Data manipulation and balance calc in rails instead
2015-12-21 17:40:36 +00:00
stveep
7e50cc9ce8
Data organisation in angular, basic table structure and balance calculation.
2015-12-21 14:12:38 +00:00
stveep
16ab8f04c3
Angularise /account page: Order service/controller, rough layout
2015-12-18 17:06:04 +00:00
Rob Harrington
c91f1301f0
Adding preferences to enterprises for sorting of order cycles in shopfront list
2015-12-16 11:55:23 +11:00
Rohan Mitchell
3f8d470d23
When admin associates user with an order, look up last used address
2015-12-11 13:06:59 +11:00
Rohan Mitchell
e33ede0ec2
Include order cycle status in new order form
2015-12-11 13:06:58 +11:00
Rohan Mitchell
c74463404d
Only show order cycle options that include the chosen distributor
2015-12-11 13:06:57 +11:00
Rohan Mitchell
eb07680f1f
Inject shops and order cycles
2015-12-11 13:06:57 +11:00
Rohan Mitchell
8d270e919f
Sort exchanges for display when editing an order cycle
2015-12-10 09:17:25 +11:00
Rohan Mitchell
8c0a82f26f
Provide issues summary for enterprises, pass enterprises through to controller
2015-12-10 09:17:25 +11:00
Rohan Mitchell
93c42d24c7
Extract issue detection into service object
2015-12-10 09:17:25 +11:00
Rohan Mitchell
036ffeb634
Enterprise service splits enterprises into hubs and producers
2015-12-10 09:17:25 +11:00
Maikel Linke
d5c4da3bf0
Not using Paperclip's to avoid HTTP calls to S3
2015-12-04 10:37:55 +11:00
Rob Harrington
69ead3c829
Line items serialiser gives a sensible value for max_quantity
2015-11-12 09:47:12 +11:00
Rob Harrington
b43049af47
WIP: BOM Refactor, building line_item fetch and update logic with ngResource
2015-11-04 18:16:17 +11:00
Rob Harrington
f563f04f1c
WIP: BOM Refactor, building order fetch and update logic with ngResource, updating rails routes
2015-11-04 16:35:56 +11:00
Rob Harrington
ab7bfd10c5
Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module"
...
This reverts commit e86e08b72e939fee61eddd41d56081395666a877.
Conflicts:
lib/open_food_network/order_and_distributor_report.rb
spec/features/admin/variants_spec.rb
spec/lib/open_food_network/order_and_distributor_report_spec.rb
2015-10-28 13:08:50 +11:00
Rob Harrington
795830d94d
Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module
2015-10-28 13:07:31 +11:00
Lynne Davis
8639109372
Variable weights improvements additions
2015-08-04 20:13:28 +01:00
Rohan Mitchell
6ed9a2620c
Use indexed_fees_for for product price
2015-06-18 13:07:52 +10:00
