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
1,970 Commits 21 Branches 450 Tags
cdfaf4fc92b4a4594de97d03e4ef47c9eeae6b20
Commit Graph

390 Commits

Author SHA1 Message Date
Rob H
43248aee99 Add can_change_distributor validation to the Order model 2012-11-28 09:17:05 +11:00
Rohan Mitchell
d5310452b6 Admin list order cycles 2012-11-27 10:13:12 +11:00
Rohan Mitchell
47c28e65a7 Add detailed order cycle factory, add methods to report on order cycle suppliers, distributors and products/variants exchanged 2012-11-27 10:09:40 +11:00
Rohan Mitchell
6b97872a25 Create OrderCycles, Exchanges, ExchangeFees and ExchangeVariants 2012-11-26 11:03:44 +11:00
Rohan Mitchell
5e0a5654ff Correctly index calculator fields. Adds ng-bind-html-unsafe-compiled. 2012-11-23 17:02:58 +11:00
Rohan Mitchell
2a645d04ae Move presentation to presenter, display calculator fields 2012-11-22 14:37:38 +11:00
Rohan Mitchell
b7bd21e498 Full-text search of form 2012-11-22 12:15:39 +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
6247bd2541 Display admin table of enterprise fees with enterprise, fee type and name columns 2012-11-15 15:03:12 +11:00
Rohan Mitchell
03764881c8 Generalise EnterpriseSet to ModelSet 2012-11-15 14:29:38 +11:00
Rohan Mitchell
192d4993a1 Add EnterpriseFee model 2012-11-15 13:42:55 +11:00
Rohan Mitchell
580486a347 Do not show duplicate products with in_supplier_or_distributor scope 2012-11-10 12:26:41 +11:00
Rohan Mitchell
3a116dc13d Fix product filtering on supplier and distributor pages 2012-11-01 16:37:12 +11:00
Rohan Mitchell
c2133d70ac Rename Enterprise is_supplier scope to is_primary_producer 2012-11-01 15:02:57 +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
1d1c27701d Add admin interface for enterprises 2012-10-31 14:25:00 +11:00
Rohan Mitchell
4c2debba7e Model specs pass 2012-10-28 18:00:15 +11:00
Rohan Mitchell
abe3feb996 Integrate functionality from distributor into enterprise 2012-10-28 17:46:45 +11:00
Rohan Mitchell
c700d9e71b Create enterprise model, integrate functionality from supplier 2012-10-28 13:24:26 +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
d09123eb22 Do not show suppliers with no products in stock 2012-10-17 07:36:18 +11:00
Rob H
1709083d8f Merge branch 'master' of github.com:andrewspinks/openfoodweb 2012-10-10 15:45:42 +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
3b8c41840f Merge branch 'master' of github.com:andrewspinks/openfoodweb 
Conflicts:
	app/models/spree/line_item_decorator.rb
	db/migrate/20120919013335_add_shipping_method_to_line_items.rb
 2012-10-03 10:27:19 +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
85f18cfb12 Rob: Replace LineItem shipping_method method with relation 2012-09-19 14:27:28 +10:00
Rob H
fe3743af16 Replace shipping method lookup with relation 2012-09-19 12:06:43 +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
e6ee6b5164 Itemwise shipping calculator returns 0 instead of nil when there are no items 2012-08-03 08:44:53 +10:00
Rohan Mitchell
768a170bb8 Fix with_products_on_hand query for server db compatibility 2012-08-03 08:21:45 +10:00
Rohan Mitchell
8834268970 Fix error on no shipping method defined 2012-08-02 17:45:22 +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
2db2fbcade Change set_variant_attribute to set_variant_attributes, implement it on Order 2012-08-02 14:45:27 +10:00
Rohan Mitchell
361a87f580 Add group buy option to new/edit product in admin 2012-08-02 13:42:47 +10:00
Rohan Mitchell
63bf25293d Only show distributors in sidebar that have products in stock 2012-08-02 11:49:10 +10:00
Rohan Mitchell
93867682bb Only show distributors in sidebar that have products 2012-08-02 11:33:36 +10:00
Rohan Mitchell
06c6422591 Fix by-weight calculator to take line item quantity into account 2012-07-23 18:49:03 +10:00
Rohan Mitchell
718e54f933 Add distributor next_collection_at field, bulk edit in admin backend 2012-07-02 14:24:52 +10:00
Rohan Mitchell
cb56e9f658 Display delivery fee breakdown along with cart 2012-07-01 19:09:34 +10:00
Rohan Mitchell
28d2292de0 Add by-weight shipping calculator 2012-06-29 12:46:33 +10:00
Rohan Mitchell
a0c1d1d255 Look up a product's shipping method though a particular distributor 2012-06-29 11:02:34 +10:00
Rohan Mitchell
411ba107ce Perform shipping calculation in line item model 2012-06-29 10:47:11 +10:00