raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-15 23:57:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
290 Commits 17 Branches 453 Tags
5ac904005bfa233fc32403cceded0d027f9bec88
Commit Graph

143 Commits

Author SHA1 Message Date
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
a3042118c7 Merge branch 'group-reports' 
Conflicts:
	app/controllers/spree/admin/reports_controller_decorator.rb
	config/routes.rb
 2012-10-26 17:14:49 +11:00
Rohan Mitchell
15e91f7743 WIP Move non-admin non-Spree controllers out of Spree namespace 2012-10-25 10:45:39 +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
Rob H
41d547ac2d Minor formatting changes to Order Group Spec 2012-10-24 16:13:23 +11:00
Rob H
81b33772fe Fixes to syntax and formatting for group-reports 2012-10-24 15:21:16 +11:00
Rob H
3b855a866a Merge branch 'grouper-reports' into group-reports 2012-10-22 11:35:56 +11:00
Rob H
ddb01e4ccb WIP: Create report grouper, write reports for bulk co-ops and payments 2012-10-21 13:12:48 +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
c05911fa10 Fix spree_creditcards table renamed in Spree 1.2 upgrade, remove old pending test 2012-10-11 10:50:37 +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
Rob H
8c7ed6f4ef Merge branch 'group-buy-report' 2012-10-10 15:47:02 +11:00
Rob H
1709083d8f Merge branch 'master' of github.com:andrewspinks/openfoodweb 2012-10-10 15:45:42 +11:00
Rob H
5803da9c55 Syntax fixes for group buy report classes and tests 2012-10-10 15:13:15 +11:00
Rob H
9737f21bb8 WIP: Write body of group buy report 2012-10-10 13:46:51 +11:00
Rohan Mitchell
2535e3965b When merging orders, set distributor when target order distributor is nil 2012-10-09 08:42:29 +11:00
Rohan Mitchell
568d948cbe Destroy incomplete orders if they can't be merged, prevents that order unexpectedly appearing in cart after checkout. Also ensure all orders have a shipping method. 2012-10-05 12:09:53 +10:00
Rob H
d7a5a87aef create group buy report, display header 2012-10-03 11:49:21 +10: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
Rohan Mitchell
2aa450b072 Do not delete shipping method referenced by an order 2012-10-02 11:51:13 +10:00
Rohan Mitchell
3886ec39f7 Add web helper method to visit paths with delete method 2012-10-02 11:47:55 +10:00
Rohan Mitchell
27b7d59f46 BaseController does not attempt to merge incomplete and current orders when they have differing distributors 2012-10-02 09:44:51 +10:00
Rohan Mitchell
a1b5102476 Fix checkout totals, also amend factories for valid test shipping method data 2012-09-21 12:35:01 +10:00
Rohan Mitchell
757456dd57 Set line item shipping method in callback so that Order#update shipping calcs run correctly 2012-09-20 10:45:50 +10:00
Rohan Mitchell
3894ce946d Fix error on supplier page, add test to cover 2012-09-19 15:46:56 +10:00
Rohan Mitchell
eaca160367 Set line item shipping method when added to cart, update specs for changes to line item shipping method 2012-09-19 15:01:50 +10:00
Rohan Mitchell
3794c00856 Upgrade Rails to 3.2.8 and Spree to 1.1.3 2012-09-14 10:20:52 +10:00
Rohan Mitchell
b87c59c051 Default to blank distributor on add to cart to require user to select one 2012-09-13 15:29:04 +10:00
Rohan Mitchell
9dd94eaf57 Weight shipping calculator treats variants without weight defined as zero weight 2012-08-08 15:29:47 +10:00
Rohan Mitchell
9f013f0e37 When loading distributors for sidebar, only show those that have active products on hand 2012-08-04 17:51:08 +10:00
Rohan Mitchell
f3ffba378a Add a product with variants to the cart with max quantity for a group buy 2012-08-03 18:05:45 +10:00
Rohan Mitchell
e6ee6b5164 Itemwise shipping calculator returns 0 instead of nil when there are no items 2012-08-03 08:44:53 +10:00
Rohan Mitchell
fe61b4aab1 Display shipping fee at all steps of the checkout process, not just after delivery method is chosen 2012-08-02 16:24:08 +10:00
Rohan Mitchell
77be0dd6eb Adding a product with a max quantity less than quantity results in max_quantity==quantity 2012-08-02 15:26:13 +10:00
Rohan Mitchell
40544eb27b Adding a product to cart that is not a group buy does not show max quantity field 2012-08-02 15:16:44 +10:00