raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-13 23:37:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,845 Commits 19 Branches 453 Tags
57504f42d89f092a46b52346bd63e6a7104329ac
Commit Graph

594 Commits

Author SHA1 Message Date
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
0d5d015d88 Extract product JSON rendering to lib class. Fix HTML stripping that never actually worked. 2016-02-24 15:05:01 +11: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
Rob Harrington
1558ddb1eb Fixing index enterprise serializer so that payment methods issue displays when no payment methods are present 2015-06-15 16:15:06 +08:00
Rob Harrington
727e8a81d6 Making sure enterprise serializer serializes no taxons as an empty array 2015-06-15 15:41:25 +08:00
Rob Harrington
066c8876ff Only serializing unresolved enterprise issues, styling tweaks and fixes for index 2015-06-12 15:49:01 +08:00
Rob Harrington
795b2700b4 Merge branch 'master' into enterprise-index-revamp 2015-06-12 12:47:58 +08:00
Rob Harrington
775718c776 Adding status panel on enterprise index 2015-06-12 12:09:00 +08:00
Rob Harrington
95073f6fe7 Adding actual link to the manage link on enterprises index 2015-06-12 01:49:37 +08:00
Rob Harrington
e575b0e490 Switching enterprise index to its own dedicated serializer, so we can spit out ownership 2015-06-12 01:49:37 +08:00
Rob Harrington
6b35e993bd WIP: More work on panel content, styling and data submission logic 2015-06-12 01:49:36 +08:00