Commit Graph

  • cf06cab533 Tweak header to be consistent with other admin pages summerscope 2014-10-23 17:23:58 +11:00
  • 9bc8531850 Add comment Rohan Mitchell 2014-10-23 16:48:16 +11:00
  • ee5cd599aa Add basic details for the single enterprise dashboard Rohan Mitchell 2014-10-23 16:33:17 +11:00
  • aea8ab4c7f Move #manages_one_enterprise? from User model to Permissions Rohan Mitchell 2014-10-23 16:32:43 +11:00
  • e1cf5ceb57 Can set producer_profile_only using welcome page Rob Harrington 2014-10-23 16:40:58 +11:00
  • 996b2f2604 Adding 'producer_profile_only' flag to enterprises Rob Harrington 2014-10-23 16:06:20 +11:00
  • d94ca0174a Registration process sets sells to 'unspecified' Rob Harrington 2014-10-23 15:47:46 +11:00
  • f09698be47 Select all works on simple order cycles edit interface Rohan Mitchell 2014-10-23 15:54:52 +11:00
  • 7faf6e12ea Clean up simple order cycle interface Rohan Mitchell 2014-10-23 15:53:16 +11:00
  • 4f2327f05c More styling for Next button and error message summerscope 2014-10-23 15:46:56 +11:00
  • d50cd023d4 Adding login nav to header on bare_admin layout Rob Harrington 2014-10-23 15:21:16 +11:00
  • ce346d3bca Styling stripes with CSS3, remove the image instead summerscope 2014-10-23 15:17:17 +11:00
  • e67f039791 Merging in remote changes Rob Harrington 2014-10-23 14:53:21 +11:00
  • e9a6c9d0ce Adding header to welcome page Rob Harrington 2014-10-23 14:50:56 +11:00
  • 67c82e81de Fixing form on welcome page Rob Harrington 2014-10-23 14:41:00 +11:00
  • 04af954432 Tweak language summerscope 2014-10-23 14:33:19 +11:00
  • bcc8198019 Merge in changes on remote branch Rob Harrington 2014-10-23 14:30:56 +11:00
  • d6947b119f Welcome markup make alternative markup consistent summerscope 2014-10-23 14:28:53 +11:00
  • 204c7d9690 Selected state push summerscope 2014-10-23 14:26:52 +11:00
  • 77c0e36ed6 Adding input validation to welcome page Rob Harrington 2014-10-23 14:23:50 +11:00
  • 694724d177 Refactoring and styling Welcome screen dashboard admin WIP summerscope 2014-10-23 14:23:35 +11:00
  • bf9cd4a12b Tweak image add gradient blur and slightly less dark summerscope 2014-10-23 14:23:23 +11:00
  • f5aae7d214 Pretty stripy background tile summerscope 2014-10-23 14:23:04 +11:00
  • bf61d12bfa Merge branch 'simple-order-cycles' Rohan Mitchell 2014-10-23 12:11:34 +11:00
  • 7d9c5f9e2c Adding form elements for submission of sells preferences on welcome page Rob Harrington 2014-10-23 11:40:11 +11:00
  • b11c291df1 Add set_sells controller action for enterprises Rob Harrington 2014-10-23 11:39:33 +11:00
  • 5a837226a4 Route set_sells through put rather than post Rob Harrington 2014-10-23 11:38:51 +11:00
  • ab76c66b68 Admin can update order cycles with simple interface Rohan Mitchell 2014-10-23 11:38:15 +11:00
  • f7c1340f99 Admin can view an order cycle in the simple edit form Rohan Mitchell 2014-10-23 11:08:27 +11:00
  • 2f045203ab Styling welcome page WIP summerscope 2014-10-23 10:56:40 +11:00
  • 842e239893 Make selector containers anchors summerscope 2014-10-23 10:56:30 +11:00
  • 2e0d5eb829 Adding set_sells action to enterprises Rob Harrington 2014-10-23 10:27:53 +11:00
  • 56ebe688dc Fix file naming Rohan Mitchell 2014-10-23 10:22:03 +11:00
  • 8b616e7d17 Add unit spec for order cycles simple create controller Rohan Mitchell 2014-10-23 10:21:19 +11:00
  • 2ad823a79d Fix JS specs Rohan Mitchell 2014-10-23 09:39:23 +11:00
  • 94e1995469 Merge branch 'master' into simple-order-cycles Rohan Mitchell 2014-10-23 09:36:03 +11:00
  • f74ec03cef Rename Rohan Mitchell 2014-10-23 09:26:55 +11:00
  • 66e13d40f4 Select all works on simple order cycles interface Rohan Mitchell 2014-10-22 19:17:28 +11:00
  • f60a9d7bd5 Fiddling with styling Rob Harrington 2014-10-22 19:13:17 +11:00
  • d47db903fb Add basic styling to simple order cycle interface Rohan Mitchell 2014-10-22 19:12:51 +11:00
  • 262972a911 Adding basic angular to welcome form Rob Harrington 2014-10-22 19:02:39 +11:00
  • fef97314cb Adding basic layout of welcome page for new users Rob Harrington 2014-10-22 18:26:18 +11:00
  • 069b9ce91d fix email length validation spec Rafael Schouten 2014-10-22 17:49:31 +11:00
  • 3e61aa7267 Simple interface remove coordinator fee Rohan Mitchell 2014-10-22 17:26:22 +11:00
  • 69614d6cf1 fix accordion jumps Rafael Schouten 2014-10-22 17:23:06 +11:00
  • 28352be729 Save pickup time and instructions Rohan Mitchell 2014-10-22 17:17:05 +11:00
  • 549ef4b79d When saving an OC from the simple interface, include outgoing variants Rohan Mitchell 2014-10-22 17:08:16 +11:00
  • 8fb95769bf Fix tested values in spec Rohan Mitchell 2014-10-22 17:07:45 +11:00
  • 7113875a45 Adding welcome page to overview controller Rob Harrington 2014-10-22 16:49:32 +11:00
  • 8120023094 Fixing indentation Rob Harrington 2014-10-22 16:33:43 +11:00
  • 82d33332ab Adding shop_trial_start_date column to enterprises Rob Harrington 2014-10-22 16:11:51 +11:00
  • ecaa2e6a51 Pull out override of 'visible' flag in enterprise serialiser Rob Harrington 2014-10-22 15:53:25 +11:00
  • 45ed3a4cff Only pushes activated enterprises through to the frontend Rob Harrington 2014-10-22 15:39:49 +11:00
  • 2b86647281 Merge branch 'master' into bugfix Rafael Schouten 2014-10-22 15:35:00 +11:00
  • 96ff387d1f fix navigation check on submission Rafael Schouten 2014-10-22 15:34:09 +11:00
  • 565d6739b3 Add 'activated' scope to enterprises Rob Harrington 2014-10-22 15:13:52 +11:00
  • a53cbb677d fix report typos Rafael Schouten 2014-10-22 14:55:01 +11:00
  • afa6119ec1 better coverage for enterprise abilities, hide products from non producers Rafael Schouten 2014-10-22 14:53:20 +11:00
  • 175e430a2b uss oop for nav check Rafael Schouten 2014-10-22 14:51:17 +11:00
  • 6798d394bb Use unspecified rather than unconfirmed Rob Harrington 2014-10-22 14:50:22 +11:00
  • 7ff4306991 Adding 'unspecified' option to 'sells' on Enterprise Rob Harrington 2014-10-22 13:13:21 +11:00
  • 3d938b3450 Shifting dashboard rendering from partials to templates Rob Harrington 2014-10-22 12:30:07 +11:00
  • 8bf472e970 Split dashboard into single and multiple enterprise views Rob Harrington 2014-10-22 12:16:28 +11:00
  • b75af8d9ff Fix sells column coming out all 'none' Rohan Mitchell 2014-10-22 10:49:23 +11:00
  • 4308f7d09c Revert "use sql for migration" Rohan Mitchell 2014-10-22 09:43:10 +11:00
  • 89ce4ba632 Merge branch 'master' into bugfix Rafael Schouten 2014-10-21 08:51:23 +11:00
  • fec8f08966 use sql for migration Rafael Schouten 2014-10-18 16:15:41 +11:00
  • 78b0e02ffe Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork Rafael Schouten 2014-10-18 16:03:04 +11:00
  • 9e0f8100d9 only producers have product permissions Rafael Schouten 2014-10-18 08:28:08 +11:00
  • 08cd273be3 Merge branch 'migrate_ent_types' into bugfix Rafael Schouten 2014-10-18 07:37:41 +11:00
  • 2a7dd8b8f1 update ability specs for reports Rafael Schouten 2014-10-18 06:53:38 +11:00
  • b71a40ae6d show all permitted enterprises in order cycle summery Rafael Schouten 2014-10-18 03:26:57 +11:00
  • 87cc1d6217 create db/backup folder if it dosnt exist Rafael Schouten 2014-10-18 01:42:58 +11:00
  • 577cb06371 make navCallback actually versatile Rafael Schouten 2014-10-18 01:42:29 +11:00
  • 361116a9ec Explicitly set confirmed_at for unconfirmed enterprise Rob Harrington 2014-10-17 18:31:35 +11:00
  • cae8d566df Explicit confirmed_at to ensure that confirmation emails are sent Rob Harrington 2014-10-17 17:49:18 +11:00
  • f499cc375b Adding confirmed_at to enterprise factory Rob Harrington 2014-10-17 17:32:27 +11:00
  • 338ba74652 Only show enterprise partial when no enterprises exist Rob Harrington 2014-10-17 17:15:49 +11:00
  • 5b3ff9160d Fix Registration spec Rob Harrington 2014-10-17 17:15:16 +11:00
  • deedafde9a WIP: Simple order cycle form loads and displays correct info Rohan Mitchell 2014-10-17 16:55:55 +11:00
  • d8b648d531 Extract name and timing form from order cycles Rohan Mitchell 2014-10-17 16:51:03 +11:00
  • 078d2bac11 Extract factories from order cycles admin angular Rohan Mitchell 2014-10-17 16:50:16 +11:00
  • e24a774d54 Adding schema Rob Harrington 2014-10-17 16:16:17 +11:00
  • 4d078feea2 Add default scope to devise to stop it from checking other devise enabled models (in this case :enterprise) Rob Harrington 2014-10-17 16:12:51 +11:00
  • f060da9c8d Rename angular app order_cycle -> admin.order_cycles Rohan Mitchell 2014-10-17 14:13:27 +11:00
  • b2565991e6 Merge branch 'master' into reg_and_ent_types Rob Harrington 2014-10-17 12:33:21 +11:00
  • eda0b16a5f Make state abbreviations upper case Rob Harrington 2014-10-17 12:18:00 +11:00
  • e9a3f8ce91 Require user to choose producer or not Rob Harrington 2014-10-17 12:14:33 +11:00
  • a6bc9e66f6 Only send one enterprise creation confirmation email Rob Harrington 2014-10-17 11:40:28 +11:00
  • b671543a95 Style and make pretty the finished step of profile creation summerscope 2014-10-17 12:25:04 +11:00
  • 4abc59f66d Change styling on the enterprise name because we dont know what type it is yet summerscope 2014-10-17 12:02:21 +11:00
  • 4aa2aa5aee Tweaking layout, text, styling for registration box summerscope 2014-10-17 11:56:25 +11:00
  • 2c5208ce6b Change ent type page, simplify! summerscope 2014-10-17 11:17:46 +11:00
  • 81715aaf5d Remove unrequired store registration action Rob Harrington 2014-10-17 10:49:54 +11:00
  • c4d47ccc20 Change enterprise attributes defined in reg controller Rob Harrington 2014-10-17 10:46:30 +11:00
  • 694dd0c329 Enterprise user selling own produce only sees simple order cycle listing Rohan Mitchell 2014-10-17 10:52:36 +11:00
  • 4884734ab5 Align Continue buttons right consistently summerscope 2014-10-17 10:43:19 +11:00
  • 28807d4f4d Merge migrate_ent_types into reg Rob Harrington 2014-10-17 10:20:48 +11:00
  • 6a6f603754 Correct syntax for update column Rob Harrington 2014-10-17 10:03:34 +11:00
  • 2e3cb171a3 don't remove indexes after you remove one of their columns! Rafael Schouten 2014-10-17 08:22:21 +11:00