Commit Graph

  • a711387794 Changing colors on SVGs to tweak for new primary red color summerscope 2014-07-18 17:15:35 +10:00
  • 92b7966941 Triggering dialog if page unsaved Will Marshall 2014-07-18 17:07:40 +10:00
  • edaba844d9 Merge branch 'laura_and_will' into new_cart Will Marshall 2014-07-18 17:02:19 +10:00
  • fe0956d3bb Update markup to make total price its own row on small devices summerscope 2014-07-18 16:36:14 +10:00
  • 63b0bb8122 Updating styling for product rows for small devices - total price gets its own row summerscope 2014-07-18 16:34:48 +10:00
  • 8d1175c495 Tweaks to input layout for responsive summerscope 2014-07-18 16:34:25 +10:00
  • a480353158 Working bindings Will Marshall 2014-07-18 16:05:58 +10:00
  • 751865a540 More markup tweaks for responsive summerscope 2014-07-18 16:05:30 +10:00
  • 9e74bb8bf0 Pulling out css for refactoring, partials and further tweaks for responsive summerscope 2014-07-18 16:05:19 +10:00
  • 978b64547e Refactoring SASS for shopfront to add partials, break it out into logical clusters summerscope 2014-07-18 16:04:53 +10:00
  • b25def810c Working version of the cart integration Will Marshall 2014-07-18 14:56:15 +10:00
  • 03273a76ad Merge branch 'fix_units' Rohan Mitchell 2014-07-18 14:11:41 +10:00
  • 7db2aff398 Generate variantUnitOptions - DRY Rohan Mitchell 2014-07-18 14:10:42 +10:00
  • a3d402ad53 Moving variants to a service, backreferencing and linking Will Marshall 2014-07-18 13:59:34 +10:00
  • 93aa3b5364 Tweak responsive on taxon icons summerscope 2014-07-18 12:54:28 +10:00
  • fca552b254 Adjusting markup and adding classes to target elements as needed for responsive styling summerscope 2014-07-18 12:52:59 +10:00
  • 29058fa7cc Responsive styling and adjustments to cope with layout changes across devices summerscope 2014-07-18 12:50:22 +10:00
  • 8484d19144 Convert variant_unit_options to a method, camelcase Rohan Mitchell 2014-07-18 12:44:58 +10:00
  • 04eca9591b Derive unitScales from unitNames Rohan Mitchell 2014-07-18 11:27:09 +10:00
  • 52b74bde91 Extract unit names from OptionValueNamer into VariantUnitManager Rohan Mitchell 2014-07-18 11:14:21 +10:00
  • ed66633a93 Add comment Rohan Mitchell 2014-07-18 11:09:38 +10:00
  • ab1628681e Call VariantUnitManager directly Rohan Mitchell 2014-07-18 11:02:20 +10:00
  • 8d5f953f78 Extract getScale from BOM controller to VariantUnitManager, extract specs as well Rohan Mitchell 2014-07-18 10:57:41 +10:00
  • eafdf85c28 Extract class methods to new class VariantUnitManager Rohan Mitchell 2014-07-18 10:45:45 +10:00
  • a2da7f7ede Merge branch 'caching' into new_cart Will Marshall 2014-07-18 11:23:25 +10:00
  • 562f8dbd4e Starting to restructure data injection Will Marshall 2014-07-18 11:21:51 +10:00
  • 6c59ffc16f Switch to class case for OptionValueNamer Rohan Mitchell 2014-07-18 10:06:13 +10:00
  • 957c8cf89b Markup changes to all the partials for new shopfront page design summerscope 2014-07-17 17:24:54 +10:00
  • 7cb0e079ab Lots of changes for new shopfront design summerscope 2014-07-17 17:24:31 +10:00
  • 730373d677 Making all the images optimised - as wee as can be! summerscope 2014-07-17 17:24:14 +10:00
  • 1c3da6c003 Adding pretty design assets for new shopfront page summerscope 2014-07-17 17:23:45 +10:00
  • 91e4f24fde Extract JS unit options into option value namer Rohan Mitchell 2014-07-17 16:57:23 +10:00
  • 989a14fa37 Change KL to kL, update specs for ML to kL change Rohan Mitchell 2014-07-17 16:16:08 +10:00
  • 33611ddb20 Renaming Product to Products and starting to figure out cart Will Marshall 2014-07-17 15:04:39 +10:00
  • 67922f38df Fixing some regressions to data submission Will Marshall 2014-07-17 14:46:46 +10:00
  • 08409dad0a Fix down migration - need explicit cast for string -> integer Rohan Mitchell 2014-07-17 14:43:34 +10:00
  • 98d824f09b use string for postcode Rafael Schouten 2014-07-14 13:03:53 +01:00
  • 541fe9ec37 Switching Checkout service to use CurrentOrder Will Marshall 2014-07-17 14:26:54 +10:00
  • b326ec8a3c Remove landing page images Rohan Mitchell 2014-07-16 15:15:57 +10:00
  • 19118da82e Remove old landing page cruft Rohan Mitchell 2014-07-16 15:11:57 +10:00
  • 159d0a9dbe Remove most references to suburbs - previously used by new_landing_page, no longer used. Rohan Mitchell 2014-07-16 15:07:47 +10:00
  • 158bdd145f All the new serializers and some specs Will Marshall 2014-07-17 14:23:09 +10:00
  • 547d9f9f5c Moving payment methods and shipping methods into their own services Will Marshall 2014-07-17 14:19:39 +10:00
  • 736ae3c1e3 mirror_db script also disables S3 in development and pulls down images Rohan Mitchell 2014-07-17 12:56:27 +10:00
  • d7a5eb47f3 Store all images in a consistent path, compatible with development, and support S3 all round Rohan Mitchell 2014-07-17 11:07:34 +10:00
  • c40c586b6f Store taxon icons in a path consistent with products Rohan Mitchell 2014-07-17 10:23:07 +10:00
  • 2b1ab53d8e Fixing regressions and refactoring our tests Will Marshall 2014-07-16 16:00:44 +10:00
  • cd033c300e Reworking order populator and controller to handle replacement of line items rather than addition Will Marshall 2014-07-16 16:00:28 +10:00
  • f4c1cd5253 Merge branch 'master' into caching Will Marshall 2014-07-16 11:47:07 +10:00
  • b33a077fd0 Remove bugsnag config - this is added in deployment on a server-by-server basis Rohan Mitchell 2014-07-16 11:45:44 +10:00
  • 9542b7224c Ignore rake generated CSV files Rohan Mitchell 2014-07-16 11:26:37 +10:00
  • 75a59eb5cc Rename JS file so that it is loaded after the spree code it is overriding. Admin can't add products outside distribution to an order. Rohan Mitchell 2014-07-16 11:26:22 +10:00
  • ea357b54ab Adding some map searching capabilities Will Marshall 2014-07-16 11:19:16 +10:00
  • 6dfd26ac69 order_with_totals_and_distribut{or,ion} Rohan Mitchell 2014-07-16 10:33:23 +10:00
  • 42b951c972 Variants controller #search filters by distribution Rohan Mitchell 2014-07-16 10:31:12 +10:00
  • f18141c9bb Use controller login helpers Rohan Mitchell 2014-07-16 10:29:58 +10:00
  • d81a78b907 Add spec helper method for logging in as admin in controller specs Rohan Mitchell 2014-07-16 10:15:27 +10:00
  • b7a08bcb9b Add Spree::Variant.in_order_cycle Rohan Mitchell 2014-07-11 12:48:12 +10:00
  • 0ecfee79d4 Add Spree::Variant.in_distributor Rohan Mitchell 2014-07-11 12:33:25 +10:00
  • edeb820c64 Send distributor and order cycle id to order add variant autocomplete search Rohan Mitchell 2014-07-11 10:11:02 +10:00
  • ff507b4b25 Put db backups in their own bucket on S3, put db2fog cron commands in schedule.rb Rohan Mitchell 2014-07-09 16:10:43 +10:00
  • 3758a8ae2b Add rake task to export enterprises to CSV Rohan Mitchell 2014-07-09 14:04:51 +10:00
  • 7a3f68ea38 Update Rails to 3.2.19 Rohan Mitchell 2014-07-09 11:03:41 +10:00
  • 58e6379e43 Merge branch 'master' into fix_units Rafael Schouten 2014-07-14 15:10:26 +01:00
  • 9f5f319edb Further patching regression Will Marshall 2014-07-11 17:55:06 +10:00
  • a73bc2405d Fixing one regression Will Marshall 2014-07-11 17:08:39 +10:00
  • 353ee20feb Animations fix Will Marshall 2014-07-11 17:07:54 +10:00
  • 744f254353 Patching a minor bug Will Marshall 2014-07-11 17:02:43 +10:00
  • a31f17cdbd Merge branch 'laura_and_will' Will Marshall 2014-07-11 16:51:50 +10:00
  • 5e68d0bab7 Basic final version Will Marshall 2014-07-11 16:51:46 +10:00
  • 679547058e Merge branch 'laura_and_will' Will Marshall 2014-07-11 16:40:47 +10:00
  • 06047a380e Provisional animations Will Marshall 2014-07-11 16:40:44 +10:00
  • e940777ede Few more animation fixes Will Marshall 2014-07-11 16:33:23 +10:00
  • d43fa7eed5 Fixing animations for shopfront summerscope 2014-07-11 16:16:56 +10:00
  • 500e067cfb Performance enhancements Will Marshall 2014-07-11 16:14:44 +10:00
  • 7bd65d7854 Performance improvements Will Marshall 2014-07-11 15:09:20 +10:00
  • c852eefdbc Re-enabling infinite scroll Will Marshall 2014-07-11 13:05:14 +10:00
  • d67992eb7b Tweak animation stylings summerscope 2014-07-11 15:07:29 +10:00
  • 26d6ac5a8d Styling no results message for shopfront summerscope 2014-07-11 14:50:40 +10:00
  • 1eb18e8478 Add some padding to first child in active table - should not be styled from animation classes summerscope 2014-07-11 14:42:44 +10:00
  • 16d39aeacc Tweak line-height on product row in shopfront summerscope 2014-07-11 14:41:46 +10:00
  • 13cc9ba44d Remove line-height stuff which was making the animation in juddery summerscope 2014-07-11 14:41:18 +10:00
  • 23182a9026 Grid system layout for filter buttons for all sizes and breakpoints summerscope 2014-07-11 13:10:22 +10:00
  • 068e3cce1c More tweaks to filters styling summerscope 2014-07-11 13:09:42 +10:00
  • c907e35834 More styling on search and filters summerscope 2014-07-11 12:44:43 +10:00
  • 61dbc2cd63 Replace for shipping selector Will Marshall 2014-07-11 12:54:40 +10:00
  • 21d1d2d1c1 Replacing taxon directive Will Marshall 2014-07-11 12:53:32 +10:00
  • 190e320bad Pulling some structure out of directives Will Marshall 2014-07-11 12:45:08 +10:00
  • fecc68cff8 Dereferencing product Taxons Will Marshall 2014-07-11 12:40:49 +10:00
  • ef55bf97c6 Bunch of small fixes for Laura Will Marshall 2014-07-11 12:37:04 +10:00
  • d4a6624c28 Prevent display_as and display_name from being used when blank Rob H 2014-07-10 17:04:35 +10:00
  • 40b858306b Make all taxons sentence case. ALl of them! for reals yo. summerscope 2014-07-11 12:36:27 +10:00
  • 88b1b8b104 Styling search for shopfront page summerscope 2014-07-11 12:27:51 +10:00
  • 6adc056ce0 Styling filters and search on shopfront summerscope 2014-07-11 12:27:35 +10:00
  • 46017be45c Make big input fill out all width available summerscope 2014-07-11 12:27:17 +10:00
  • fa337fcd6e Prevent display_as and display_name from being used when blank Rob H 2014-07-10 17:04:35 +10:00
  • 7dde721486 Adding taxon filtering Will Marshall 2014-07-10 15:26:35 +10:00
  • 26e8a1fd91 Uncaching some parts and adding specs Will Marshall 2014-07-10 14:49:21 +10:00
  • 55bd23f02b Merge branch 'laura_and_will' Will Marshall 2014-07-10 14:18:32 +10:00
  • 932ca95ec5 Sorting hubs by active Will Marshall 2014-07-10 12:59:59 +10:00