Commit Graph

  • 4b87e39fd7 Adding in content for modals summerscope 2014-04-24 17:09:55 +10:00
  • 9ef7023600 Adding template cache injection Will Marshall 2014-04-24 17:05:10 +10:00
  • 962a9cb5f7 Moving partials from darkswarm to hubs Will Marshall 2014-04-24 16:53:46 +10:00
  • f9b7b602da Moving from darkswarm to home Will Marshall 2014-04-24 16:53:00 +10:00
  • f6bfc71c4b Various small functional tweaks Will Marshall 2014-04-24 16:28:12 +10:00
  • 07ace99adc Add informational warnings to admin enterprises index page Rob H 2014-04-24 16:10:40 +10:00
  • 566704a968 Alter enterprise index order Rob H 2014-04-24 16:09:52 +10:00
  • 85db8859bb On admin order cycle edit page, do not show exchanges for enterprises the user doesn't manage Rohan Mitchell 2014-04-24 15:51:39 +10:00
  • 29cf40a5bf Add visual indication that no payment/shipping/fees exist to enterprise index Rob H 2014-04-24 15:35:59 +10:00
  • 43106d5db8 Add explanation to top of BOM Rob H 2014-04-24 15:10:45 +10:00
  • 2603256a17 Extract admin order cycle index row into partial Rohan Mitchell 2014-04-24 14:53:32 +10:00
  • d0585b4d05 Admin order cycle listing does not show order cycles that enterprise users don't have access to Rohan Mitchell 2014-04-24 14:43:33 +10:00
  • 4b95b9979e Homepage styling and pretties summerscope 2014-04-24 14:12:27 +10:00
  • c86586fc16 Remove collection date from admin enterprises index Rob H 2014-04-24 13:57:56 +10:00
  • 47468127c2 New pictures added summerscope 2014-04-24 13:56:30 +10:00
  • 7b794324d3 Adding pretty pictures summerscope 2014-04-24 13:53:08 +10:00
  • b59aa53158 Add edit order button to BOM Rob H 2014-04-24 13:49:28 +10:00
  • 8dd9260163 Do not add dummy distributor to orders without one - they don't need it Rohan Mitchell 2014-04-11 16:55:54 +10:00
  • b649d6ef69 Authorise access to OrderCycles API Rohan Mitchell 2014-04-11 13:36:26 +10:00
  • 3c8757034a Enterprise user can soft-delete a variant. BUT, only its own variants. Rohan Mitchell 2014-04-11 13:18:28 +10:00
  • 8715b71151 Do not show rspec profiling by default Rohan Mitchell 2014-04-11 12:34:11 +10:00
  • 7931a2e8da Test managed products API access for all user types Rohan Mitchell 2014-04-11 12:31:23 +10:00
  • 6c86254a90 Extract sign_in_as_user method, test managed orders API access for normal user and enterprise user Rohan Mitchell 2014-04-11 12:05:05 +10:00
  • 95a6e34523 Spec access denied to regular user when soft-deleting variants Rohan Mitchell 2014-04-11 11:21:10 +10:00
  • d16d970952 BPE uses soft-delete Rohan Mitchell 2014-04-04 14:12:27 +11:00
  • e6d988ff34 Nest variant soft delete route under product resource Rohan Mitchell 2014-04-04 14:06:12 +11:00
  • e28a450875 Add API call to soft-delete a variant Rohan Mitchell 2014-04-04 13:28:46 +11:00
  • 4cbe434573 Remove trailing relations on destruction for EnterpriseFee and Variant Rohan Mitchell 2014-04-04 10:50:39 +11:00
  • f7658ad250 Add foreign keys, sanitising data first Rohan Mitchell 2014-04-03 15:32:41 +11:00
  • 2e51518b5b CMS spec being weird Rob H 2014-04-24 11:28:53 +10:00
  • 5ea97b0919 Merge branch 'darkswarm_home' of github.com:openfoodfoundation/openfoodnetwork into darkswarm_home Will Marshall 2014-04-24 11:06:46 +10:00
  • 9bb0abbe48 Merge branch 'master' into darkswarm_home Will Marshall 2014-04-24 10:52:33 +10:00
  • 76f05d13d7 Slow specs on CI Rob H 2014-04-24 10:50:35 +10:00
  • 7c11a4082f Styling tagline summerscope 2014-04-22 16:09:01 +10:00
  • 3ed569b24a Patching a couple of borked specs Will Marshall 2014-04-24 09:52:29 +10:00
  • b4da348e36 Patching a json test Will Marshall 2014-04-23 16:58:38 +10:00
  • c060019873 Adding a learn more modal, restructuring partials Will Marshall 2014-04-23 16:48:53 +10:00
  • 0479a0a55d Fixing bugs, improving dates Will Marshall 2014-04-23 15:46:14 +10:00
  • 16251fe5ea Merging with master Will Marshall 2014-04-23 14:43:39 +10:00
  • 2981412540 Adding some specs, next order cycle, better CSS Will Marshall 2014-04-23 14:38:41 +10:00
  • 8027af2bb7 Adding active boolean and sorting Will Marshall 2014-04-23 13:22:30 +10:00
  • f5b32ebd3f Better handling of the home page hubs Will Marshall 2014-04-23 12:58:34 +10:00
  • 131b4ac073 Hack fix for our API controllers not being able to access Spree's Rabl Responder Rob H 2014-04-23 12:31:30 +10:00
  • b37a701d39 Merge branch 'api_fixes' into bom Rob H 2014-04-23 12:03:01 +10:00
  • 669ec0eee7 Fix failing API specs Rob H 2014-04-23 12:02:27 +10:00
  • 353b26c3df Hack fix for our API controllers not being able to access Spree's Rabl Responder Rob H 2014-04-23 12:02:11 +10:00
  • c5f8e2e123 Better temp text Will Marshall 2014-04-23 11:49:27 +10:00
  • 8e67be6e4f More minor presentation changes Will Marshall 2014-04-22 17:19:13 +10:00
  • 078a23a152 More prettification Will Marshall 2014-04-22 17:08:40 +10:00
  • baa2065238 Tweaking filter to be case insensitive Will Marshall 2014-04-22 16:10:13 +10:00
  • 8b7d2641f9 Starting to prettify with Laura Will Marshall 2014-04-22 15:46:14 +10:00
  • fb072ad1a5 Tweaking debounce, adding it to Shop Will Marshall 2014-04-18 16:56:14 +10:00
  • 35a792b3ca Debouncing things Will Marshall 2014-04-18 16:53:43 +10:00
  • 99d743f7cf Some very basic specs Will Marshall 2014-04-18 16:35:06 +10:00
  • 240b600bfa Adding a No Results case Will Marshall 2014-04-18 16:15:21 +10:00
  • f3e30d10ba Starting some bones for Laura Will Marshall 2014-04-18 16:10:19 +10:00
  • 66d5f08b99 Adding custom filtering to home page Will Marshall 2014-04-18 15:17:12 +10:00
  • 5778a51bf6 Switching to placeholders and so on Will Marshall 2014-04-18 13:08:45 +10:00
  • 6753b96f29 Adding darkswarm variant of home page, getting Angular skeleton into place, taking shit off window Will Marshall 2014-04-18 13:01:36 +10:00
  • c0228e0cc3 Patching the admin JS Will Marshall 2014-04-18 11:37:19 +10:00
  • a5a3f9fe43 Fixing up some minor spec bugs Will Marshall 2014-04-17 17:22:30 +10:00
  • e2d3207a51 Namespacing accordion state by ID Will Marshall 2014-04-17 15:34:57 +10:00
  • 2532248e6f Fix failing javascript tests Rob H 2014-04-17 15:27:15 +10:00
  • 78fad1cc85 Make more orders load for BOM Rob H 2014-04-17 15:19:48 +10:00
  • 202b45fc5f Aligning text left in Order Summary Will Marshall 2014-04-17 15:15:14 +10:00
  • c6395a686a Adding flash notifications Will Marshall 2014-04-17 15:08:01 +10:00
  • 1b5080ceb4 Remove render Rob H 2014-04-17 12:28:28 +10:00
  • 5345e8d339 Add accessible_by scope to enterprises model and accessible action to enterprises API Rob H 2014-04-17 12:23:09 +10:00
  • 3b440ed027 Minor JS tweaks Will Marshall 2014-04-17 11:47:59 +10:00
  • f2a048bf6e Adding another autofocus Will Marshall 2014-04-17 10:50:49 +10:00
  • 20a5278a75 Merge branch 'master' into bom Rob H 2014-04-17 09:23:08 +10:00
  • 83e3172901 Add accessible action to order_cycles controller for listing order_cycles by enterprises invloved Rob H 2014-04-16 18:27:50 +10:00
  • 2eb21a024c Tiny fixes to API orders controller spec Rob H 2014-04-16 18:24:17 +10:00
  • a7c2849e6b Moving icons around, adding a useful comment Will Marshall 2014-04-16 16:24:03 +10:00
  • 171c8c6ed1 Merging in with master Will Marshall 2014-04-16 16:16:15 +10:00
  • 20e1392736 Focusing appropriate fields as we move through the form Will Marshall 2014-04-16 16:13:04 +10:00
  • d83367486b Adding icons to checkout, focusing on first input in each panel when selected Will Marshall 2014-04-16 16:07:19 +10:00
  • c68aeb4c36 Only show orders I am distributing in the API Rob H 2014-04-16 14:54:50 +10:00
  • 2b9b51de60 Don't cache things in window Will Marshall 2014-04-16 11:55:16 +10:00
  • 2b283405e7 Only admin and users of distributors can access admin orders Rob H 2014-04-13 10:09:17 +10:00
  • 6452ebf67d Make spec more robust Rohan Mitchell 2014-04-11 10:19:04 +10:00
  • aa1c28b163 Move enterprises api controller out of spree namespace Rohan Mitchell 2014-04-11 10:09:25 +10:00
  • 8ad7cac639 Do not need to protect here, since we're clearing all unit option values earlier in this method Rohan Mitchell 2014-04-11 09:16:26 +10:00
  • 47ac097eb7 Do not show deleted variants on shopfront Rohan Mitchell 2014-04-10 12:35:49 +10:00
  • 19b8cee38e Patching up some more bugs, adding workflow Will Marshall 2014-04-11 17:58:32 +10:00
  • 2d9be9ea06 Fixing the scope issue Will Marshall 2014-04-11 17:49:51 +10:00
  • 9cb56c61ae Patching a bug in which carts get emptied Will Marshall 2014-04-11 17:32:39 +10:00
  • 2e0485c064 Getting the entire order into localStorage: one bug with radio boxes Will Marshall 2014-04-11 17:24:32 +10:00
  • c8012e7045 Improving panel workflow, moving back to simple format for Order service Will Marshall 2014-04-11 16:43:21 +10:00
  • 5268938d49 Focusing on the first form field Will Marshall 2014-04-11 13:41:43 +10:00
  • 96913ad922 Changing the order confirmation text with Kirsten Will Marshall 2014-04-11 13:33:13 +10:00
  • 65c15ca20b Changing message for order cycle selector popup Will Marshall 2014-04-11 13:12:40 +10:00
  • 6e35dc7168 Merging with master Will Marshall 2014-04-11 13:09:22 +10:00
  • 9f3bf0b8f1 Pending the checkout auth tests, since they're testing a monkeypatch Will Marshall 2014-04-11 12:50:06 +10:00
  • 2e5425d931 Pulling over some test changes Will Marshall 2014-04-11 12:48:28 +10:00
  • 33cf05ab83 Manually bringing over the login links for checkout Will Marshall 2014-04-11 12:37:32 +10:00
  • cf3681b934 Moving over the new checkout authentication Will Marshall 2014-04-11 12:26:36 +10:00
  • c01050361e Use coffeescript syntactic sugar Rob H 2014-04-11 10:33:49 +10:00
  • ff531f0e18 Producers can only list line items which contain products they supply Rob H 2014-04-11 09:39:01 +10:00
  • da241a4eee Removing some debugging Will Marshall 2014-04-10 17:26:00 +10:00