Commit Graph

  • 7677f79f17 Remove the now-unused Product#shipping_method_for_distributor Rohan Mitchell 2013-08-13 08:42:16 +10:00
  • 94e49d4190 Remove line item specs for removed functionality Rohan Mitchell 2013-08-13 08:41:59 +10:00
  • 7e30b664f2 Add enterprise fees relation to enterprise Rohan Mitchell 2013-08-13 07:22:12 +10:00
  • c011de539d Update rake task for product distribution fees by enterprise fee Rohan Mitchell 2013-08-13 07:21:13 +10:00
  • b5d324ec8c Drop itemwise shipping method use in tests Rohan Mitchell 2013-08-13 07:16:13 +10:00
  • 9aad44f093 Strip shipping method mechanics out of LineItem and Order Rohan Mitchell 2013-08-13 07:15:15 +10:00
  • 60956e9789 Display sum of distribution fees at cart by adjustment, not shipping methods Rohan Mitchell 2013-08-13 07:11:01 +10:00
  • b7ea03f7fc Remove distributor fees table at checkout, pending design of new breakdown Rohan Mitchell 2013-08-12 15:11:55 +10:00
  • 2379cc0c3c Do not display double error when using js Rohan Mitchell 2013-08-12 15:03:09 +10:00
  • 03b36bb14b Merge branch 'master' of github.com:eaterprises/openfoodweb alexs 2013-08-12 17:35:36 +10:00
  • f2f507c5c7 Suburb auto-complete functionality for the new landing page. alexs 2013-08-12 17:34:56 +10:00
  • c5f0848a56 More comments David Cook 2013-08-09 15:42:11 +10:00
  • 03b8b042ba Deleted: libpeerconnection.log David Cook 2013-08-09 14:11:04 +10:00
  • 5baf9938e1 Ensure capture shortcut button shows for the correct payment David Cook 2013-08-09 14:10:08 +10:00
  • c915bb91cf More tests for distributor enterprise user roles David Cook 2013-08-07 16:03:00 +10:00
  • 2ae4efbeba Add more order privileges for distributor enterprise users David Cook 2013-08-07 15:06:36 +10:00
  • c645ad25a7 Add more order privileges for distributor enterprise users David Cook 2013-08-07 15:06:12 +10:00
  • d7cce918f5 Instead of protecting shipping methods from destruction when referenced by product distributions, protect enterprise fees Rohan Mitchell 2013-08-12 14:22:11 +10:00
  • f1485bf9c5 Remove shipping method from product distribution in factory. Rohan Mitchell 2013-08-12 14:21:39 +10:00
  • af6b16ecc4 Admin can assign enterprise fees to product distributions Rohan Mitchell 2013-08-12 10:40:54 +10:00
  • 7ea1122833 Make spec naming consistent Rohan Mitchell 2013-08-12 10:13:31 +10:00
  • 14268b7be0 Create adjustment metadata when creating adjustment Rohan Mitchell 2013-08-12 10:00:10 +10:00
  • 149d48ff5a Add AdjustmentMetadata, for holding info about enterprise fee adjustments at time of creation Rohan Mitchell 2013-08-12 09:59:44 +10:00
  • ba0b3bad85 Convert product distribution shipping methods to enterprise fees Rohan Mitchell 2013-08-09 17:35:34 +10:00
  • 94cab872a5 Temporarily removing ssl enforcing. alexs 2013-08-11 17:53:53 +10:00
  • efc5943f57 Increase compression for landing page images. alexs 2013-08-11 17:38:25 +10:00
  • 653525e9b0 Updated the spec to reflect the field name change. alexs 2013-08-11 17:19:17 +10:00
  • e9110ac752 Merge branch 'master' of github.com:eaterprises/openfoodweb alexs 2013-08-11 16:59:02 +10:00
  • 71262d3cb3 Base for enterprise search via suburb selector.. alexs 2013-08-11 16:57:00 +10:00
  • 51a4795763 Added rack-ssl and spinjs. alexs 2013-08-11 16:52:34 +10:00
  • b065d7db36 When updating product distribution charge, skip line items that don't have a product distribution Rohan Mitchell 2013-08-09 15:25:50 +10:00
  • b84c476348 Upgrade Rails to 3.2.14, use forked spree with calculators that are compatible with LineItems Rohan Mitchell 2013-08-09 14:40:37 +10:00
  • b4a7ccf1b4 Adjustments on LineItems don't modify the order total. Make adjustments on Order instead. Rohan Mitchell 2013-08-09 14:14:48 +10:00
  • 513993324d Clean up old adjustments when changing distributor Rohan Mitchell 2013-08-08 13:37:40 +10:00
  • fd989e3a77 Create adjustments so computation is performed against line item. Simplify specs now that weight calculator is compatible with line items. Rohan Mitchell 2013-08-08 11:20:30 +10:00
  • 239dd29511 Weight calculator will calculate against a single line item as well as an order Rohan Mitchell 2013-08-08 11:18:42 +10:00
  • a338c974f8 Create line item adjustments for product distributions Rohan Mitchell 2013-08-08 10:38:59 +10:00
  • 8c9a3c8a91 Add Product#product_distribution_for Rohan Mitchell 2013-08-06 14:56:33 +10:00
  • 295d86affb Removed the test that is believed to be incorrect and failing build. alexs 2013-08-09 14:44:54 +10:00
  • 834cec48bf Forcing site-wide SSL for production and staging environments. alexs 2013-08-09 13:28:58 +10:00
  • 4ff8e825e9 Merge branch 'master' of github.com:eaterprises/openfoodweb alexs 2013-08-09 13:21:24 +10:00
  • d3ab78e2c6 Assets for gmap4rails gem. alexs 2013-08-09 13:20:49 +10:00
  • b5cc2ab4cf Added postcode search that redirect to page with map view. alexs 2013-08-09 13:20:22 +10:00
  • 39623d45d6 Tests for building full addresses. alexs 2013-08-09 13:19:07 +10:00
  • 3b4c02865f Tests for logging in from the new landing page. alexs 2013-08-09 13:16:58 +10:00
  • 7c96c17c88 Tests for geo search. alexs 2013-08-09 13:15:36 +10:00
  • 1ca306e09e Added RSpec matchers to test delegations. alexs 2013-08-09 13:14:49 +10:00
  • bc57364c7e Add simple angular cart to the main page. Andrew Spinks 2013-08-08 18:21:36 +10:00
  • ac37dff946 Add controller for cart and beginnings of an API. Andrew Spinks 2013-08-08 14:43:16 +10:00
  • 7fe1aab903 Simplest version of a cart that supports multiple orders. Andrew Spinks 2013-08-08 11:17:26 +10:00
  • 7d2e6c57bc Merge branch 'master' of github.com:eaterprises/openfoodweb alexs 2013-08-08 11:43:26 +10:00
  • f45ed42bdb Skeleton for the search results. alexs 2013-08-08 11:42:45 +10:00
  • 7bd0582b50 remove pry call Andrew Spinks 2013-08-08 10:47:50 +10:00
  • 44e06fe7fc Added search stuff to the least of assets to precompile. alexs 2013-08-08 10:43:21 +10:00
  • 7f74b85040 Markup tweak. alexs 2013-08-07 19:26:21 +10:00
  • 8efc95e095 Separated Foundation powered site from the Spree powered content (for now). alexs 2013-08-07 19:25:48 +10:00
  • 97ff668029 Fixed the finder ('all' finder was used in seed test instead of singular one). alexs 2013-08-07 19:24:57 +10:00
  • 28f94ae959 Stubbed out geolocation. alexs 2013-08-07 18:03:41 +10:00
  • 1992675794 Merge branch 'master' of github.com:eaterprises/openfoodweb alexs 2013-08-07 14:09:30 +10:00
  • 999ba2cf56 Added more real australian addresses to seed data as well some enterprises that use those addresses. alexs 2013-08-07 14:07:55 +10:00
  • 00743fada8 Added foundation gem to the right group. alexs 2013-08-07 14:06:40 +10:00
  • ef39d0ce31 Geocoded Spree addresses alexs 2013-08-07 14:01:27 +10:00
  • 7fbb5b13fb Fix line item cache migration to work across orders in the staging servers. Andrew Spinks 2013-08-07 12:43:31 +10:00
  • c247c2d3ea WIP: Allow distributor enterprise user to access their orders David Cook 2013-08-06 17:22:57 +10:00
  • 577b114662 Add distributor and supplier users to load_sample_data task David Cook 2013-08-06 14:23:38 +10:00
  • 3f82147024 Merge branch 'master' of github.com:eaterprises/openfoodweb alexs 2013-08-06 18:32:53 +10:00
  • 82ea8adfe3 Added list of geocoded suburbs. alexs 2013-08-06 18:31:08 +10:00
  • f1dbc03401 Use correct amount for order total in spec Rohan Mitchell 2013-08-06 13:46:32 +10:00
  • 8fdf0b6ff9 Fix payment not being captured due to being to small to cover order's distribution fee Rohan Mitchell 2013-08-06 11:25:57 +10:00
  • cfb8c05cb5 Remove association that's already added by Spree's calculated_adjustments Rohan Mitchell 2013-08-06 09:35:18 +10:00
  • d8b7a05441 Add EnterpriseFee to ProductDistributions Rohan Mitchell 2013-08-06 09:34:41 +10:00
  • ec3e00c128 Refactor LineItem and clients for new fields Rohan Mitchell 2013-08-05 17:15:57 +10:00
  • be1127b414 Migrate line item shipping_method cache to distribution_fee/shipping_method_name Rohan Mitchell 2013-08-05 17:11:21 +10:00
  • 57e185af78 Merge branch 'landing_page' alexs 2013-08-06 12:35:06 +10:00
  • 17f9a4645a Added login to the landing page. alexs 2013-08-06 12:34:22 +10:00
  • 27c17d6b07 Test that enterprise user can't access other enterprises' products David Cook 2013-08-06 11:22:44 +10:00
  • 0a7c5d4992 Add cancan ability tests on enterprise user roles David Cook 2013-08-06 11:12:37 +10:00
  • 7a92d99817 Remove unnecessary test on editing product (now tested under cancan abilities) David Cook 2013-08-06 11:12:06 +10:00
  • fd8fc480dc Always show supplier form for enterprise user again (list is now filtered according to enterprise_roles) David Cook 2013-08-06 10:56:31 +10:00
  • 2347acc2c1 Merge branch 'master' of github.com:eaterprises/openfoodweb David Cook 2013-08-06 09:23:30 +10:00
  • 24d559cd3a Merge branch 'master' into landing_page alexs 2013-08-05 17:08:39 +10:00
  • 38b0a581e0 New landing page - initial layout and functionality alexs 2013-08-05 17:04:56 +10:00
  • a2b612e723 Add clone and destroy product access for enterprise users David Cook 2013-08-05 15:21:20 +10:00
  • c40d694a15 Output correct task name David Cook 2013-08-05 15:20:35 +10:00
  • b0d9596489 Fix bug with available on translation - seemed to be getting overridden. Andrew Spinks 2013-08-05 10:00:47 +10:00
  • e75021d7bd Fix loading of products for an enterprise in the admin section. NOTE: this is a major hack - had to copy the current fetch data from the spree product_controller and modify it to get the roles to take affect. There must be a better way. Andrew Spinks 2013-08-02 18:13:42 +10:00
  • 9d32a5775a Enterprise user admin: only allow suppliers and distributors that we manage to be selected when creating and editing products. Andrew Spinks 2013-08-02 16:08:10 +10:00
  • 269294612d Add product tests for an enterprise user. Andrew Spinks 2013-08-02 14:01:45 +10:00
  • 0bb4f676e1 Add permissions to enterprise users so they can manage their own products. Andrew Spinks 2013-08-02 11:41:16 +10:00
  • 5bccd38b5e Fix tests - don't have feature toggle overrides on when running tests! Andrew Spinks 2013-08-01 15:37:42 +10:00
  • 46474ea4cc Prevent order cycle validations on orders when feature toggled off. Andrew Spinks 2013-08-01 15:01:47 +10:00
  • 287bd57a4e Fix loading of initial data to ensure there is an itemwise shipping method. Andrew Spinks 2013-08-01 10:31:17 +10:00
  • 65617e0e77 Add enterprise roles for a user and wire up interface. Andrew Spinks 2013-08-01 10:16:20 +10:00
  • 4f5679aac3 Add EnterpriseRole model and link up to users and enterprises. Andrew Spinks 2013-07-31 16:00:28 +10:00
  • 5810503068 Move test data seeding into separate rake task. Add new role to seeds file. Andrew Spinks 2013-07-26 11:47:25 +10:00
  • c64944d11a Fix test Rohan Mitchell 2013-07-30 17:32:53 +10:00
  • 4a893fd548 Style Rohan Mitchell 2013-07-30 13:49:38 +10:00
  • 4a0e35deef Clear coordinator fees when coordinator changes Rohan Mitchell 2013-07-30 13:46:30 +10:00
  • d64bcf0e94 Remove coordinator fees Rohan Mitchell 2013-07-30 11:55:21 +10:00
  • 24b957dc57 Process coordinator fees before submit to Rails to use _ids field. Add ng spec for OrderCycle.update. Add acceptance specs for create/edit/update coordinator fees. Rohan Mitchell 2013-07-30 11:33:40 +10:00