Commit Graph

34725 Commits

Author SHA1 Message Date
Rob Harrington
6b21bbdf74 Reconfirmation email sends to the right address 2014-11-12 15:20:51 +11:00
Rob Harrington
ee2ee5dba7 Adding an enterprise welcome email 2014-11-12 15:20:51 +11:00
Rohan Mitchell
6953449d28 Merge pull request #288 from folklabs/doc-improvements
Small doc tweak to add db:setup command.
2014-11-12 14:40:33 +11:00
Lynne Davis
9a5ee81431 Changing report download titles in include download date 2014-11-11 17:49:08 +00:00
Rohan Mitchell
bb9b244d18 Upgrade paperclip to 3.x, fixes incorrect cropping of EXIF-rotated JPGs 2014-11-10 14:54:49 +11:00
Paul Mackay
1d0dab5cc6 Small doc tweak to add db:setup command. 2014-11-09 12:08:40 +00:00
Paul Mackay
9b7fd1c16b #275: small tweaks. 2014-11-09 11:19:26 +00:00
Paul Mackay
05437e2a56 #275: start on producer email. 2014-11-09 11:17:46 +00:00
Rob Harrington
0432fe229b Add bottom margin to loading gif 2014-11-07 16:53:15 +11:00
Rob Harrington
66bbaabf79 Adding loading gif to shop page 2014-11-07 16:50:31 +11:00
summerscope
2addb1c472 Tweak producer register pane styling for lightweight view 2014-11-07 13:56:56 +11:00
summerscope
791cc9b301 Hide pricing table until language is sorted 2014-11-07 13:56:28 +11:00
summerscope
2166fbc8a0 Tweak wording for kirsten 2014-11-07 13:56:07 +11:00
summerscope
9f74e8ff03 Add caret to right on register buttons, kill commented out text 2014-11-07 12:05:35 +11:00
summerscope
4795de5ab0 Adding new partial into homepage 2014-11-07 08:49:09 +11:00
summerscope
039b94aa47 Styling for Producers Register pane and pricing table 2014-11-07 08:48:54 +11:00
summerscope
9a2e510f2c Add Producers register link to footer 2014-11-07 08:48:37 +11:00
summerscope
cd34aedbb9 New partial for producer register pricing table 2014-11-07 08:48:24 +11:00
Rob Harrington
e1823212d6 Reconfirmation email not required when we already know about new email address for enterprise 2014-11-06 21:19:22 +11:00
Rob Harrington
898af0a55e Enterprise confirmation emails can be resent, and sensible things happen if confirmation link is clicked twice 2014-11-06 21:19:21 +11:00
Rob Harrington
e6f5811a60 Only send confirmation instructions to the enterprise email address 2014-11-06 21:19:21 +11:00
Rob Harrington
70c4b7082d Split ent confirmation email out into layout and partial 2014-11-06 21:19:21 +11:00
Rob Harrington
74642c3825 Update checkout helper spec to reflect Rohan's changes 2014-11-06 21:18:20 +11:00
Rohan Mitchell
3e151c40f5 WIP: Smooth scroll to checkout errors 2014-11-06 18:29:49 +11:00
Rohan Mitchell
57e7bc9504 Checkout: When error, open offending accordion section 2014-11-06 18:29:49 +11:00
Rohan Mitchell
4389389d44 Checkout: Display error when shipping or payment method is not selected 2014-11-06 18:29:49 +11:00
Rohan Mitchell
ca9da15ba4 Checkout: Fix shipping and payment method summary display when none selected 2014-11-06 18:29:48 +11:00
Rohan Mitchell
f2c6ee87d3 Extract duplicated checkout accordion heading to partial 2014-11-06 18:29:48 +11:00
Rohan Mitchell
519aea2d9b Extract checkout shipping ship address to partial 2014-11-06 18:29:48 +11:00
Rohan Mitchell
433cf9dd9b Checkout: Use validated_select for shipping address fields 2014-11-06 18:29:48 +11:00
Rohan Mitchell
7a0c291fc1 Checkout: Use validated_select for country 2014-11-06 18:29:48 +11:00
Rohan Mitchell
06a9110e95 Extract checkout select options to helpers 2014-11-06 18:29:48 +11:00
Rohan Mitchell
900a98b4bb Display errors on checkout State field 2014-11-06 18:29:48 +11:00
Rohan Mitchell
e50d2a6a37 Remove unused directive 2014-11-06 18:29:48 +11:00
Rohan Mitchell
cbb968d87f Pass checkout form to controller method 2014-11-06 18:29:48 +11:00
Rohan Mitchell
75b250d3fe When submitting checkout, if field is invalid, show errors 2014-11-06 18:29:48 +11:00
Rohan Mitchell
e8e5f7033c Improve all the syntax 2014-11-06 18:29:48 +11:00
Rob Harrington
51e768e722 Refactor EnterpriseSet to accept a collection as an argument 2014-11-06 16:29:09 +11:00
Rob Harrington
b27a0986b7 Ensure collection is locked down before we start asssigning attributes to model set 2014-11-06 16:28:24 +11:00
Rob Harrington
be042af751 Add explicit select statement to prevent scope being read only 2014-11-06 15:54:59 +11:00
Rob Harrington
93e3d87fcb Errors on bulk update for enterprise index do not allow user to list all enterprises 2014-11-06 11:01:44 +11:00
Rohan Mitchell
1506b10d8f Fix brittle spec 2014-11-05 16:08:45 +11:00
Rohan Mitchell
fdbb274667 Allow browsing products (but not cart/checkout) for hubs that are not ready for checkout 2014-11-05 14:29:36 +11:00
Rohan Mitchell
a2f4732547 Merge branch 'folklabs-i18n' 2014-11-05 12:01:27 +11:00
Rohan Mitchell
98f434dad3 Merge branch 'i18n' of https://github.com/folklabs/openfoodnetwork into folklabs-i18n 2014-11-05 11:54:42 +11:00
Lynne Davis
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 2014-11-02 11:26:39 +00:00
Rohan Mitchell
8c2adb2a05 Fix specs: feature specs requiring payment and shipping methods, race condition, double flash message issue 2014-11-01 12:11:50 +11:00
Rohan Mitchell
15b05de7f2 Fix specs: Distributors require shipping and payment method 2014-11-01 10:42:38 +11:00
Rohan Mitchell
0cf4e01dde Fix specs: Expect proper query chain 2014-11-01 10:39:29 +11:00
Paul Mackay
543368169f #254: Localisation of home page and welcome email. 2014-10-31 06:59:43 +00:00