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 |
|
alexs
|
8f67f385b7
|
Merge branch 'master' of github.com:eaterprises/openfoodweb
|
2013-08-19 17:37:49 +10:00 |
|
alexs
|
f160e051e5
|
Added new temporary landing page.
|
2013-08-19 17:37:22 +10:00 |
|
Rohan Mitchell
|
5f01bd6901
|
Generalise checkout email signoff message
|
2013-08-19 17:35:09 +10:00 |
|
Rohan Mitchell
|
693fa9f37b
|
Enable enterprises_distributor_info_rich_text by default
|
2013-08-19 16:47:17 +10:00 |
|
David Cook
|
6f73f41700
|
Create Payment Methods for each Enterprise instead of generic Payment Method
|
2013-08-19 13:57:40 +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 |
|
alexs
|
e1da63d18f
|
Added some more dev sample data.
|
2013-08-14 17:30:17 +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
|
c011de539d
|
Update rake task for product distribution fees by enterprise fee
|
2013-08-13 09:11:25 +10:00 |
|
Andrew Spinks
|
bc57364c7e
|
Add simple angular cart to the main page.
|
2013-08-08 18:31:56 +10:00 |
|
alexs
|
1992675794
|
Merge branch 'master' of github.com:eaterprises/openfoodweb
|
2013-08-07 14:09:30 +10:00 |
|
alexs
|
999ba2cf56
|
Added more real australian addresses to seed data as well some enterprises that use those addresses.
|
2013-08-07 14:07:55 +10:00 |
|
David Cook
|
577b114662
|
Add distributor and supplier users to load_sample_data task
|
2013-08-07 09:19:28 +10:00 |
|