Commit Graph

  • 32d3d0f912 Auto-merge from CI [skip ci] Continuous Integration 2015-07-28 14:03:29 +10:00
  • 917c17af59 Clarify quantities used for calculations, show excess available via max_quantity Rohan Mitchell 2015-07-24 18:31:49 +10:00
  • 21a9681205 Do not show negative remainder when there are no purchases Rohan Mitchell 2015-07-24 17:42:23 +10:00
  • 54fd298e3a Reinstate variant full name column - needed to identify variants differing only by description Rohan Mitchell 2015-07-24 17:42:00 +10:00
  • 9ffc97f8b6 Fix controller spec for extraction of report controller logic Rohan Mitchell 2015-07-24 14:10:04 +10:00
  • 211171aed4 Rename column for clarity Rohan Mitchell 2015-07-24 12:49:43 +10:00
  • f43eacb75d Revert "Do not show non-group buy products on bulk coop reports" Rohan Mitchell 2015-07-24 12:40:50 +10:00
  • fffc35d9ed Revert "Add a blank row after summary row in all reports" Rohan Mitchell 2015-07-24 12:40:42 +10:00
  • 17fb4a7247 DRY by extracting calculation to method Rohan Mitchell 2015-07-24 07:17:20 +10:00
  • 3abce54115 Split variant name into number and unit columns Rohan Mitchell 2015-07-24 07:07:49 +10:00
  • 28de125b59 Bulk coop allocation report uses unit value rather than variant weight Rohan Mitchell 2015-07-24 07:00:49 +10:00
  • 4d71a56e38 Update available/unallocated calculations Rohan Mitchell 2015-07-23 16:40:50 +10:00
  • ae968cd0eb Simple refactoring of original total_allocated code Rohan Mitchell 2015-07-23 16:21:37 +10:00
  • 1a89c3caf4 Translate bulk coop allocation report to reports DSL Rohan Mitchell 2015-07-23 15:07:39 +10:00
  • bdd792a3ea Extract helpers to new superclass Rohan Mitchell 2015-07-23 14:49:04 +10:00
  • f5c2386296 Do not show non-group buy products on bulk coop reports Rohan Mitchell 2015-07-23 14:17:00 +10:00
  • 8665b35f1d Units required shows amount to fulfil order, not complete units required. Remainder works in opposite direction to suit. Rohan Mitchell 2015-07-23 14:16:40 +10:00
  • d68cfbff18 Use scaled value for group_buy_unit_size Rohan Mitchell 2015-07-23 13:58:47 +10:00
  • e8f7ab5425 Do bulk coop report calculations using unit values rather than variant weight field Rohan Mitchell 2015-07-23 13:44:47 +10:00
  • b0dd765181 Add a blank row after summary row in all reports Rohan Mitchell 2015-07-23 13:44:23 +10:00
  • 8ee467d2b9 Split variant name into number and unit columns Rohan Mitchell 2015-07-23 12:22:30 +10:00
  • 5874ecbbef Small tweaks Rohan Mitchell 2015-07-23 12:02:31 +10:00
  • dcae584673 Extract bulk coop supplier report into Report DSL Rohan Mitchell 2015-07-23 12:02:24 +10:00
  • a90666467a Add helper support to Reports DSL Rohan Mitchell 2015-07-23 11:45:19 +10:00
  • cc9d0defca Use class attributes instead of class variables to avoid leakage between subclasses Rohan Mitchell 2015-07-23 11:04:36 +10:00
  • 142e1d6d9a Report outputs rules as array for use by OrderGrouper Rohan Mitchell 2015-07-23 10:46:20 +10:00
  • 1d39fb4438 Report rules can define a summary row Rohan Mitchell 2015-07-23 10:35:40 +10:00
  • 07eb857a8d Report can define nested rules Rohan Mitchell 2015-07-23 10:24:10 +10:00
  • 66f64fc413 Report can define basic rules Rohan Mitchell 2015-07-23 10:08:38 +10:00
  • c7a1ca29f4 Report can define and retrieve columns Rohan Mitchell 2015-07-23 09:52:59 +10:00
  • 0a5e8fe629 Report class can define and retrieve header Rohan Mitchell 2015-07-23 09:36:09 +10:00
  • 61a39ea82f Cherry-pick 00927f7: Refactoring to move bulk out of reports_controller_decorator Rohan Mitchell 2015-07-22 15:23:53 +10:00
  • eabf792238 Amend changes to readme Rohan Mitchell 2015-07-22 13:16:26 +10:00
  • c15e281286 Add command cd openfoodnetwork Myriam 2015-07-19 12:39:51 +02:00
  • 5f0766cb75 When installing the gems we had only 1.9.2, there were an imprecision with >=1.9.3 or 1.9.x Myriam 2015-07-19 12:37:23 +02:00
  • 3a0c5bf0c3 I changed the "Get it" link as the git@ one was reserved to people with access rights Myriam 2015-07-19 12:09:20 +02:00
  • 61435b2dea Add brand guide colours next to definition Rohan Mitchell 2015-07-17 17:05:44 +10:00
  • b6892c82f1 Rename australia-orange sass var to country-agnostic brand-colour Rohan Mitchell 2015-07-17 16:27:17 +10:00
  • 5fd3dc1d28 Customise footer logo Rohan Mitchell 2015-07-17 16:24:07 +10:00
  • bb3a4170f5 Add dimensions to image upload Rohan Mitchell 2015-07-17 16:02:09 +10:00
  • 74f90dada3 Allow overriding mobile logo (raster and SVG) and home hero image Rohan Mitchell 2015-07-17 15:56:38 +10:00
  • e4a4cdd915 Rewrite alias_method_chain to use super. Ahhhhh :) Rohan Mitchell 2015-07-17 15:22:44 +10:00
  • 66b4eb4c5d Move Spree::Preferences::Configuration patches into superclass FileConfiguration Rohan Mitchell 2015-07-17 15:18:07 +10:00
  • 1d67e3b2b8 Fix image update, display logo on frontend Rohan Mitchell 2015-07-17 12:04:08 +10:00
  • 0e67a116b6 Admin can upload logo for ContentConfig Rohan Mitchell 2015-07-16 12:22:21 +10:00
  • 1234b35199 Add file handling to Spree::Preferences::Configuration Rohan Mitchell 2015-07-16 12:16:38 +10:00
  • 1b17a7fb35 Add logo field to ContentConfig Rohan Mitchell 2015-07-14 14:54:05 +10:00
  • 4887871474 Remove SVG TODOs - we'll ask admins to upload double-sized images for retina instead Rohan Mitchell 2015-07-10 17:41:03 +10:00
  • 372b17703a Remove unused content fields and partial Rohan Mitchell 2015-07-10 17:39:21 +10:00
  • 5de9a5eb54 Add config setting to enable/disable stats on home page Rohan Mitchell 2015-07-10 17:35:51 +10:00
  • 1f72e4001c Use site name config for hero title Rohan Mitchell 2015-07-10 17:28:49 +10:00
  • bd83dde89d Content manage group signup page Rohan Mitchell 2015-07-10 17:18:14 +10:00
  • a490d9696b Content manage hub signup page Rohan Mitchell 2015-07-10 17:11:06 +10:00
  • d353906bb8 Content manage producer signup page Rohan Mitchell 2015-07-10 16:59:32 +10:00
  • 858a613ba2 Auto-merge from CI [skip ci] Continuous Integration 2015-07-17 11:48:16 +10:00
  • 2ef0196200 Merge branch 'add-to-cart-robustness' into combined/vo-on-demand-stock-control_add-to-cart-robustness Rohan Mitchell 2015-07-16 10:06:34 +10:00
  • f3ae812f2b Update cart when max_quantity value changes, not just quantity Rohan Mitchell 2015-07-15 16:02:25 +10:00
  • 904a3a5bd4 When add to cart fails, retry every 3 seconds, with no limit of the number of retries Rohan Mitchell 2015-07-15 15:40:59 +10:00
  • de7f3a9e5c When an on-demand variant has overridden stock levels, make it not on-demand Rohan Mitchell 2015-07-15 17:19:48 +10:00
  • 7424e93133 Merge branch 'proximity-search' Rohan Mitchell 2015-07-15 17:31:22 +10:00
  • f21f57a42c Additions for packing reports, sans refactoring Lynne Davis 2015-06-19 22:07:26 +01:00
  • dc95167f15 Adding bits missed from the last commit. Lynne Davis 2015-05-20 16:35:28 +01:00
  • c168dec14b Adding packing reports as required by the UK contingent Lynne Davis 2015-05-19 19:00:23 +01:00
  • 28b8e0b0c8 Update distance matches when filter settings change Rohan Mitchell 2015-07-09 12:21:35 +10:00
  • 0ab75fe2ea Take the first name match from the post-filter results to avoid matching off a result the user can't see Rohan Mitchell 2015-07-09 11:59:50 +10:00
  • 669c9911fe Fix profile display Rohan Mitchell 2015-07-09 09:38:21 +10:00
  • 6e6d2566d9 Do not show distance when zero Rohan Mitchell 2015-07-08 12:10:14 +10:00
  • 6816df5f72 Do not show 'Closest to...' heading when no query entered Rohan Mitchell 2015-07-08 11:55:11 +10:00
  • 5b93ac2ae1 Remove unneeded injections, consistent spacing Rohan Mitchell 2015-07-08 11:46:35 +10:00
  • dcf98ee29f Fix enterprises no results for producers Rohan Mitchell 2015-07-08 11:21:16 +10:00
  • 7d340d5084 Update taxon search to only display taxons from enterprises on the page Rohan Mitchell 2015-07-08 11:14:10 +10:00
  • 0eb6d9aaed Disable animate-repeat on shops listing entirely - previous fix was not 100% successful Rohan Mitchell 2015-07-08 10:20:49 +10:00
  • d8dfb5b5ee Move most filters back out into view - they now respond to filter preference changes Rohan Mitchell 2015-07-03 17:22:32 +10:00
  • 07e6a204f3 Do not bindonce ng-repeat, remove translateZ(0) optimisation - address dangling DOM nodes after ng-repeat finishes. https://github.com/angular/angular.js/issues/4490 Rohan Mitchell 2015-07-03 17:06:27 +10:00
  • 06c5ffb427 Wrap geocode callback in ., fixing inconsistent updates Rohan Mitchell 2015-07-03 14:14:44 +10:00
  • 673635fdcb Show no results message at correct times Rohan Mitchell 2015-07-03 12:07:57 +10:00
  • 64bc7404dc Region-bias geocoder results Rohan Mitchell 2015-07-03 11:47:19 +10:00
  • 651afc34cb Notify enterprise change by broadcast Rohan Mitchell 2015-07-03 11:07:53 +10:00
  • e5c42c0e54 Tidyup Rohan Mitchell 2015-07-03 10:46:31 +10:00
  • 5f8826533d Limit distance matches to those within 50 km Rohan Mitchell 2015-07-03 10:46:26 +10:00
  • f154a02c86 Add filter for enterprises within a radius Rohan Mitchell 2015-07-03 10:43:40 +10:00
  • 46792a4111 Style results tables Rohan Mitchell 2015-07-02 16:36:30 +10:00
  • 5b5c56064e Hide distance matches when there are name matches. Show with a link. Rohan Mitchell 2015-07-02 16:28:13 +10:00
  • 794c9558bb Show name matches only when at least one is present. Show accurate closest-to target. Rohan Mitchell 2015-07-02 16:14:52 +10:00
  • eba0a12d29 Extract filtering into controller Rohan Mitchell 2015-07-02 16:06:35 +10:00
  • 7fd4815904 Split results into name matches and distance matches Rohan Mitchell 2015-07-02 15:31:26 +10:00
  • 97c9504344 Extract hubs table into partial Rohan Mitchell 2015-07-02 15:17:44 +10:00
  • 7f2508eeaa When a name match is found, calculate distances from that enterprise, rather than from the geocoded lookup Rohan Mitchell 2015-07-02 15:04:16 +10:00
  • 6e3ca3f90f Make Geo.distanceBetween take either a LatLng or a locatable at either parameter Rohan Mitchell 2015-07-02 15:03:34 +10:00
  • 744beaa26a Perform shops search by proximity instead of plain string match Rohan Mitchell 2015-07-02 14:22:51 +10:00
  • d0d9e9e367 Flag enterprises whose name matches a query Rohan Mitchell 2015-07-02 12:08:10 +10:00
  • befcc37456 Fix bug in distanceBetween, update docs, deal with null queries Rohan Mitchell 2015-07-02 11:50:29 +10:00
  • 9fb7c47c73 Enterprises can calculate their distances from a location via geocode lookup Rohan Mitchell 2015-07-02 11:43:07 +10:00
  • 80bb6c36e3 Rename file Rohan Mitchell 2015-07-02 10:46:46 +10:00
  • a61e96c316 Generalise Geocoder service to Geo, add distanceBetween method Rohan Mitchell 2015-07-02 10:46:30 +10:00
  • ddf1bb90ea Add geocoder service Rohan Mitchell 2015-07-02 09:58:40 +10:00
  • a509747ba7 Do not show double-ups of places to shop Rohan Mitchell 2015-07-10 11:52:45 +10:00
  • 3527ae6ea2 Update comment Rohan Mitchell 2015-07-10 11:42:13 +10:00
  • e679f1175c Add shop-for-products-at to map producer modals Rohan Mitchell 2015-07-09 16:45:34 +10:00
  • 197c99349d Add error checking to client-side permalink service Rohan Mitchell 2015-07-10 09:41:03 +10:00