Commit Graph

  • a0c40607ec Bulk update order cycle opening/closing times Rohan Mitchell 2012-12-02 15:43:05 +11:00
  • 25a2732253 Add basic styling to order cycle edit page Rohan Mitchell 2012-12-02 15:14:31 +11:00
  • 97401ca370 Remove exchanges in both create and edit Rohan Mitchell 2012-12-02 14:32:52 +11:00
  • 71320aa977 Display correct label for submit button Rohan Mitchell 2012-12-02 14:02:17 +11:00
  • 8e4b729351 Load correct order cycle, prep for saving order cycle Rohan Mitchell 2012-12-02 13:53:35 +11:00
  • 07eac918a3 OrderCycleFormApplicator deletes removed exchanges Rohan Mitchell 2012-11-30 17:08:57 +11:00
  • cfa96c7615 Each order cycle may not have duplicate exchanges between the same enterprises Rohan Mitchell 2012-11-30 16:37:29 +11:00
  • 5655b0b7a5 OrderCycleFormApplicator updates existing exchanges Rohan Mitchell 2012-11-30 16:07:21 +11:00
  • 34120730cd Load enterprises, all data displays Rohan Mitchell 2012-11-30 15:46:53 +11:00
  • 31735d3d10 Add edit order cycle controller, load basic data Rohan Mitchell 2012-11-30 15:44:07 +11:00
  • ba3a595af2 Output an order cycle in JSON Rohan Mitchell 2012-11-30 15:42:17 +11:00
  • 6e4638b12d Upgrade angular to 1.0.3, move form to partial, use angular resource Rohan Mitchell 2012-11-30 15:17:21 +11:00
  • 145fed09a1 Fixy Rohan Mitchell 2012-11-29 11:54:22 +11:00
  • 8736254f12 Create incoming exchanges on save Rohan Mitchell 2012-11-29 11:52:34 +11:00
  • 2c8d313c77 Create OrderCycleFormApplicator, for interfacing between front-end form and OrderCycle exchanges model. Rohan Mitchell 2012-11-29 11:40:15 +11:00
  • 243e1ccd93 Add supplier to order cycle Rohan Mitchell 2012-11-29 11:16:59 +11:00
  • ac66bf4871 Add client-side validation to order cycle form Rohan Mitchell 2012-11-29 10:40:19 +11:00
  • 64d4e405dd Add datetimepicker for order cycle opening and closing times Rohan Mitchell 2012-11-29 10:25:33 +11:00
  • aacc36ea44 Create order cycle basic fields Rohan Mitchell 2012-11-29 10:02:23 +11:00
  • ef22168349 Move select_distributor and deselect_distributor actions from enterprises controller to orders controller Rob H 2012-11-28 10:54:11 +11:00
  • 43248aee99 Add can_change_distributor validation to the Order model Rob H 2012-11-28 09:17:05 +11:00
  • a19e697556 Add header to admin enterprises page Rohan Mitchell 2012-11-27 13:46:59 +11:00
  • 5103ce64ba Output new order cycle as JSON Rohan Mitchell 2012-11-27 10:51:22 +11:00
  • d5310452b6 Admin list order cycles Rohan Mitchell 2012-11-27 10:13:12 +11:00
  • 47c28e65a7 Add detailed order cycle factory, add methods to report on order cycle suppliers, distributors and products/variants exchanged Rohan Mitchell 2012-11-27 10:09:40 +11:00
  • 6b97872a25 Create OrderCycles, Exchanges, ExchangeFees and ExchangeVariants Rohan Mitchell 2012-11-26 11:03:44 +11:00
  • 7a6d930706 Merge branch 'enterprise-fees' Rohan Mitchell 2012-11-26 10:13:48 +11:00
  • 7c5dcd6a90 Change angular_ prefix to ng_ Rohan Mitchell 2012-11-26 10:03:20 +11:00
  • 6106f1b469 Calculator type change works, enterprise fee tests pass Rohan Mitchell 2012-11-26 09:45:06 +11:00
  • 59af447739 Fix ? Rohan Mitchell 2012-11-26 09:44:42 +11:00
  • d502705362 Raise an error when using unsupported nested angular_fields_for Rohan Mitchell 2012-11-24 07:50:09 +11:00
  • 5ae13d6156 Order all the fees Rohan Mitchell 2012-11-23 17:21:46 +11:00
  • c46b858563 Don't render teh bits we dont wants Rohan Mitchell 2012-11-23 17:20:52 +11:00
  • 5e0a5654ff Correctly index calculator fields. Adds ng-bind-html-unsafe-compiled. Rohan Mitchell 2012-11-23 17:02:58 +11:00
  • 58a79e9b0c Minor changes to order confirm email Rob H 2012-11-23 16:06:25 +11:00
  • ee482d520c Replace order information display for Confirm and Complete stages of checkout Rob H 2012-11-23 10:51:14 +11:00
  • 3d025bb709 WIP Replace order information display for Confirm and Complete stages of checkout Rob H 2012-11-23 09:26:27 +11:00
  • 52ebe2c495 Provide proper names for angular select fields, add angular hidden field Rohan Mitchell 2012-11-22 16:38:25 +11:00
  • fd0cc93e68 Add delete link Rohan Mitchell 2012-11-22 16:19:10 +11:00
  • 2a645d04ae Move presentation to presenter, display calculator fields Rohan Mitchell 2012-11-22 14:37:38 +11:00
  • b7bd21e498 Full-text search of form Rohan Mitchell 2012-11-22 12:15:39 +11:00
  • 873937db47 angular_collection_select Rohan Mitchell 2012-11-22 11:44:32 +11:00
  • e64a86f5be angular_select Rohan Mitchell 2012-11-22 11:27:51 +11:00
  • ad76e66944 angular_options_for_select Rohan Mitchell 2012-11-22 11:24:05 +11:00
  • 216125c7a1 Start building some selects Rohan Mitchell 2012-11-22 11:03:28 +11:00
  • d6802d9ae5 Generate text field with custom form builder - AngularFormBuilder Rohan Mitchell 2012-11-22 09:53:26 +11:00
  • 58917fe378 Convert enterprise select and name entry into form fields Rohan Mitchell 2012-11-22 08:58:08 +11:00
  • 2786791c39 Change location of checkout delivery page cms from /delivery to /distribution Rob H 2012-11-21 16:14:56 +11:00
  • e2b0770c35 Fix name of button in spec Rohan Mitchell 2012-11-21 16:02:12 +11:00
  • b34d9da8e5 Add cms field to cart page to explain cart, located at cms path: /cart Rob H 2012-11-21 16:00:51 +11:00
  • e388e82d50 Merge branch 'checkout-changes' Rohan Mitchell 2012-11-21 15:15:10 +11:00
  • dd155532f8 Add angular include, basic controller for listing enterprise fees, display fee ids using angular Rohan Mitchell 2012-11-21 14:59:02 +11:00
  • 63ba5d13a3 Add representative, output enterprise fees as JSON Rohan Mitchell 2012-11-21 14:58:29 +11:00
  • fa2addd025 Delete enterprise fee Rohan Mitchell 2012-11-21 12:17:19 +11:00
  • 77b78f5bbb Edit enterprise fee Rohan Mitchell 2012-11-21 11:50:37 +11:00
  • bcc2ef99fd Ensure that AUTH_TOKEN var is set in tests, since spree's admin JS errors without it Rohan Mitchell 2012-11-21 11:49:59 +11:00
  • a4d10ab4e0 Create new enterprise fee, display errors when present Rohan Mitchell 2012-11-21 09:47:51 +11:00
  • ff0d2bc983 Create EnterpriseSet as subclass of ModelSet Rohan Mitchell 2012-11-21 09:08:41 +11:00
  • cbfb896ca4 Change 'Delivery Fees' to 'Distribution Costs' in cart Rob H 2012-11-17 11:46:43 +11:00
  • 59ca8f4513 Add cms field to cart page to explain delivery fees, located at cms path: /cart-delivery-fees Rob H 2012-11-16 18:32:02 +11:00
  • 0d99d9d18f Don't display unit size in reports for products that are not group buy items Rob H 2012-11-16 17:00:57 +11:00
  • 573ba9c8d4 Merge remote-tracking branch 'origin/master' into checkout-changes Rob H 2012-11-16 16:10:51 +11:00
  • 98143ffe5b Add calculator to EnterpriseFee, test passes for listing enterprise fees Rohan Mitchell 2012-11-16 16:07:40 +11:00
  • 32acba05a3 Fixed total row labels in bulk co-op allocation report. Rob H 2012-11-16 15:28:06 +11:00
  • 6247bd2541 Display admin table of enterprise fees with enterprise, fee type and name columns Rohan Mitchell 2012-11-15 15:03:12 +11:00
  • 03764881c8 Generalise EnterpriseSet to ModelSet Rohan Mitchell 2012-11-15 14:29:38 +11:00
  • ec74396659 Add enterprise fees to admin configurations menu Rohan Mitchell 2012-11-15 13:58:51 +11:00
  • 192d4993a1 Add EnterpriseFee model Rohan Mitchell 2012-11-15 13:42:55 +11:00
  • 9cb5ac95ff More brackets make everything even better 0.3.1 Rob H 2012-11-11 15:30:01 +11:00
  • 076c64f7b0 Brackets make everything better Rohan Mitchell 2012-11-10 12:53:03 +11:00
  • 580486a347 Do not show duplicate products with in_supplier_or_distributor scope 0.3.0 Rohan Mitchell 2012-11-10 12:26:41 +11:00
  • 9a9bef5304 Report filtering on completion date, not creation date Rohan Mitchell 2012-11-09 20:31:08 +11:00
  • b4120b1028 Merge branch 'fixes-for-reports' Rohan Mitchell 2012-11-07 19:00:07 +11:00
  • a15f96aa68 Fix for case where no group_buy_size_has been set. ie. = nil Rob H 2012-11-07 18:34:54 +11:00
  • 0f68ddcf01 Merge branch 'fixes-for-reports' Rohan Mitchell 2012-11-07 14:30:45 +11:00
  • 5f07df9316 Add calculation fields to bulk co-op and order cycle reports Rob H 2012-11-03 11:36:17 +11:00
  • 9e4edd5da0 Change the basis of line_item grouping for Bulk Co-op and Order Cycle reports from User to Order Rob H 2012-11-02 16:41:32 +11:00
  • 80159e1ea7 Do not munge foreign keys when migrating to enterprises Rohan Mitchell 2012-11-02 15:34:02 +11:00
  • 3d2572c628 Merge branch 'master', remote-tracking branch 'origin' Rob H 2012-11-02 14:43:47 +11:00
  • 3a116dc13d Fix product filtering on supplier and distributor pages Rohan Mitchell 2012-11-01 16:37:12 +11:00
  • c2133d70ac Rename Enterprise is_supplier scope to is_primary_producer Rohan Mitchell 2012-11-01 15:02:57 +11:00
  • a7a8b8490b Add test for viewing a CMS page Rohan Mitchell 2012-11-01 11:31:08 +11:00
  • 8748a65031 Show role on admin enterprises listing page Rohan Mitchell 2012-11-01 11:22:13 +11:00
  • 6d84cf7613 Merge branch 'master' into enterprises Rohan Mitchell 2012-11-01 11:02:02 +11:00
  • 13d6f7213e Fix db seeds Rohan Mitchell 2012-11-01 10:21:55 +11:00
  • d89945bbb2 Add smoke test for reports, fix use of old Distributor model Rohan Mitchell 2012-11-01 10:20:06 +11:00
  • 78bdbcbe6f Rename DistributorsHelper to EnterprisesHelper Rohan Mitchell 2012-11-01 10:07:55 +11:00
  • 682c09f516 Remove use of old Distributor model, fix before all not cleaning db Rohan Mitchell 2012-11-01 10:05:39 +11:00
  • 34588e6141 Remove old supplier and distributor routes, models, controllers, views, specs Rohan Mitchell 2012-11-01 09:55:45 +11:00
  • d927906934 Update admin views, tests pass Rohan Mitchell 2012-11-01 08:36:40 +11:00
  • 58d227e76a Home controller and product model specs pass Rohan Mitchell 2012-11-01 08:28:40 +11:00
  • fb9f59213f Distributors, product, suppliers and taxonomy specs pass Rohan Mitchell 2012-11-01 08:15:50 +11:00
  • f8c2c8bbed Convert group buy unit size field from string to float Rohan Mitchell 2012-11-01 08:02:11 +11:00
  • 7dd42b7feb Fix use of pickup_address and url fields with enterprises, checkout spec passes Rohan Mitchell 2012-10-31 17:10:21 +11:00
  • 1b89331aa4 Update capybara and selenium-webdriver for compatibility with firefox 16 Rohan Mitchell 2012-10-31 17:09:26 +11:00
  • 309179096b Update supplier_id and distributor_id to point to newly created enterprises Rohan Mitchell 2012-10-31 16:56:35 +11:00
  • 9d5c127f0d Add enterprises controller that supercedes suppliers and distributors controllers. Add to cart consumer spec passes. Rohan Mitchell 2012-10-31 16:47:01 +11:00
  • a8f4178894 Update orders controller for enterprises Rohan Mitchell 2012-10-31 16:33:38 +11:00
  • f03d9b66f0 Update spree_paypal_express to fail gracefully when setting address 0.2.9 Rohan Mitchell 2012-10-31 15:17:05 +11:00
  • b9a072b61a Make sure enterprises have a valid address after pickup address field has been removed Rohan Mitchell 2012-10-31 14:32:47 +11:00