raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-26 20:56:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,079 Commits 18 Branches 451 Tags
9563aad9fa01ac206b752fa28a0ff594dcd55e32
Commit Graph

520 Commits

Author SHA1 Message Date
Rohan Mitchell
9563aad9fa Find exchanges with a particular variant 2013-08-19 10:41:14 +10:00
Rohan Mitchell
1d23446c40 ProductDistribution validates_presence_of enterprise fee, check no longer required 2013-08-19 10:41:14 +10:00
Rohan Mitchell
591f6a8a57 Move ProductDistribution#clear_all_enterprise_fee_adjustments_for to EnterpriseFee class 2013-08-19 10:41:14 +10:00
Rohan Mitchell
e318a1591d Add FeatureToggleHelper for tests, enabling feature toggle changes for tests 2013-08-19 10:41:14 +10:00
Rohan Mitchell
5ffd56aad7 Re-write spec with new fee display at checkout 2013-08-19 10:41:14 +10:00
Andrew Spinks
38522e2b74 Fix order cycle permissions for enterprise user. 2013-08-18 19:41:04 +10:00
Andrew Spinks
a8d4efd067 Add new 'shop' route that switches to the selected distributor and empties the cart if it has any line_items for a different distributor. 2013-08-16 17:08:19 +10:00
Andrew Spinks
82726d032c Add enterprise roles for order cycles. 2013-08-16 11:34:07 +10:00
Rohan Mitchell
290607b5bf CrUD for order cycle exchange fees 2013-08-16 10:22:29 +10:00
Rohan Mitchell
552cecb2e0 Find incoming and outgoing exchanges 2013-08-16 10:22:29 +10:00
Rohan Mitchell
4d04a24342 Translate exchange fees for processing by rails 2013-08-16 10:22:29 +10:00
Rohan Mitchell
7fc0787e36 OrderCycleFormApplicator sets exchange fees 2013-08-16 10:22:29 +10:00
Rohan Mitchell
e6fdcf581a OrderCycle can fetch the direction of an exchange (incoming/outgoing) 2013-08-16 10:22:29 +10:00
alexs
b8bc30d4ab Fixed the test setup and added the text for the bug found in 'Enterprise.find_near'. 2013-08-15 17:34:51 +10:00
Andrew Spinks
fdaa5364a1 Add controller action for adding products to multi cart via javascript API. 2013-08-15 15:36:35 +10:00
alexs
88484f2d8b Added tests for suburbs JSON. 2013-08-15 11:40:09 +10:00
alexs
c72a4a961f Added the mechanism to test JSON APIs (Rabl stuff etc.) 2013-08-15 11:38:52 +10:00
alexs
773c2b4217 Merge branch 'master' of github.com:eaterprises/openfoodweb 2013-08-14 11:31:25 +10:00
Rohan Mitchell
eaf71e28bb Raise an error when tests hit the network 2013-08-14 11:19:16 +10:00
alexs
a8a0c0513e Fixed id duplication for login and sign up forms. 2013-08-14 11:12:36 +10:00
Andrew Spinks
9c6c4724be Ensure line items only get created in correct orders when adding a product to a cart. 2013-08-14 10:49:55 +10:00
Andrew Spinks
d5791657f3 Support multiple orders when adding a product to a cart. 2013-08-14 10:49:55 +10:00
Andrew Spinks
dd3aaccf9f When adding a variant to a cart, split into multiple orders depending on the distributors that it contains. 2013-08-14 10:49:55 +10:00
Andrew Spinks
59fce8a964 Show line items for each order in multi-cart. 2013-08-14 10:49:55 +10:00
Rohan Mitchell
5fac29d2ed Do not merge current and incomplete orders when logging in - fixes #20 2013-08-14 10:44:02 +10:00
Rohan Mitchell
8ff749d0eb Find enterprises participating in an order cycle 2013-08-14 09:48:45 +10:00
Rohan Mitchell
0293942816 Add order cycle service method to add and remove exchange fees 2013-08-14 09:48:45 +10:00
Rohan Mitchell
47f6a5fbbf Add controller methods to add and remove exchange fees 2013-08-14 09:48:45 +10:00
Rohan Mitchell
4120bc3dca Output exchange fees as JSON 2013-08-14 09:48:45 +10:00
alexs
e90ccef337 Merge branch 'master' of github.com:eaterprises/openfoodweb 2013-08-13 11:40:54 +10:00
David Cook
725766d82e Feature tests for PaymentMethod in admin and checkout 2013-08-13 10:57:36 +10:00
Rohan Mitchell
f3447f2898 Remove shipping method field from product distributions 2013-08-13 10:14:51 +10:00
Rohan Mitchell
5f4313b588 Remove itemwise shipping calculator 2013-08-13 10:14:39 +10:00
Rohan Mitchell
b71f7eec3d Fix spec for charges by adjustment not shipping method 2013-08-13 09:11:26 +10:00
Rohan Mitchell
43f482a803 Remove use of deprecated rspec syntax 2013-08-13 09:11:26 +10:00
Rohan Mitchell
7677f79f17 Remove the now-unused Product#shipping_method_for_distributor 2013-08-13 09:11:26 +10:00
Rohan Mitchell
94e49d4190 Remove line item specs for removed functionality 2013-08-13 09:11:26 +10:00
Rohan Mitchell
b5d324ec8c Drop itemwise shipping method use in tests 2013-08-13 09:11:25 +10:00
Rohan Mitchell
9aad44f093 Strip shipping method mechanics out of LineItem and Order 2013-08-13 09:11:25 +10:00
Rohan Mitchell
b7ea03f7fc Remove distributor fees table at checkout, pending design of new breakdown 2013-08-13 09:11:25 +10:00
alexs
03b36bb14b Merge branch 'master' of github.com:eaterprises/openfoodweb 2013-08-12 17:35:36 +10:00
alexs
f2f507c5c7 Suburb auto-complete functionality for the new landing page. 2013-08-12 17:34:56 +10:00
David Cook
c915bb91cf More tests for distributor enterprise user roles 2013-08-12 14:44:26 +10:00
Rohan Mitchell
d7cce918f5 Instead of protecting shipping methods from destruction when referenced by product distributions, protect enterprise fees 2013-08-12 14:22:11 +10:00
Rohan Mitchell
f1485bf9c5 Remove shipping method from product distribution in factory. 2013-08-12 14:21:39 +10:00
Rohan Mitchell
af6b16ecc4 Admin can assign enterprise fees to product distributions 2013-08-12 11:05:00 +10:00
Rohan Mitchell
7ea1122833 Make spec naming consistent 2013-08-12 10:13:31 +10:00
Rohan Mitchell
14268b7be0 Create adjustment metadata when creating adjustment 2013-08-12 10:00:35 +10:00
Rohan Mitchell
149d48ff5a Add AdjustmentMetadata, for holding info about enterprise fee adjustments at time of creation 2013-08-12 10:00:35 +10:00
alexs
653525e9b0 Updated the spec to reflect the field name change. 2013-08-11 17:19:17 +10:00