raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,200 Commits 21 Branches 450 Tags
bf61d12bfaedabb0fe1dd117a4e2b6f4f0552e64
Commit Graph

98 Commits

Author SHA1 Message Date
Will Marshall
27728d6f0e Adding our first request spec 2014-05-05 12:10:14 +10:00
Rohan Mitchell
488fc2d60e Upgrade capybara, spec/requests changed to spec/features 2013-01-15 10:10:24 +11:00
Rohan Mitchell
e46d61075e Simplify field naming 2013-01-10 15:33:56 +11:00
Rohan Mitchell
4e78fa19a3 Add spec for updating order cycle, minor fixes 2013-01-10 15:29:13 +11:00
Rohan Mitchell
31ea8540ea Test editing an order cycle - all data is displayed 2013-01-10 15:02:56 +11:00
Rohan Mitchell
ba19db3ccf Add or update exchange variants when creating or updating order cycles 2013-01-09 10:06:51 +11:00
Rohan Mitchell
043e67fd9d Test adding suppliers 2013-01-08 11:58:49 +11:00
Rohan Mitchell
a0c40607ec Bulk update order cycle opening/closing times 2012-12-02 15:43:05 +11:00
Rohan Mitchell
aacc36ea44 Create order cycle basic fields 2012-11-29 10:02:23 +11:00
Rohan Mitchell
d5310452b6 Admin list order cycles 2012-11-27 10:13:12 +11:00
Rohan Mitchell
7a6d930706 Merge branch 'enterprise-fees' 2012-11-26 10:13:48 +11:00
Rohan Mitchell
6106f1b469 Calculator type change works, enterprise fee tests pass 2012-11-26 09:45:06 +11:00
Rohan Mitchell
e2b0770c35 Fix name of button in spec 2012-11-21 16:02:12 +11:00
Rohan Mitchell
fa2addd025 Delete enterprise fee 2012-11-21 12:17:19 +11:00
Rohan Mitchell
77b78f5bbb Edit enterprise fee 2012-11-21 11:50:37 +11:00
Rohan Mitchell
a4d10ab4e0 Create new enterprise fee, display errors when present 2012-11-21 09:47:51 +11:00
Rohan Mitchell
ff0d2bc983 Create EnterpriseSet as subclass of ModelSet 2012-11-21 09:08:41 +11:00
Rohan Mitchell
98143ffe5b Add calculator to EnterpriseFee, test passes for listing enterprise fees 2012-11-16 16:07:40 +11:00
Rohan Mitchell
03764881c8 Generalise EnterpriseSet to ModelSet 2012-11-15 14:29:38 +11:00
Rohan Mitchell
3a116dc13d Fix product filtering on supplier and distributor pages 2012-11-01 16:37:12 +11:00
Rohan Mitchell
a7a8b8490b Add test for viewing a CMS page 2012-11-01 11:31:08 +11:00
Rohan Mitchell
6d84cf7613 Merge branch 'master' into enterprises 
Conflicts:
	app/controllers/enterprises_controller.rb
	app/views/spree/checkout/_distributor.html.haml
	db/schema.rb
	spec/lib/open_food_web/group_buy_report_spec.rb
 2012-11-01 11:02:02 +11:00
Rohan Mitchell
d89945bbb2 Add smoke test for reports, fix use of old Distributor model 2012-11-01 10:20:06 +11:00
Rohan Mitchell
34588e6141 Remove old supplier and distributor routes, models, controllers, views, specs 2012-11-01 09:55:45 +11:00
Rohan Mitchell
d927906934 Update admin views, tests pass 2012-11-01 08:36:40 +11:00
Rohan Mitchell
fb9f59213f Distributors, product, suppliers and taxonomy specs pass 2012-11-01 08:15:50 +11:00
Rohan Mitchell
f8c2c8bbed Convert group buy unit size field from string to float 2012-11-01 08:02:11 +11:00
Rohan Mitchell
7dd42b7feb Fix use of pickup_address and url fields with enterprises, checkout spec passes 2012-10-31 17:10:21 +11:00
Rohan Mitchell
9d5c127f0d Add enterprises controller that supercedes suppliers and distributors controllers. Add to cart consumer spec passes. 2012-10-31 16:47:01 +11:00
Rohan Mitchell
1d1c27701d Add admin interface for enterprises 2012-10-31 14:25:00 +11:00
Rohan Mitchell
c5941d6cb5 Update distributor details when distributor is changed 2012-10-27 18:50:09 +11:00
Rohan Mitchell
773adca838 Display distributor details on product page when distributor is selected 2012-10-27 12:49:57 +11:00
Rohan Mitchell
13317347bb Display an explanation message on product page when no distributor is selected 2012-10-27 12:19:44 +11:00
Rohan Mitchell
c46019d68c WIP: Move Supplier, Distributor, DistributorSet and ProductDistribution models out of Spree namespace 2012-10-25 10:45:39 +11:00
Rohan Mitchell
5b025a6cba Make group_buy_unit_size accessible 2012-10-18 15:15:54 +11:00
Rohan Mitchell
9166829930 Add group buy unit size field 2012-10-18 11:56:21 +11:00
Rohan Mitchell
36d342f216 Add view all suppliers page 2012-10-17 07:50:58 +11:00
Rohan Mitchell
d09123eb22 Do not show suppliers with no products in stock 2012-10-17 07:36:18 +11:00
Rohan Mitchell
927970d1a9 Viewing another products listing page does not display home page content 2012-10-12 09:39:49 +11:00
Rohan Mitchell
3dd3d8030f Display CMS pages in menu 2012-10-11 17:00:34 +11:00
Rohan Mitchell
cab61ddb7c CMS content on home page 2012-10-11 16:21:33 +11:00
Rohan Mitchell
015b7f88b0 Add tests for CMS admin security 2012-10-11 13:17:05 +11:00
Rohan Mitchell
28fc16ac66 Create links between Spree and CMS admin sections 2012-10-11 12:50:59 +11:00
Rohan Mitchell
a686a820d9 Add distributor show page, redirect here after selecting distributor 2012-10-11 10:50:36 +11:00
Rohan Mitchell
0b830a7845 Suppliers and distributors long description editable with WYSIWYG editor from CMS and displayed as HTML 2012-10-11 10:50:36 +11:00
Rohan Mitchell
58e5724f81 Display supplier details on supplier page 2012-10-11 10:50:36 +11:00
Rohan Mitchell
c07a33d88c Edit long description field in admin for suppliers and distributors 2012-10-11 10:50:36 +11:00
Rohan Mitchell
6d9257d941 Do not delete shipping method referenced by a line item 2012-10-02 12:15:09 +10:00
Rohan Mitchell
7430fc9bdd Do not delete shipping method referenced by a product distribution 2012-10-02 11:58:18 +10:00
Rohan Mitchell
473b4e9adc Add positive case test 2012-10-02 11:54:18 +10:00