Commit Graph

  • 0ad2978926 Removing old managed route from api orders controller and switching BOM over to use new controller action Rob Harrington 2015-05-20 11:48:48 +10:00
  • fc55a000b8 Adding managed controller action which uses new order serializer to render json Rob Harrington 2015-05-20 11:48:13 +10:00
  • 823adf3272 Translating existing order-related rabl templates accross to AMS Rob Harrington 2015-05-20 11:45:48 +10:00
  • 7f80c02c0e Adding route for managed route for admin orders Rob Harrington 2015-05-20 11:45:05 +10:00
  • 828456118b Remove forgotten binding.pry Maikel Linke 2015-05-20 11:15:18 +10:00
  • fa87c53777 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into group-pages Maikel Linke 2015-05-20 10:22:28 +10:00
  • 6b956a8a38 Updating product clone spec Maikel Linke 2015-05-20 10:19:37 +10:00
  • 0c46f963ce Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into bulk-product-edit Maikel Linke 2015-05-20 10:19:03 +10:00
  • 312a6299a8 Making where clause unambiguous v0.9 Rob Harrington 2015-05-15 21:19:16 +10:00
  • f1899a7558 Merge branch 'master' into xero-report Rohan Mitchell 2015-05-15 16:57:11 +10:00
  • 70b5ac4785 Add column for whether the order has been paid for Rohan Mitchell 2015-05-15 16:55:52 +10:00
  • f7642b2a1b When blank values are submitted, do not override defaults Rohan Mitchell 2015-05-15 16:51:04 +10:00
  • a467d3c379 Add filtering to xero invoices report - order date range, hub and order cycle Rohan Mitchell 2015-05-15 16:20:56 +10:00
  • 3d4a0f8407 Xero invoices report: Preserve form fields on submit, do not show rows with no cost Rohan Mitchell 2015-05-15 15:27:46 +10:00
  • 3640a71ab8 Reorder methods Rohan Mitchell 2015-05-15 15:05:18 +10:00
  • ca37efdd26 Display whether there is tax included in shipping Rohan Mitchell 2015-05-15 12:44:48 +10:00
  • dc8270ed72 Display amounts on xero invoice report Rohan Mitchell 2015-05-15 12:16:35 +10:00
  • 0dcd8eb8cc Find adjustments with and without tax Rohan Mitchell 2015-05-15 11:57:01 +10:00
  • ca1d88d8b1 Find line items with and without tax Rohan Mitchell 2015-05-15 11:49:24 +10:00
  • 5660e3737e Extract order rows generation to method Rohan Mitchell 2015-05-14 13:01:46 +10:00
  • c5b618b1f4 Admin can customise some fields on Xero invoices report Rohan Mitchell 2015-05-14 12:25:48 +10:00
  • 0737ac8da0 Write an rspec table matcher that gives informative error messages Rohan Mitchell 2015-05-14 12:11:38 +10:00
  • 0a2f2e0fba Output summary data without customisation Rohan Mitchell 2015-05-07 15:31:39 +10:00
  • 38e1bd4139 Fix indentation Rohan Mitchell 2015-05-01 15:44:19 +10:00
  • ef064819f9 Add spec for order_cycle_management report access Rohan Mitchell 2015-05-15 10:41:29 +10:00
  • 924492ec5b Merge branch 'ordercyclemanagementreports2' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-ordercyclemanagementreports2 Rohan Mitchell 2015-05-15 10:37:34 +10:00
  • e3723da65a Auto-merge from CI [skip ci] Continuous Integration 2015-05-14 14:32:07 +10:00
  • c8502747be Fixing layout of customers index Rob Harrington 2015-05-14 12:37:55 +10:00
  • 78fc3e376b Fixing styling of inputs for with pending/success/error status Rob Harrington 2015-05-14 11:39:37 +10:00
  • 50d0d04994 Removing obsolete dataSubmitter service Rob Harrington 2015-05-14 11:38:55 +10:00
  • b4755c37dc Merge branch 'analytics' into combined/fix-delayed-job-loop-and-analytics Rohan Mitchell 2015-05-14 11:03:27 +10:00
  • 7da403808c Style mobile menu [skip ci] Rohan Mitchell 2015-05-13 16:56:32 +10:00
  • 640c02570d Splitting out specs for switchClass service Rob Harrington 2015-05-13 16:41:28 +10:00
  • 3849b39d3e Splitting out specs for pending changes service Rob Harrington 2015-05-13 16:39:43 +10:00
  • ffac0e4ceb Adding ngTagsInput to angular spec manifest Rob Harrington 2015-05-13 16:06:38 +10:00
  • ec1290d687 Style home page for mobile Rohan Mitchell 2015-05-13 15:59:36 +10:00
  • a473d0ed11 Checking in db version change Rob Harrington 2015-05-13 15:58:03 +10:00
  • 7946340dad Allow more phantomjs timeout to avoid the first-spec-timeout issue Rohan Mitchell 2015-05-13 15:34:27 +10:00
  • b86872095a Add google analytics Rohan Mitchell 2015-05-13 14:52:17 +10:00
  • 5e5628d0c3 Fix shops path for spec Rohan Mitchell 2015-05-13 14:31:40 +10:00
  • 0ac7dbf23b Update spec references to removed file logo.jpg Rohan Mitchell 2015-05-13 14:27:43 +10:00
  • 14fdc7d3ae Move home spec to shops spec Rohan Mitchell 2015-05-13 14:27:18 +10:00
  • 238adc5354 Do not couple editable content to frequently-changing home page format Rohan Mitchell 2015-05-13 14:18:00 +10:00
  • 75e0c1d99e Conclusively remove cta1 Rohan Mitchell 2015-05-13 14:13:10 +10:00
  • ff44636040 Home controller functionality moved to shops controller Rohan Mitchell 2015-05-13 14:10:21 +10:00
  • 76e41e6c1e Basic consistency styling for groups signup page [skip ci] Rohan Mitchell 2015-05-13 12:51:23 +10:00
  • 92805b5442 Style producers signup page CTA pane Rohan Mitchell 2015-05-13 12:46:08 +10:00
  • 34f5cfb6b5 Completed orders require a customer, add association logic Rob Harrington 2015-05-13 12:32:55 +10:00
  • 1559b4e30a Adding customer reference to orders Rob Harrington 2015-05-13 11:39:17 +10:00
  • ed941e211d Don't require a code on customer Rob Harrington 2015-05-08 17:35:58 +10:00
  • dd9c192d48 Shuffling layout a little on customer index Rob Harrington 2015-05-08 16:13:57 +10:00
  • b364994cc8 Adding tags input to customer index using ngTagsInput Rob Harrington 2015-05-08 15:30:04 +10:00
  • 3bc69242ce Style tweaks Rob Harrington 2015-05-08 15:00:06 +10:00
  • d2e8b23dd4 Creating association between enterprise and customers Rob Harrington 2015-05-08 14:59:16 +10:00
  • 5b3c9842e4 Adding acts_as_taggable to customer model Rob Harrington 2015-05-08 14:58:56 +10:00
  • a03c7a5f22 Adding ngTagsInput to admin assets Rob Harrington 2015-05-08 14:56:57 +10:00
  • a60fd3d388 Installing ngTagInput Rob Harrington 2015-05-08 14:56:03 +10:00
  • 4c5e75c3f9 Adding acts-as-taggable-on gem Rob Harrington 2015-05-08 14:55:00 +10:00
  • 5b49e64bf2 Hiding bulk checkboxes on customer interface (for now) Rob Harrington 2015-05-08 12:52:36 +10:00
  • 9add073b17 User can update customer code from customer index page Rob Harrington 2015-05-08 12:46:37 +10:00
  • 734ad21e82 Customers controller responds with json Rob Harrington 2015-05-08 12:36:56 +10:00
  • dcde2d88ad Adding Customer resource to resources service Rob Harrington 2015-05-08 12:35:57 +10:00
  • 4545e0ff95 Adding request defaults to index utils module Rob Harrington 2015-05-08 12:35:20 +10:00
  • 3890ba9a11 Wrapping pending changes service in a class Rob Harrington 2015-05-08 12:34:41 +10:00
  • 8f94390363 Moving a bunch of index related services from general admin module into indexUtils Rob Harrington 2015-05-08 11:12:20 +10:00
  • a873278881 Moving line-item-upd-attr to indexUtils module, renaming to obj-for-update Rob Harrington 2015-05-08 10:53:59 +10:00
  • 2afd501af3 Wiring up update action for customers controller Rob Harrington 2015-05-08 10:38:02 +10:00
  • 8f35ccf007 Adding quick search and column dropdown to customers index Rob Harrington 2015-05-07 18:00:12 +10:00
  • 79d50a64ae BPE uses columns controller from intex utils Rob Harrington 2015-05-07 17:08:44 +10:00
  • 3e7d331892 BOM uses columns controller from index utils module Rob Harrington 2015-05-07 17:05:26 +10:00
  • 3b7ab086c9 Fix module name Rob Harrington 2015-05-07 17:04:42 +10:00
  • 69ba8540c1 Moving toggle_column directive to index_utils Rob Harrington 2015-05-07 16:57:02 +10:00
  • 5bd842fe1a Moving toggle_column directive to dropdown module Rob Harrington 2015-05-07 16:54:59 +10:00
  • f5c0ae0f41 Moving dropdown to its own module folder and renaming Rob Harrington 2015-05-07 16:48:37 +10:00
  • 1c03e27686 Moving dropdown to its own folder Rob Harrington 2015-05-07 16:43:05 +10:00
  • 7a4f0e214c Adding customers index view Rob Harrington 2015-05-07 16:24:58 +10:00
  • 307302038a Adding customers controller, service and resource Rob Harrington 2015-05-07 15:13:21 +10:00
  • c00c93816c Renaming spec file Rob Harrington 2015-05-06 22:58:58 +10:00
  • b3d314cfdb Adding require line for index_utils module to all.js Rob Harrington 2015-05-06 22:37:00 +10:00
  • b6d63d40c6 Pulling columns logic out into its own services/controller in a new indexUtils module Rob Harrington 2015-05-06 22:35:43 +10:00
  • 220f42fcf2 Customers controller serializes data for json requests, just renders view without data for html Rob Harrington 2015-05-06 19:15:38 +10:00
  • 37ff61d663 Adding basic routing to display customer index page Rob Harrington 2015-05-02 19:51:54 +10:00
  • 57dbc33a7b Adding resource service to determine submission request based on object type Rob Harrington 2015-04-16 08:44:24 +10:00
  • b16fa9cdc1 Generalising datasubmitter pendingChanges and watcher directive Rob Harrington 2015-04-15 11:29:51 +10:00
  • 30bb948d35 Making ofn-line-item-upd-attr work without ng-model Rob Harrington 2015-04-15 10:25:20 +10:00
  • cbe715087c Make producers signup table same colours as hubs table Rohan Mitchell 2015-05-13 12:37:07 +10:00
  • 1f75974e1c Unify case studies styling Rohan Mitchell 2015-05-13 12:26:37 +10:00
  • 71f3a450c6 Move signup-related styles from home_panes into signup.css.sass Rohan Mitchell 2015-05-13 12:03:46 +10:00
  • fb400df662 Update basic copy and layout on producers signup page Rohan Mitchell 2015-05-13 11:45:25 +10:00
  • 3520127c41 Fix infinite job loop Rohan Mitchell 2015-05-13 11:06:42 +10:00
  • eac22df200 Merge branch 'master' into redesign Rohan Mitchell 2015-05-13 09:53:20 +10:00
  • 845509b0c0 Style shops signup page Rohan Mitchell 2015-05-12 13:51:31 +10:00
  • 5a43c80231 Convert tabs to spaces Rohan Mitchell 2015-05-12 12:26:35 +10:00
  • 4e0478bbe9 Update copy and spacing on hubs page Rohan Mitchell 2015-05-12 11:59:51 +10:00
  • d261ea617a A little more space between header and button Rohan Mitchell 2015-05-12 11:50:40 +10:00
  • f416503bde Tighten up footer lock Rohan Mitchell 2015-05-12 11:49:45 +10:00
  • 0184925ac8 Switch out footer logo for logo with no text Rohan Mitchell 2015-05-12 11:41:49 +10:00
  • ebc452b1e2 Style home page stats pane Rohan Mitchell 2015-05-12 11:33:07 +10:00
  • 7b36f9dbf8 Add friendly icons for home systems pane Rohan Mitchell 2015-05-12 10:43:35 +10:00
  • b2f687cd11 Style home panes (all except stats) Rohan Mitchell 2015-05-12 10:21:52 +10:00