Commit Graph

  • 7ad9fdf0be Cleaning permalink before checking Rob Harrington 2015-01-20 08:24:12 +11:00
  • 6b10a4a775 Restoring enterprise permalinks when they cause errors Rob Harrington 2015-01-16 18:17:15 +11:00
  • 4088bdc236 Clean up permalink checker Rob Harrington 2015-01-16 17:56:24 +11:00
  • 9b78963d5a Adding a javascript interface for checking permalinks and user input on enterprise console Rob Harrington 2015-01-16 17:23:47 +11:00
  • 3ec3441cfa Replacing all uses of the old enterprise shop url helper Rob Harrington 2015-01-16 12:57:48 +11:00
  • 39889390ef Altering shop page routing so that shop url is copy-and-pastable Rob Harrington 2015-01-16 12:35:58 +11:00
  • c3659612ed enterprise routes use permalink Rob Harrington 2015-01-16 10:12:17 +11:00
  • 7a6cd98646 Fixing failing spec, missing permalink Rob Harrington 2015-01-15 16:33:04 +11:00
  • 9286c82b43 Removing obsolete methods Rob Harrington 2015-01-15 15:08:46 +11:00
  • c330e49a7f Moving permalink check action to enterprise controller Rob Harrington 2015-01-14 14:26:21 +11:00
  • e2268e53bb Adding action to check uniquness of enterprise permalink against existing routes Rob Harrington 2015-01-14 12:16:24 +11:00
  • 9f0aeb5adf Adding unique permalink to enterprises Rob Harrington 2014-12-19 16:07:51 +11:00
  • 0d9a0919e5 show contact a group's contact footer Maikel Linke 2015-01-21 16:39:41 +11:00
  • c1aa2f9b33 Display contact information in the front end Maikel Linke 2015-01-21 16:12:28 +11:00
  • 650e35c13e Adding contact information to groups backend Maikel Linke 2015-01-21 15:34:31 +11:00
  • 71de15b3e4 Contact address for enterprise group Maikel Linke 2015-01-21 12:32:07 +11:00
  • 41e42c78c4 Update spec link name Rohan Mitchell 2015-01-16 17:25:38 +11:00
  • 1753432f36 Adding new loading animation to replace ugly and large gif summerscope 2015-01-16 17:06:40 +11:00
  • 0f8809abfc Merge branch 'master' into shopfront-filters summerscope 2015-01-16 16:12:34 +11:00
  • 1d80bee595 Cart item total reflects total number of items in the cart Rob Harrington 2015-01-16 16:06:51 +11:00
  • d04e843315 kill unused line summerscope 2015-01-16 16:01:17 +11:00
  • c0eb902eef Turn off text shadow for buttons on popover for top nav summerscope 2015-01-16 16:00:18 +11:00
  • 2c307f09c3 Changing edit cart button to link Rob Harrington 2015-01-16 15:47:56 +11:00
  • 23fc428d95 Move spinner icon to left of text summerscope 2015-01-16 14:57:30 +11:00
  • 3bd77c74a5 Improve logic on shopping cart button to add meaningful labels for various states summerscope 2015-01-16 14:57:09 +11:00
  • 8334ff736b Styling for shopping cart buttons and spinner summerscope 2015-01-16 13:27:34 +11:00
  • 51687b5c2c Tweak language and styling for the CTA buttons taking users to shopping cart and checkout pages summerscope 2015-01-16 13:27:16 +11:00
  • 21108b34b6 Add new animation for spinning summerscope 2015-01-16 13:26:40 +11:00
  • 2a21889216 Remove border on product thumbnail to clean up UI summerscope 2015-01-16 13:06:30 +11:00
  • b451b94fd1 Improving styling on large thumbnail view of product images summerscope 2015-01-16 13:06:02 +11:00
  • d2d3a577ea Merging master into this branch to make it easy to pull for staging push summerscope 2015-01-15 17:38:35 +11:00
  • b3e67fa164 Take two on disabled logic Rob Harrington 2015-01-15 17:34:04 +11:00
  • ac34da4f24 Altering logic around disabled state for 'Your Shopping Cart' button Rob Harrington 2015-01-15 17:19:48 +11:00
  • d2277999cc Undo change of logic on disabled state on Shopping cart button summerscope 2015-01-15 17:13:10 +11:00
  • cdd6c2daf2 Styling product summary row to allow for hiding product thumb at a larger break point summerscope 2015-01-15 16:46:55 +11:00
  • 4a881a5aa5 Turn off product thumb at a larger break point summerscope 2015-01-15 16:46:18 +11:00
  • d5d218c450 Make taxon flag smaller for smallest device breakpoint summerscope 2015-01-15 16:45:54 +11:00
  • f8622be21d Adding in new color variable summerscope 2015-01-15 16:45:29 +11:00
  • 676e7cb4d6 Make taxon flag 2 cols for small devices summerscope 2015-01-15 16:45:09 +11:00
  • 1dfbc88813 Change logic on disabled class on Your shopping cart button as this was swapped the wrong way around summerscope 2015-01-15 16:16:01 +11:00
  • 9db1c4c708 Adding in new color variable summerscope 2015-01-15 16:15:23 +11:00
  • 25a734b208 When creating enterprise, establish relationships with the owner's hubs Rohan Mitchell 2015-01-15 16:08:03 +11:00
  • 47a8731b8e Styling for price column to distinguish between product added vs null summerscope 2015-01-15 16:01:49 +11:00
  • 932604bd69 Add in logic to style price column differently if nul vs has value summerscope 2015-01-15 16:01:00 +11:00
  • 4d7871a0bb New grey color variable summerscope 2015-01-15 16:00:21 +11:00
  • 51c8891fac Add animation to product title hover summerscope 2015-01-15 15:24:01 +11:00
  • 9b258e075b Add styling and animation to img thumbnail summerscope 2015-01-15 15:23:36 +11:00
  • 891a9b06a8 Add expand icon on top of image thumbnail summerscope 2015-01-15 15:23:10 +11:00
  • 4dc0701213 Side menu for enterprise group page Maikel Linke 2015-01-15 15:04:21 +11:00
  • b5879d51ac Merging master into shopfront-filters branch summerscope 2015-01-15 14:15:25 +11:00
  • dcc04ea538 On enterprise edit page, do not show side menu links we don't have permission to Rohan Mitchell 2015-01-15 12:39:16 +11:00
  • 83754a01ef Make side menu item visibility declarative Rohan Mitchell 2015-01-15 11:34:01 +11:00
  • 2d82f76a43 Fix changed var in ability spec Rohan Mitchell 2015-01-14 14:52:43 +11:00
  • d5437e1508 edit_profile permission no longer shows links to manage shipping methods, payment methods and enterprise fees for an enterprise Rohan Mitchell 2015-01-14 14:46:59 +11:00
  • f0bd9c1065 Fix failing specs due to addition of another enterprise Rohan Mitchell 2015-01-14 14:42:31 +11:00
  • 642de2f65f Only show delete enterprise link when user has permission Rohan Mitchell 2015-01-14 12:16:49 +11:00
  • f6e9c9494c Enterprise user can edit profiles it has permission to Rohan Mitchell 2015-01-14 11:03:32 +11:00
  • 90ad2e2b7d Allow enterprises with 'edit profile' permission to edit enterprises Rohan Mitchell 2015-01-14 11:03:16 +11:00
  • cfb69ae7d2 Add Permissions#editable_enterprises Rohan Mitchell 2015-01-14 11:02:38 +11:00
  • a93a824b83 Admin can grant permission for an enterprise to edit the profile of another Rohan Mitchell 2015-01-14 10:02:23 +11:00
  • 2170c7ede1 Fix broken JS spec Rohan Mitchell 2015-01-14 09:36:41 +11:00
  • 06cf914119 Hopefully resolving order populator strangeness related to concurrency by ensuring a fresh list of line items Rob Harrington 2015-01-15 12:10:05 +11:00
  • 3e5dfda324 Removing old link to enterprise groups from configuration menu Maikel Linke 2015-01-15 10:53:11 +11:00
  • 13cbbcef40 Admin Tab Menu: converting .rb to .html.haml.deface Maikel Linke 2015-01-15 10:26:27 +11:00
  • 949808e839 Customising AdaptiveMenu for the admin tab panel Maikel Linke 2015-01-14 18:03:08 +11:00
  • 02a276b9c9 Producer and hub lists with search Maikel Linke 2015-01-14 15:18:46 +11:00
  • 9f1a773a58 MapController: copy default config instead of referencing Maikel Linke 2015-01-14 14:34:31 +11:00
  • 0e510998a4 Handling missing options in shipping filter call Maikel Linke 2015-01-14 14:33:37 +11:00
  • 307cc313df Stub scope_to_hub in spec that wasn't expecting it Rohan Mitchell 2015-01-13 11:46:41 +11:00
  • 0431e0048c Merge branch 'master' into variant-overrides-frontend Rohan Mitchell 2015-01-12 16:48:51 +11:00
  • 20bde803c8 Display overridden prices when products are in the cart Rohan Mitchell 2015-01-12 14:58:35 +11:00
  • 6b43354386 Restructure spec Rohan Mitchell 2015-01-12 14:37:43 +11:00
  • 494bb1f3b4 Fix auto-reload nerfing scope_xx_to_hub Rohan Mitchell 2015-01-12 14:01:43 +11:00
  • d52b6b34e3 Spec: do not subtract stock from overrides that do not override count_on_hand Rohan Mitchell 2015-01-12 11:33:53 +11:00
  • 4583e29ae3 When order is placed, subtract stock from variant override Rohan Mitchell 2015-01-12 11:23:53 +11:00
  • a4d4622521 Add VariantOverride.decrement_stock Rohan Mitchell 2015-01-12 10:39:23 +11:00
  • 20f650b472 Add VariantOverride.stock_overriden? Rohan Mitchell 2015-01-12 09:32:02 +11:00
  • e013e1fe00 Don't show rspec profile by default Rohan Mitchell 2015-01-09 15:30:49 +11:00
  • d40ffeef52 Remove old sidebar Rohan Mitchell 2015-01-09 13:10:17 +11:00
  • 6200390369 Merge branch 'lin-d-hop-add_shipping_category' Rohan Mitchell 2015-01-09 12:49:09 +11:00
  • e9f32f5329 Spec that shipping category can be set when creating new products Rohan Mitchell 2015-01-09 12:46:36 +11:00
  • 27bc845b0b Add correct markup for tax category required asterisk Rohan Mitchell 2015-01-09 12:45:35 +11:00
  • 22cb8b7a71 Two-space indentation, change 'Shipping categories' to 'Shipping category' Rohan Mitchell 2015-01-09 12:33:26 +11:00
  • c6db1d440c Merge branch 'add_shipping_category' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-add_shipping_category Rohan Mitchell 2015-01-09 12:30:19 +11:00
  • bc448e5156 Merge branch 'lin-d-hop-report_download_namechange' Rohan Mitchell 2015-01-09 11:51:46 +11:00
  • 6a42f62eb2 Fix filename on order cycle management report csv, add timestamp to it and also users and enterprises report Rohan Mitchell 2015-01-09 11:49:59 +11:00
  • 8db09d9590 Merge branch 'report_download_namechange' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-report_download_namechange Rohan Mitchell 2015-01-09 11:48:23 +11:00
  • 7e55262ce9 Extract most everything to private methods - neatly groups concerns together Rohan Mitchell 2015-01-09 11:20:41 +11:00
  • bbc887a692 Test the exact value, not the truncated value Rohan Mitchell 2015-01-09 11:04:32 +11:00
  • 6f36c0463c Separate data preparation from test conditions Rohan Mitchell 2015-01-09 11:02:00 +11:00
  • 592ac7856a Variable naming Rohan Mitchell 2015-01-09 10:58:35 +11:00
  • 261dea37e9 Spec formatting Rohan Mitchell 2015-01-09 10:53:24 +11:00
  • 80c507cc66 Formatting Rohan Mitchell 2015-01-09 10:51:57 +11:00
  • 1ad13f0359 Cleanup of git to remove unnecessary commits from pull request Lynne Davis 2014-12-28 11:22:39 +00:00
  • 532041c07b Use Fuubar formatter for rspec - displays fails as they happen Rohan Mitchell 2015-01-08 12:12:15 +11:00
  • 05bd0c4168 Merge branch 'Matt-Yorkley-reports_2' Rohan Mitchell 2015-01-08 10:50:27 +11:00
  • 51b0d7e0eb Move private method to helper Rohan Mitchell 2015-01-08 10:46:03 +11:00
  • d2e0d4f44a Fix grammar Rohan Mitchell 2015-01-08 10:39:51 +11:00
  • ab26902e4e Move money decorator to lib dir, as it's a decorator for a lib class, not a model Rohan Mitchell 2015-01-08 10:39:14 +11:00
  • 6adb4194c2 Extract date range form to partial Rohan Mitchell 2015-01-08 10:31:51 +11:00