raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-28 21:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,276 Commits 20 Branches 451 Tags
ea17e475a605fdffd58ee80074d2d8cbaf85d8b2
Commit Graph

627 Commits

Author SHA1 Message Date
Rohan Mitchell
ea17e475a6 When viewing enterprise fees, only show those for the enterprise I select 2013-10-18 14:44:01 +11:00
Rohan Mitchell
91f14dcd4c Enterprise manager can create/edit enterprise fees 2013-10-18 13:56:22 +11:00
Rohan Mitchell
3b5e6f5742 When viewing shipping methods, only show those for the distributor I select 2013-10-18 10:01:11 +11:00
Rohan Mitchell
c07c52085a Enterprise user can view and create shipping methods 2013-10-18 09:35:53 +11:00
Rohan Mitchell
e6041aaf2f Enterprise user can view, create and edit payment methods 2013-10-18 09:09:53 +11:00
Rohan Mitchell
05932a69cd Adjust checkout spec for shipping method HABTM distributors 2013-10-17 12:30:26 +11:00
Rohan Mitchell
358ca25f31 Admin can assign multiple distributors to a shipping method 2013-10-17 11:16:26 +11:00
Rohan Mitchell
93cb845ee2 DB and model changes to make ShippingMethod distributor habtm 2013-10-17 11:15:43 +11:00
Rohan Mitchell
8654f23a19 Move spree model decorator specs into their own dir to mirror model dir layout 2013-10-17 09:53:54 +11:00
Rohan Mitchell
d480e96d7a Do not add an extra product which confuses other tests 2013-10-16 17:38:39 +11:00
Rohan Mitchell
e29497c5b4 Enterprise users can bulk edit inactive products 2013-10-16 16:57:20 +11:00
Rohan Mitchell
751801653e Bulk product update with >25 products succeeds 2013-10-16 14:36:22 +11:00
Rohan Mitchell
c5228c9ad2 Fix home controller for oc hit by global before_filter 2013-09-30 17:22:55 +10:00
Rohan Mitchell
30bc45370b When order cycle expires mid-order, clear the order cycle and display a message 2013-09-30 16:56:11 +10:00
Rohan Mitchell
8353413c4a Fix spec fail 2013-09-30 15:13:02 +10:00
Rohan Mitchell
935229fa09 On order show / confirmation page, show correct pickup time for order cycle pickup 2013-09-30 14:53:28 +10:00
Rohan Mitchell
57aa10a6f6 Fix specs for time zone change 2013-09-30 11:40:05 +10:00
Rohan Mitchell
f5b56617a0 As an enterprise user, when I create an enterprise, I should have management permission for it 2013-09-30 11:10:20 +10:00
Rohan Mitchell
1d4198d402 Removing a supplier exchange removes variants from distribution 2013-09-30 09:46:39 +10:00
Rohan Mitchell
32204076bd Update js specs for pagination fix 2013-09-30 09:18:49 +10:00
Rohan Mitchell
208ffb3317 Fix commented-out order cycle specs 2013-09-27 16:02:06 +10:00
Rohan Mitchell
01036ec730 Add LineItem#supplied_by scope, fixes orders and fulfillment report supplier filtering 2013-09-27 14:11:12 +10:00
Rohan Mitchell
dac49d1044 Order cycle-aware pickup time 2013-09-27 11:17:24 +10:00
Rohan Mitchell
68fe20c37a Add scope: Exchange.with_product 2013-09-23 17:39:16 +10:00
Rohan Mitchell
19349c805f Destroy supplied products when a supplier is destroyed 2013-09-23 14:58:26 +10:00
Rohan Mitchell
450a1e49c2 Do not 500 when add to cart fails 2013-09-23 14:15:53 +10:00
Rohan Mitchell
741a81a427 Fix spec fails - do not redirect on Products#show when distributor not set 2013-09-23 14:00:33 +10:00
Rohan Mitchell
072ce67b78 Redirect if distributor not chosen 2013-09-23 13:39:13 +10:00
Rohan Mitchell
803594b4d7 Confirm change hub when it would empty cart 2013-09-23 10:07:25 +10:00
Rohan Mitchell
d100d12ebe When a variant is removed from supply to an order cycle, remove it from distribution also 2013-09-20 11:11:59 +10:00
Rohan Mitchell
c9e543b25a Update delivery page of checkout, change shipping to delivery 2013-09-19 13:40:49 +10:00
Rohan Mitchell
08941ae22b Data integrity 2013-09-19 11:22:55 +10:00
David Cook
5ec3c1831d Only show order cycles that the user has access to in reports drop-down 2013-09-18 09:26:50 +10:00
David Cook
fe513d42c4 Rename 'Order Cycles' report group to 'Orders & Fulfillment' 2013-09-18 09:25:51 +10:00
Rohan Mitchell
2f73161421 Move patch to address class - much simpler 2013-09-18 07:14:21 +10:00
Rohan Mitchell
56590e2f4a Instrument saving spree addresses with invalid values in an attempt to track down the cause of some invalid records finding their way into the database 2013-09-17 18:06:06 +10:00
Rohan Mitchell
8a849b8e47 When selecting hub, auto-select order cycle if there is only one option available 2013-09-17 10:20:14 +10:00
Rohan Mitchell
a929312979 Add scope: OrderCycle.with_distributor 2013-09-17 09:54:21 +10:00
Rohan Mitchell
c2f1f0986b Fix broken specs 2013-09-16 14:30:46 +10:00
Rohan Mitchell
b032bc0420 Add commented-out code for debugging specs that are otherwise thwarted by poltergeist's timeout 2013-09-16 14:13:07 +10:00
Rohan Mitchell
f0381f7579 Fix problems with spree_last_address - upgrade gem to a newer version, add a spec around it 2013-09-16 14:11:00 +10:00
David Cook
4f9c7fb601 Remove distributor_id from payment method and update tests 2013-09-13 16:58:19 +10:00
Rohan Mitchell
b8376a040f Remove superfluous manual change triggers 2013-09-10 12:57:49 +10:00
Rohan Mitchell
a136161dd6 When showing enterprise, do not show enterprise name when we're in this enterprise - fix duplicate name in header 2013-09-10 12:57:35 +10:00
Rohan Mitchell
0e8443e118 Rename 'Change Pick-up Date' to 'Change Collection Date'. Fix this to clear the cart. Do not clear distributor when setting Order.order_cycle to nil. 2013-09-10 11:28:49 +10:00
Rohan Mitchell
91550ac82f Move distributor config to its own file, re-enable pry for tests 2013-09-10 09:50:16 +10:00
Rohan Mitchell
64a3a309f5 Change 'pick-up date' to 'available on', provide absolute dates in options 2013-09-10 09:16:23 +10:00
Rohan Mitchell
644beeb093 Revert "Fix test fail" 
This reverts commit 1de0f85c73.
 2013-09-09 10:55:40 +10:00
Rohan Mitchell
1de0f85c73 Fix test fail 2013-09-09 10:41:28 +10:00
Rohan Mitchell
d32a8b56d0 When order cycle is selected, only show variants that are in it 2013-09-09 10:40:15 +10:00