Commit Graph

  • 864c9ec1da This changes the user menu labels to show Account next to user email. Small tweak to user account page to make it less awful. summerscope 2015-03-13 16:49:26 +11:00
  • b0cfa6a17c Shipping method prices displayed next to options in checkout Rob Harrington 2015-03-13 16:18:49 +11:00
  • 51258b242c Merge remote-tracking branch 'origin/order-confirmation' into order-confirmation Rob Harrington 2015-03-13 16:07:17 +11:00
  • dc1dd2e243 Changing the class .filter-box for shopfront to .filter-shopfront This prevents the issue with inheritance / styling crossover summerscope 2015-03-13 16:06:46 +11:00
  • 1a44e74a9d When enterprise user creates an enterprise, make it a hub if they have other hubs Rohan Mitchell 2015-03-13 16:06:42 +11:00
  • e3bc7cf894 Styling for search alert on shopfront page summerscope 2015-03-13 15:36:06 +11:00
  • e5cc9063e8 Changing the medium input styling to make it same height as taxon filters, and no animation to get big as we want the next row space for tags eventually summerscope 2015-03-13 15:35:45 +11:00
  • 88edaceee0 Adding a new color to brand colors - yellow light summerscope 2015-03-13 15:34:38 +11:00
  • bce64a1ead WIP product modals for shopfront summerscope 2015-03-13 15:34:11 +11:00
  • c8c07ed700 Adding position fixed to modals - got lost somehow with upgrading foundation zurb summerscope 2015-03-13 12:59:26 +11:00
  • efbf2c7ffa Display extended variant name in quick cart Rohan Mitchell 2015-03-13 12:58:53 +11:00
  • 0258fc24f3 Moving comments to own line. New version of SASS does not like comments on same line as declarations. summerscope 2015-03-13 12:58:45 +11:00
  • 6365434a94 Merge branch 'lin-d-hop-ordercyclemanagementreports2' Rohan Mitchell 2015-03-13 10:53:03 +11:00
  • d9f90be38a Fix indentation Rohan Mitchell 2015-03-13 10:52:44 +11:00
  • 008b43b1fc Merge branch 'ordercyclemanagementreports2' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-ordercyclemanagementreports2 Rohan Mitchell 2015-03-13 10:47:49 +11:00
  • 5609354136 Fix bug: When there are variant overrides not owned by the current user, user is unable to make any changes to VOs Rohan Mitchell 2015-03-12 14:54:20 +11:00
  • d9e8ce2f0e Fix bug in report that selecting multiple payment methods didn't work. Added spec as well Lynne Davis 2015-03-12 17:16:51 +11:00
  • cce65aa462 Merge remote-tracking branch 'origin/master' into order-confirmation Rob Harrington 2015-03-12 16:20:21 +11:00
  • 44511b8b61 Only display shipping description if it exists Rob Harrington 2015-03-12 16:18:30 +11:00
  • eb413ccc84 Committing schema changes Rob Harrington 2015-03-12 16:18:07 +11:00
  • 6cd6b751c8 Merge branch 'master' into order-confirmation Rob Harrington 2015-03-12 15:34:49 +11:00
  • af95181245 Merge branch 'lin-d-hop-ordercyclemanagementreports2' Rohan Mitchell 2015-03-12 12:30:49 +11:00
  • 36fa4896ed Syntax Rohan Mitchell 2015-03-12 12:28:35 +11:00
  • 7c723c04b6 Show yes/no instead of true/false Rohan Mitchell 2015-03-12 12:23:02 +11:00
  • c85d5b86eb Fix temperature_controlled migration - NOT NULL requires default value Rohan Mitchell 2015-03-12 12:22:51 +11:00
  • 1a97df1d21 Fix whitespace issues Rohan Mitchell 2015-03-12 12:17:15 +11:00
  • a5716cf2c2 Merge branch 'ordercyclemanagementreports2' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-ordercyclemanagementreports2 Rohan Mitchell 2015-03-12 12:15:22 +11:00
  • b4e990a081 Merge branch 'reduce-supplier-list-in-order-cycles' Rohan Mitchell 2015-03-12 11:55:46 +11:00
  • eccd97fc28 Merge branch 'master' into reduce-supplier-list-in-order-cycles Rohan Mitchell 2015-03-12 11:55:14 +11:00
  • c4d4d10873 Reuse supplier/distributor list Rohan Mitchell 2015-03-12 11:53:13 +11:00
  • 1e5e009735 Spree init works when database has not been created, remove duplicate FK from db/schema.rb Rohan Mitchell 2015-03-12 11:29:01 +11:00
  • 274a7a3c73 Fixing up the one liner filter styling a bit Rob Harrington 2015-03-12 09:56:06 +11:00
  • f90f7565fb Allow admins to delete Order Cycles Victor Nava 2015-03-11 18:08:09 +11:00
  • 208fa02ec0 Create a 'Show More' button at the top of the page, next to New Order on on admin order cycles index page Victor Nava 2015-03-11 13:14:45 +11:00
  • 2c89573441 Shave off a few seconds when showing order_cycles#index by loading order_cycle_enterprises only once. Victor Nava 2015-03-11 11:59:25 +11:00
  • 717b3b6494 #275: Fixes for testing aggregated orders. Paul Mackay 2015-03-10 19:19:57 +00:00
  • ea96759306 Take styling out of template into SASS summerscope 2015-03-10 14:59:46 +11:00
  • d967905b83 Tweaking copy styles and removing references to Open Sans which not using. Silly laura mixing up repos summerscope 2015-03-10 14:59:26 +11:00
  • f698408d40 Logic for delivery vs collection - making template summerscope 2015-03-10 14:58:58 +11:00
  • 75b0b290ae More WIP trying to work on the cart template logic with Rohan summerscope 2015-03-10 14:12:43 +11:00
  • 21b18a8cc5 WIP commit so i can see what i messed up. summerscope 2015-03-10 12:31:53 +11:00
  • 91bf588bcc Order details page add in mini thumbnail for product image summerscope 2015-03-10 12:03:21 +11:00
  • a8de4dc039 WIP checkout page and order confirmation page. Working on making these pages more consistent to each other, to email confirmation, and to shopping experience. summerscope 2015-03-10 11:35:53 +11:00
  • c7cf9695bc WIP on cart menu trying to add the master name back in where a product has variante summerscope 2015-03-10 11:35:35 +11:00
  • b9a0579397 Add styling for image thumbnail - hide for small, show small thumbnail for big screens. summerscope 2015-03-10 11:35:03 +11:00
  • de6abc3464 Turning off z-index this causes problems on shopping cart page. Needs testing to confirm does not break elsewhere. summerscope 2015-03-10 11:34:31 +11:00
  • 0a300d1802 Rewriting small cart, so that it doesn't break all of the dropdowns on the page (can't use .row within li elements it seems...) Rob Harrington 2015-03-06 19:03:46 +11:00
  • 12c6878cbe Using vanilla foundation Rob Harrington 2015-03-06 19:02:15 +11:00
  • 4c4490a9b7 Upgrading foundation-rails and sass Rob Harrington 2015-03-06 19:01:39 +11:00
  • 578475a403 Filter products list on shop by active properties Rob Harrington 2015-03-06 16:14:11 +11:00
  • 881313edf9 Changing the logic on Shipping accordion on checkout to try to show shipping price against option. Not working. summerscope 2015-03-06 16:05:42 +11:00
  • 381bfd383b Allow enterprise fee with no tax category Rohan Mitchell 2015-03-06 12:12:33 +11:00
  • 266d6ef834 Fixed handling of distributors field Liv Galendez 2015-03-06 11:55:35 +11:00
  • 3e2142c3cf Remove the hover / pop-up over the # variants on admin order cycles index page Victor Nava 2015-03-06 11:33:03 +11:00
  • e948bf1591 Only render selector icons if the icon exists Rob Harrington 2015-03-06 11:32:01 +11:00
  • 06f10398da Adding product property filter to shop page Rob Harrington 2015-03-06 11:22:52 +11:00
  • 1e18f773f5 Switch context -> describe, clarify test grammar Rohan Mitchell 2015-03-06 11:15:07 +11:00
  • 41792395aa Record the tax included in per-item EnterpriseFees Rohan Mitchell 2015-03-06 11:13:47 +11:00
  • 98ff895f5f Record the tax included in per-order EnterpriseFees Rohan Mitchell 2015-03-06 10:35:40 +11:00
  • c3c1573f54 Adding a comment summerscope 2015-03-05 23:22:31 +11:00
  • 55b8918ea1 Updating comment Rob Harrington 2015-03-05 18:38:01 +11:00
  • 067b814daa Making legacy filters work properly with filter-selector directive Rob Harrington 2015-03-05 18:29:12 +11:00
  • c992937608 Moving taxon-selector directive to correct location Rob Harrington 2015-03-05 18:28:49 +11:00
  • cb623b75c1 Generalising taxons-selector -> filter-selector Rob Harrington 2015-03-05 18:15:14 +11:00
  • 3fe1fc3f67 Use dates way into the future so that test that depend on OrderSycles#recently_closed don't break. Victor Nava 2015-03-05 17:32:55 +11:00
  • d6c30ae1ef OrderCycle#recently_closed doesn't return orders that are open Victor Nava 2015-03-05 16:46:51 +11:00
  • a0af22350d Order conf page WIP summerscope 2015-03-05 17:21:25 +11:00
  • e3b660abb9 Shopping cart page update to simplify, improve and expose fees summerscope 2015-03-05 17:21:13 +11:00
  • 9a86e41942 Adding more helper classes summerscope 2015-03-05 17:20:02 +11:00
  • e7854bcd8e Moving single line selectors to template, making sure other users of taxons-selector still work Rob Harrington 2015-03-05 16:38:21 +11:00
  • a21bfc909a Remove the suppliers column on admin order cycles index page Victor Nava 2015-03-05 16:12:31 +11:00
  • 1b709a3e03 Do not load Order Cycles that closed more than a month a go Victor Nava 2015-03-05 16:03:48 +11:00
  • 0142f9467a Improve display of overflow selectors Rob Harrington 2015-03-05 16:00:53 +11:00
  • 24b40182b5 clearAll for product page also clears any text search filter Rob Harrington 2015-03-05 15:34:27 +11:00
  • ed94cf57d3 Adding the 'more' box for single-line-selectors Rob Harrington 2015-03-05 15:10:42 +11:00
  • b5ce056d06 Fix tax calculations for determining tax included in an amount Rohan Mitchell 2015-03-05 13:03:53 +11:00
  • 5bddada013 Removing unnecessary setter Rob Harrington 2015-03-05 12:18:34 +11:00
  • 4afef8215a Basic implementation of single line selectors Rob Harrington 2015-03-05 12:12:36 +11:00
  • 574a215525 Order Confirmation Page WIP summerscope 2015-03-05 11:26:29 +11:00
  • 2cdab7af25 More label tweaks and logic tweaks to templates summerscope 2015-03-05 11:26:15 +11:00
  • 235bb009e8 Tweaking styling for order confirmation page summerscope 2015-03-05 11:25:57 +11:00
  • 4e1eb33ff5 Redirect users to proper login page when they type /login Victor Nava 2015-03-05 11:25:35 +11:00
  • dfb855bd14 Record the tax included in shipping. Rohan Mitchell 2015-03-02 15:17:14 +11:00
  • 9395f6c808 Record the tax included in adjustments. TaxRate adjustments consist of 100% tax. Rohan Mitchell 2015-03-02 11:01:37 +11:00
  • 53fa71d1f3 Admin can set enterprise fee's tax category Rohan Mitchell 2015-02-26 09:20:35 +11:00
  • 61c08997a1 EnterpriseFee has a TaxCategory Rohan Mitchell 2015-02-25 22:25:53 +11:00
  • dd61034908 Fix fractional cents appearing on sales tax report totals Rohan Mitchell 2015-01-13 14:47:13 +11:00
  • ec22f4c09f Sales tax report pulls sales tax from adjustments instead of recalculating it at report-time Rohan Mitchell 2015-01-13 13:46:09 +11:00
  • 54894fb222 Update spec with correct tax amounts Rohan Mitchell 2015-01-09 15:24:55 +11:00
  • 11f59c9f59 Add spec for calculating shipping tax. Fix incorrect formula. Rohan Mitchell 2015-01-09 15:21:54 +11:00
  • 27a730ef6c Add spec for sales tax report totals calcs Rohan Mitchell 2015-01-09 15:05:25 +11:00
  • 10e5d09416 Use ReportsHelper for currency_symbol Rohan Mitchell 2015-01-08 14:15:57 +11:00
  • 3b4d73760b Break up sales tax report into methods Rohan Mitchell 2015-01-08 14:12:18 +11:00
  • 89199ef30a Use map instead of each and var Rohan Mitchell 2015-01-08 12:46:41 +11:00
  • 67c77cea81 Tidy up haml Rohan Mitchell 2015-01-08 12:41:42 +11:00
  • cc7d6cde1d Shorter syntax Rohan Mitchell 2015-01-08 12:35:37 +11:00
  • 0b636c1d89 Combine spec cases for faster runtime Rohan Mitchell 2015-01-08 15:04:48 +11:00
  • 2b9fef6aec Convert to Ruby 1.9 hash syntax Rohan Mitchell 2015-01-08 14:57:39 +11:00
  • 3aa30af199 Remove unneeded objects from spec setup Rohan Mitchell 2015-01-08 14:55:19 +11:00
  • 0212351d32 Tighten test Rohan Mitchell 2015-01-08 14:48:06 +11:00