Commit Graph

  • 3e151c40f5 WIP: Smooth scroll to checkout errors Rohan Mitchell 2014-11-06 17:52:10 +11:00
  • 57e7bc9504 Checkout: When error, open offending accordion section Rohan Mitchell 2014-11-06 16:45:21 +11:00
  • 4389389d44 Checkout: Display error when shipping or payment method is not selected Rohan Mitchell 2014-11-06 16:09:18 +11:00
  • ca9da15ba4 Checkout: Fix shipping and payment method summary display when none selected Rohan Mitchell 2014-11-06 16:01:07 +11:00
  • f2c6ee87d3 Extract duplicated checkout accordion heading to partial Rohan Mitchell 2014-11-06 15:20:06 +11:00
  • 519aea2d9b Extract checkout shipping ship address to partial Rohan Mitchell 2014-11-06 15:19:33 +11:00
  • 433cf9dd9b Checkout: Use validated_select for shipping address fields Rohan Mitchell 2014-11-06 14:50:20 +11:00
  • 7a0c291fc1 Checkout: Use validated_select for country Rohan Mitchell 2014-11-06 14:42:07 +11:00
  • 06a9110e95 Extract checkout select options to helpers Rohan Mitchell 2014-11-06 14:40:22 +11:00
  • 900a98b4bb Display errors on checkout State field Rohan Mitchell 2014-11-06 14:33:35 +11:00
  • e50d2a6a37 Remove unused directive Rohan Mitchell 2014-11-06 14:11:42 +11:00
  • cbb968d87f Pass checkout form to controller method Rohan Mitchell 2014-11-06 14:11:31 +11:00
  • 75b250d3fe When submitting checkout, if field is invalid, show errors Rohan Mitchell 2014-11-06 12:53:02 +11:00
  • e8e5f7033c Improve all the syntax Rohan Mitchell 2014-11-06 12:44:57 +11:00
  • 51e768e722 Refactor EnterpriseSet to accept a collection as an argument Rob Harrington 2014-11-06 16:29:09 +11:00
  • b27a0986b7 Ensure collection is locked down before we start asssigning attributes to model set Rob Harrington 2014-11-06 16:28:24 +11:00
  • be042af751 Add explicit select statement to prevent scope being read only Rob Harrington 2014-11-06 15:54:59 +11:00
  • 93e3d87fcb Errors on bulk update for enterprise index do not allow user to list all enterprises Rob Harrington 2014-11-06 11:01:44 +11:00
  • 1506b10d8f Fix brittle spec Rohan Mitchell 2014-11-05 16:08:45 +11:00
  • fdbb274667 Allow browsing products (but not cart/checkout) for hubs that are not ready for checkout Rohan Mitchell 2014-11-05 14:29:36 +11:00
  • a2f4732547 Merge branch 'folklabs-i18n' Rohan Mitchell 2014-11-05 12:01:27 +11:00
  • 98f434dad3 Merge branch 'i18n' of https://github.com/folklabs/openfoodnetwork into folklabs-i18n Rohan Mitchell 2014-11-05 11:54:42 +11:00
  • 6f6ae309c6 266 UK: Adding first UK report - Payment Methods Report - to find balances per ordercycle for multiple payment method options. Working, but not complete to spec yet Lynne Davis 2014-11-02 11:26:39 +00:00
  • 8c2adb2a05 Fix specs: feature specs requiring payment and shipping methods, race condition, double flash message issue Rohan Mitchell 2014-11-01 12:11:50 +11:00
  • 15b05de7f2 Fix specs: Distributors require shipping and payment method Rohan Mitchell 2014-11-01 10:42:38 +11:00
  • 0cf4e01dde Fix specs: Expect proper query chain Rohan Mitchell 2014-11-01 10:39:29 +11:00
  • 543368169f #254: Localisation of home page and welcome email. Paul Mackay 2014-10-31 06:59:43 +00:00
  • 0d05c7163d Use factory shortcut for creating shipping and payment methods Rohan Mitchell 2014-10-31 16:26:13 +11:00
  • f5b20b7afc Give distributors a payment and shipping method where required Rohan Mitchell 2014-10-31 16:02:43 +11:00
  • e2d88e615b Fix broken spec Rohan Mitchell 2014-10-31 16:00:28 +11:00
  • 8488b8e469 When user has selected a hub that is not ready for checkout, unselect it Rohan Mitchell 2014-10-31 15:02:58 +11:00
  • 7aefa05efd Fix specs broken by requirement for valid shipping and payment method Rohan Mitchell 2014-10-31 14:48:08 +11:00
  • abeabd5b1c Add Enterprise#ready_for_checkout? Rohan Mitchell 2014-10-31 14:04:43 +11:00
  • 94d50f220f Display an error message to admin when there are hubs in order cycles that are not ready for checkout Rohan Mitchell 2014-10-31 11:59:46 +11:00
  • 9f43146e47 Payment methods need to be available, too Rohan Mitchell 2014-10-29 17:01:08 +11:00
  • f0d3b987d4 Show hubs as unavailable when they do not have available payment and shipping methods Rohan Mitchell 2014-10-29 16:57:18 +11:00
  • 1d9a3f33e0 Order cycle distributors must have shipping and payment methods Rohan Mitchell 2014-10-29 15:26:34 +11:00
  • fc1c3abb9f Remove duplicate data injection (duplicated in darkswarm layout) Rohan Mitchell 2014-10-29 14:01:32 +11:00
  • 433806aca8 Remove unused helpers and standardise naming Rohan Mitchell 2014-10-29 14:01:12 +11:00
  • 34f47cedae Fix markup for better layout and getting column padding sitting where it should summerscope 2014-10-30 17:02:08 +11:00
  • 733b249b12 making tabs break down better for responsive and small devices summerscope 2014-10-30 17:01:42 +11:00
  • d8933deee0 Styling shopfront tabs make things better and more responsive summerscope 2014-10-30 17:01:23 +11:00
  • a27a805478 Tweak styling so the accordion hover colors dont fight the validation colors summerscope 2014-10-30 15:47:09 +11:00
  • 38e6575781 Move first and last name fields to top of shipping address accordion summerscope 2014-10-30 15:46:32 +11:00
  • 799c894bd3 Tweak logo embedding to use new version, and use srcset with src as a fallback summerscope 2014-10-30 15:03:36 +11:00
  • 32daa1745c Tweak logo for high density screens, make pretty and easier to read summerscope 2014-10-30 15:03:03 +11:00
  • 6329db23d7 Remove styling for capitalisation for shopfront page summerscope 2014-10-30 12:42:42 +11:00
  • 6596e14e5d Use shared partial for errors on EnterpriseFeeSet Rob Harrington 2014-10-30 12:54:11 +11:00
  • 65d13e0490 Show error messages on enterprise index page Rob Harrington 2014-10-30 12:29:14 +11:00
  • 977c508833 Make enterprise limit error messages more specific Rob Harrington 2014-10-30 12:25:50 +11:00
  • fd8eecf745 Remove unnecessary partial import summerscope 2014-10-30 11:30:21 +11:00
  • 64f2d1b34e Remove unnecessary partial import summerscope 2014-10-30 11:30:03 +11:00
  • f1e27a3ac3 No need to import typography into this file, add note for future devs summerscope 2014-10-30 11:29:42 +11:00
  • 2b0757e96f Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork Rafael Schouten 2014-10-25 20:23:25 +11:00
  • 43d3955627 Change wording of trial option on change_type_form 0.7.0 Rob Harrington 2014-10-25 19:56:52 +11:00
  • 68073d7239 revome config sidebar from index Rafael Schouten 2014-10-25 19:03:56 +11:00
  • 095dd28505 Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork Rafael Schouten 2014-10-25 18:53:46 +11:00
  • feff4fd46f fix reports taxons and specs Rafael Schouten 2014-10-25 18:51:03 +11:00
  • 6f1c90ea25 add toxons to prodcut reports Rafael Schouten 2014-10-25 17:09:23 +11:00
  • 098afacce3 Merge branch 'config' of https://github.com/openfoodfoundation/openfoodnetwork into config Rafael Schouten 2014-10-25 15:32:16 +11:00
  • 8395dbb3e9 Merge branch 'master' into config Rafael Schouten 2014-10-25 15:29:53 +11:00
  • 33fc7e0fc9 Merge branch 'master' into checkout Rafael Schouten 2014-10-25 15:12:24 +11:00
  • 6155600cb2 Set environment for payment methods unless admin Rob Harrington 2014-10-24 18:15:48 +11:00
  • 8385bff55e Make admins get multi enterprise dashboard Rob Harrington 2014-10-24 17:59:58 +11:00
  • 928e5dc474 Make styling more specific to single enterprise dashboard user only summerscope 2014-10-24 16:39:59 +11:00
  • cc0e205f50 Merge master into onbaording Rob Harrington 2014-10-24 15:36:59 +11:00
  • 80b36992f9 Merge in remote branch Rob Harrington 2014-10-24 15:28:40 +11:00
  • a157528974 Adding specs for single ent dash and remove product ability for profiles Rob Harrington 2014-10-24 15:27:08 +11:00
  • 8b819539e7 Fixing specs Rob Harrington 2014-10-24 14:52:59 +11:00
  • 2eb152f63e Change class name for big button; change labels for submit buttons summerscope 2014-10-24 14:49:09 +11:00
  • c733ca251e Styling for big button summerscope 2014-10-24 14:48:46 +11:00
  • d388747a81 Make margine appear for small devices only summerscope 2014-10-24 14:48:29 +11:00
  • 8ac367675f Adding big button class to CTA Rob Harrington 2014-10-24 14:24:55 +11:00
  • 96516a8ff3 User can switch between trialling a shopfront and not trialling a shopfront Rob Harrington 2014-10-24 14:12:47 +11:00
  • 3e002c6f82 Fiddle with text Rob Harrington 2014-10-24 13:34:49 +11:00
  • 20e2cb4ecc Set visibility to false for enterprises created through registration process Rob Harrington 2014-10-24 13:31:20 +11:00
  • b0d8290dab Add alert for visibility to single ent dash Rob Harrington 2014-10-24 13:28:25 +11:00
  • 8603cf685e Merge remote-tracking branch 'origin/onboarding' into onboarding Rob Harrington 2014-10-24 13:03:04 +11:00
  • b182c6afc8 Merge in remote changes Rob Harrington 2014-10-24 13:02:26 +11:00
  • 0d73d8f043 Fix layout add required class summerscope 2014-10-24 13:01:56 +11:00
  • 498b51cedb Switching out chevron on Change Type button Rob Harrington 2014-10-24 12:54:21 +11:00
  • 01cb39a93f Error messages specific to use case summerscope 2014-10-24 12:54:06 +11:00
  • b172c4fd4f Search query make empty string rather than undefined summerscope 2014-10-24 12:53:04 +11:00
  • b3ac06e46c Fix icon type to match nav bar summerscope 2014-10-24 12:42:14 +11:00
  • 68cb3efc50 Markup fixes for single enterprise dashboard (first state) summerscope 2014-10-24 12:39:25 +11:00
  • e32ab7b4b7 Single enterprise dashboard styling summerscope 2014-10-24 12:39:08 +11:00
  • d0c3502f27 Adding trial progress bar Rob Harrington 2014-10-24 12:32:05 +11:00
  • 631386ced4 Tweaking markup summerscope 2014-10-24 11:48:53 +11:00
  • 982be3a563 Stylesheet for single enterprise user dashboard components summerscope 2014-10-24 11:48:39 +11:00
  • 76c6c260d1 Add row containers to make grid nesting work summerscope 2014-10-24 11:48:13 +11:00
  • 0b3e293b38 Remove whitespace, add alert box summerscope 2014-10-24 11:26:58 +11:00
  • f40b4d9d03 Different text for CTA button depending on context Rob Harrington 2014-10-24 11:22:57 +11:00
  • 900ef4ddcc Change type form is aware of existing state of enterprise Rob Harrington 2014-10-24 11:12:54 +11:00
  • 911d1e3dc4 Add down chevron to change type button on single ent dash Rob Harrington 2014-10-24 11:02:48 +11:00
  • f03c7ba02d Rename sellCtrl to changeTypeFormCtrl Rob Harrington 2014-10-24 11:02:16 +11:00
  • 49a2b774b0 Tweak language in helper summerscope 2014-10-24 10:56:03 +11:00
  • f6b0324456 Add change type form to single enterprise dashboard Rob Harrington 2014-10-24 10:43:04 +11:00
  • 46ab424655 Moving welcomeCrtl to enterprise module as sellsCtrl Rob Harrington 2014-10-24 09:10:45 +11:00
  • d2efd25e8d Pull out type change form into a partial Rob Harrington 2014-10-23 17:22:25 +11:00
  • 3c839be743 Tweak styling for error message to be consistent with other form error styling in admin summerscope 2014-10-23 17:24:56 +11:00