Commit Graph

1432 Commits

Author SHA1 Message Date
Rohan Mitchell
9b15c213d1 When an enterprise user saves an order cycle for which it manages only some of the enterprises involved, do not delete the other exchanges 2014-05-23 11:28:00 +10:00
Will Marshall
5f712a8984 Removing code 2014-05-14 15:16:29 +10:00
Will Marshall
bbb70342b3 Merging 2014-05-02 15:35:43 +10:00
Rohan Mitchell
c9aefa507a Remove chili 2014-05-02 14:25:32 +10:00
Will Marshall
9fb4b2f9d8 Ctrl-C now cancels karma 2014-05-02 14:19:52 +10:00
Will Marshall
dfd1dd609d Re-engaging checkout spec 2014-05-02 14:13:00 +10:00
Will Marshall
d74265e44d Ctrl-C now cancels karma 2014-05-02 14:04:43 +10:00
Rohan Mitchell
ad6021a116 Revert "In specs, correctly disable referential integrity for postgres"
This reverts commit 1610e1448a.
2014-04-25 17:14:25 +10:00
Rohan Mitchell
1610e1448a In specs, correctly disable referential integrity for postgres 2014-04-25 16:58:25 +10:00
Rohan Mitchell
6c86254a90 Extract sign_in_as_user method, test managed orders API access for normal user and enterprise user 2014-04-24 13:20:16 +10:00
Rohan Mitchell
95a6e34523 Spec access denied to regular user when soft-deleting variants 2014-04-24 13:20:16 +10:00
Rohan Mitchell
e28a450875 Add API call to soft-delete a variant 2014-04-24 13:20:16 +10:00
Will Marshall
5ac5b74f01 Setting up a Rake task for Jasmine/Karma 2014-04-08 18:09:02 +10:00
Rohan Mitchell
ce2882de35 OrderCycleFormApplicator uses exchanges.incoming instead of role 2014-03-27 09:49:08 +11:00
Rohan Mitchell
890af85d30 Create per-order adjustments with EnterpriseFeeApplicator 2014-02-26 13:28:05 +11:00
Rohan Mitchell
08009d4020 Extract application of enterprise fees as adjustments into its own class 2014-02-21 15:48:58 +11:00
Will Marshall
12743850b4 Removing a chili, refactoring order mailer 2013-12-13 15:40:22 +11:00
Will Marshall
6e36142809 Making some changes to the data on the products inventory page 2013-12-13 11:39:45 +11:00
Rohan Mitchell
29308dca76 Enable order cycles by default 2013-11-29 10:49:33 +11:00
Will Marshall
33b23dd265 Sorting the bitching product report like a boss 2013-11-28 17:06:06 +11:00
Will Marshall
7bc754a598 Adding filtering to the products page 2013-11-28 13:44:21 +11:00
Will Marshall
27f99d1383 Working version of Customers reports without filters 2013-11-22 16:53:57 +11:00
Will Marshall
fbe0e2cc29 Basic plumbing for the Customers in place 2013-11-22 16:22:44 +11:00
Will Marshall
beb6110bc3 Fixing up a bug in the aggregate filtering 2013-11-21 15:04:33 +11:00
Will Marshall
612a80ec15 A little refactoring, some comment removal 2013-11-21 14:28:23 +11:00
Will Marshall
e853c1275e Working filters for Product&Inventory Report 2013-11-21 11:25:37 +11:00
Will Marshall
ca16314535 Working scopes for child variant and master variants 2013-11-20 14:11:22 +11:00
Will Marshall
84346c7fbd Starting specing P&I Report 2013-11-20 13:59:02 +11:00
Rohan Mitchell
306eaab262 Remove uservoice 2013-11-15 16:31:46 +11:00
Rohan Mitchell
59935619e3 Rename OrderCycle#distributed_variants_by to variants_distributed_by 2013-11-15 14:34:05 +11:00
Rohan Mitchell
d73af509e0 When removing exchanges from an order cycle, compare by id only. Avoids erroneously removing exchanges where another attr has changed in an unimportant way. 2013-11-15 12:09:26 +11:00
Will Marshall
9097246301 Removing uservoice 2013-11-14 11:07:58 +11:00
Rohan Mitchell
34607ff556 Rename misc items from openfoodweb to openfoodnetwork 2013-10-18 17:43:59 +11:00
Rohan Mitchell
89f93cae77 Rename namespaced includes from open_food_web to open_food_network 2013-10-18 17:43:18 +11:00
Rohan Mitchell
57f7d489ff Rename OpenFoodWeb namespace to OpenFoodNetwork 2013-10-18 17:29:55 +11:00
Rohan Mitchell
8e269353a8 Rename all open_food_web dirs to open_food_network 2013-10-18 17:19:47 +11: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
dac49d1044 Order cycle-aware pickup time 2013-09-27 11:17:24 +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
David Cook
4f9c7fb601 Remove distributor_id from payment method and update tests 2013-09-13 16:58:19 +10:00
Rohan Mitchell
57906e6f8b Fix seed failure due to ShippingMethod factory creating an enterprise, preventing enterprises from being seeded 2013-09-06 16:01:00 +10:00
David Cook
61e5ec24e7 Generalise ModelClassFromControllerName 2013-08-30 15:21:30 +10:00
David Cook
5b824c1e22 Prevent exception when order has no payments 2013-08-22 13:07:17 +10:00
David Cook
b2878ddc40 Payment Method must belong to a Distributor 2013-08-21 15:14:01 +10:00
alexs
798565bb42 Overriding accidental commit. 2013-08-21 10:59:25 +10:00
alexs
845f7bb8d7 Merge branch 'master' of github.com:eaterprises/openfoodweb 2013-08-21 10:50:08 +10:00
alexs
f6983078a2 Removed search box and distributor/supplier sidebar from the hub page. 2013-08-21 10:49:43 +10:00
Rohan Mitchell
fa459c0395 Summarise distribution charges: order confirm page and email 2013-08-20 16:26:46 +10:00
Rohan Mitchell
fb33b853dd Revert payment method changes that broke the build: 5f7cbe3, 5a3ad8e, 3ffe732, 2d305b5, 08babee, 6f73f41, 77329b5, 4be2fe5 2013-08-20 10:47:56 +10:00