raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-02 21:57:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,954 Commits 18 Branches 452 Tags
5a5cbbd3181a71494de522c287a165950e9f98aa
Commit Graph

16954 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohan Mitchell
693fa9f37b Enable enterprises_distributor_info_rich_text by default 2013-08-19 16:47:17 +10:00
Rohan Mitchell
010c58fffd Ignore libpeerconnection.log from phantomjs 2013-08-19 16:46:51 +10:00
David Cook
5f7cbe3882 Ensure distributor is set on payment method factories 2013-08-19 16:19:18 +10:00
David Cook
5a3ad8e68b Remove test for payment method with no distributor 2013-08-19 16:19:18 +10:00
Rohan Mitchell
562365311e Lock enterprise fee adjustments on creation to avoid them being recalculated against order by update hooks 2013-08-19 14:38:51 +10:00
Rohan Mitchell
a9b70e67df Change to using flat rate per item calculators - per-order is confusing when used against line items 2013-08-19 14:38:51 +10:00
David Cook
3ffe732b30 Ensure valid payment method is selected 2013-08-19 13:57:40 +10:00
David Cook
2d305b59d9 Only show payment methods for the distributor of the order 2013-08-19 13:57:40 +10:00
David Cook
08babeed65 Payment Method must have one Distributor 2013-08-19 13:57:40 +10:00
David Cook
6f73f41700 Create Payment Methods for each Enterprise instead of generic Payment Method 2013-08-19 13:57:40 +10:00
David Cook
77329b5532 Allow user to delete their enterprises' own payment methods 2013-08-19 13:57:40 +10:00
David Cook
4be2fe5fe9 Only show payment methods that user has access to 2013-08-19 13:57:40 +10:00
Rohan Mitchell
c1f9d9789d Extract table test to private method 2013-08-19 12:29:26 +10:00
Rohan Mitchell
ba4d3d5d7d Removing a product from cart removes its fees 2013-08-19 12:19:03 +10:00
Rohan Mitchell
6c24c0ef68 Make specs more resilient and less context-sensitive 2013-08-19 11:10:00 +10:00
Rohan Mitchell
24cd5209d6 Do not error when attempting to mix product and order cycle distribution 2013-08-19 10:41:14 +10:00
Rohan Mitchell
80d6e3b87f Do not charge for distributor fees for a distributor you're not checking out with 2013-08-19 10:41:14 +10:00
Rohan Mitchell
7a75898b2b Find exchanges going to/from any number of enterprises 2013-08-19 10:41:14 +10:00
Rohan Mitchell
e15e9a1476 Charge order cycle fees 2013-08-19 10:41:14 +10:00
Rohan Mitchell
dfd1a89975 Test whether exchanges are incoming 2013-08-19 10:41:14 +10:00
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
alexs
8ee98e3d96 Added bugherd to admin and sree frontend and re-arranged the bugherd code. 2013-08-16 15:50:45 +10:00
alexs
d73dc1dc48 Merge branch 'master' of github.com:eaterprises/openfoodweb 2013-08-16 12:13:47 +10:00
alexs
ec9bfa3114 Added BugHerd script for new landing page (staging only). 2013-08-16 12:13:25 +10:00
Andrew Spinks
82726d032c Add enterprise roles for order cycles. 2013-08-16 11:34:07 +10:00
Rohan Mitchell
19e7537b64 Style order cycle fees 2013-08-16 10:36:41 +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
715ec9b21a Send enterprise id along with exchange enterprise fees 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
20853501e1 Delete unneeded angular scripts 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
a3970dde8a Forcing POST for the search form. 2013-08-16 10:18:46 +10:00
alexs
4e715f62a2 Moved limit into the model. 2013-08-16 09:53:40 +10:00
alexs
82df7cddeb Added staging environment. 2013-08-15 17:43:21 +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
alexs
a7256611cf Merge branch 'master' of github.com:eaterprises/openfoodweb 2013-08-15 16:54:47 +10:00
alexs
da68dae586 Added unicorn-rails gem for running unicorn in dev. 2013-08-15 16:34:21 +10:00
alexs
cfffced652 Fixed the bug in the enterprise geo search. 2013-08-15 16:33:41 +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
Andrew Spinks
d160a3256a Make adding to cart via spree front end kind of work again. 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