raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-31 21:37:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
568 Commits 18 Branches 452 Tags
00d7fcbfb660d67416ae0bca0c8bb0cfab4451ef
Commit Graph

64 Commits

Author SHA1 Message Date
Rohan Mitchell
00d7fcbfb6 Enterprise.active_distributors finds active distributors by order cycles 2013-03-08 16:39:42 +11:00
Rohan Mitchell
98cad56e7c Enterprise.active_distributors finds active distributors by product distributions 2013-03-08 16:23:45 +11:00
Rohan Mitchell
4b642f8c90 Convert to 1.9 hash syntax 2013-03-08 15:18:53 +11:00
Rohan Mitchell
43843f05b1 WIP: Add edge case tests 2013-03-08 15:18:53 +11:00
Rohan Mitchell
d02e8fece5 WIP: Spec that no duplicates are shown 2013-03-08 15:18:53 +11:00
Rohan Mitchell
dd3c72199a WIP: Add spec for in_order_cycle 2013-03-08 15:18:53 +11:00
Rohan Mitchell
6d6390b886 WIP: Spec in_supplier_or_distributor 2013-03-08 15:18:53 +11:00
Rohan Mitchell
5c64e18360 WIP: Refactor tests - positive and negative into single cases for easier managability 2013-03-08 15:18:53 +11:00
Rohan Mitchell
29a9526b3f WIP: Add spec for in_distributor 2013-03-08 15:18:53 +11:00
Rohan Mitchell
8e1c9e7bcc WIP: Add notes, put in Spree module, write in_supplier scope spec 2013-03-08 15:18:53 +11:00
Rohan Mitchell
884dbd5de6 Keep old methods available for product distribution queries 2013-03-08 15:18:52 +11:00
Rohan Mitchell
ebf1c8602f Write new query for Product#in_distributor that queries order cycles instead of product_distributions 2013-03-08 15:18:52 +11:00
Rohan Mitchell
a5c706d694 In test, create a global shipping method, which is required when creating orders 2013-03-08 15:18:52 +11:00
Rohan Mitchell
3aa44c3e9a Setting a remote distributor clears the order cycle, and vice versa 2013-03-08 15:17:23 +11:00
Rohan Mitchell
fe824c2d4e Add order cycle active and inactive scopes 2013-03-08 15:15:15 +11:00
Rob H
2f1a9094bf Fix StaleObjectError in order model test 2013-02-14 16:49:28 +11:00
Rohan Mitchell
83e3c6815d Merge branch 'checkout-changes' 
Conflicts:
	.rvmrc
	app/helpers/application_helper.rb
 2013-01-22 10:30:51 +11:00
Rob H
f7890bd94d Fixes following code review for checkout changes 2013-01-18 19:17:55 +11:00
Rob H
8a37b4e918 Push validation logic for changing distributor down into lib class 2012-12-14 11:02:01 +11:00
Rob H
46abc2fc42 Add ability to change distributor based on whether products in the cart are available 2012-12-07 11:56:40 +11:00
Rohan Mitchell
cd13ab4f77 Fix failing tests 2012-12-04 11:39:39 +11:00
Rohan Mitchell
cfa96c7615 Each order cycle may not have duplicate exchanges between the same enterprises 2012-11-30 16:37:29 +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
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
58d227e76a Home controller and product model specs pass 2012-11-01 08:28:40 +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
d09123eb22 Do not show suppliers with no products in stock 2012-10-17 07:36:18 +11: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
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
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
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
2db2fbcade Change set_variant_attribute to set_variant_attributes, implement it on Order 2012-08-02 14:45:27 +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
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
Rohan Mitchell
4f1e4fc223 Compute itemwise shipping cost for a line item 2012-06-29 08:46:31 +10:00
Rohan Mitchell
eae05ea59c Add itemwise shipping cost calculator 2012-06-29 07:52:29 +10:00
Rohan Mitchell
1d3b7de5c6 Require ProductDistribution to be unique on [product, distributor] 2012-06-28 15:12:15 +10:00