Commit Graph

  • 4f153714a8 Reports pages improvements and i18n Matt-Yorkley 2014-11-23 17:26:26 +00:00
  • 451dd3966f form partial Matt-Yorkley 2014-11-23 15:22:56 +00:00
  • c3829ae64f Tax category dropdown on create product form Matt-Yorkley 2014-11-23 15:18:16 +00:00
  • 9bd3909449 Merge master into pretty-emails Rob Harrington 2014-11-21 14:43:01 +11:00
  • 2f28312f7e Removing incorrectly placed directive in profile shops skinny view Rob Harrington 2014-11-21 14:18:22 +11:00
  • 49d5cb2f05 Do not show Override Variants tab - hide this until feature is ready Rohan Mitchell 2014-11-21 13:47:51 +11:00
  • 0b030a85ff Incrementally load products Rohan Mitchell 2014-11-21 12:44:59 +11:00
  • 001bf999d0 Extract Spree API authorisation to service Rohan Mitchell 2014-11-21 10:59:15 +11:00
  • 824b00743e Extract fetch-by-page from BPE to service Rohan Mitchell 2014-11-21 09:56:29 +11:00
  • 58fdc48b9f Display products in table Rohan Mitchell 2014-11-20 12:28:26 +11:00
  • 7069b30e71 Add indexer service (equivalent of Dereferencer, but named more accurately) Rohan Mitchell 2014-11-20 12:25:24 +11:00
  • 680ba379c1 User can select a hub Rohan Mitchell 2014-11-20 10:29:48 +11:00
  • 912c60f720 Do not show producers in hubs list Rohan Mitchell 2014-11-20 10:06:23 +11:00
  • 4c9aa96b17 have_select2 can test for an exact set of options Rohan Mitchell 2014-11-20 09:52:19 +11:00
  • 2c74a94e31 Show list of hubs to select for managing variant overrides Rohan Mitchell 2014-11-20 09:33:26 +11:00
  • d810388248 Add have_select2 capybara matcher Rohan Mitchell 2014-11-20 09:28:25 +11:00
  • bad5d798bf Comment proxy classes Rohan Mitchell 2014-11-13 17:34:41 +11:00
  • 2b0f6b7865 Add ProductProxy which wraps the product's variants in VariantProxys Rohan Mitchell 2014-11-13 17:34:31 +11:00
  • f3fa5edb9d Add simple variant proxy Rohan Mitchell 2014-11-13 17:14:29 +11:00
  • f9b4c07219 Add initial VariantOverride model with price lookup Rohan Mitchell 2014-11-13 16:40:04 +11:00
  • 5e3f1e4a3b Adding bugsnag notifier to work out what is happening with bug when adding variants to order Rob Harrington 2014-11-21 12:37:56 +11:00
  • 2c4b8d779c Make application.yml available to travis Rob Harrington 2014-11-21 10:17:43 +11:00
  • 04b065e28a Orders page doesn't crash when orders have no distributor Rob Harrington 2014-11-14 16:48:33 +11:00
  • bf6d0a2beb Port remaining specs to BulkProducts service specs Rohan Mitchell 2014-09-11 12:43:31 +10:00
  • 5eb40261a8 Port clone products specs to BulkProducts service specs Rohan Mitchell 2014-09-11 11:57:00 +10:00
  • 221e9344fd Port fetch products specs to BulkProducts service specs Rohan Mitchell 2014-09-11 11:37:54 +10:00
  • 387d25b8f2 WIP: More extracting BulkProducts-specific specs to their own file Rohan Mitchell 2014-09-11 08:57:48 +10:00
  • 7e2c979c96 WIP: Extracting BulkProducts-specific specs to their own file Rohan Mitchell 2014-09-11 08:46:50 +10:00
  • 7e4d337773 Extract DisplayProperties to a service Rohan Mitchell 2014-09-10 16:42:20 +10:00
  • 356a03ac4e WIP: Extract bulk product edit product management to BulkProducts service Rohan Mitchell 2014-09-03 17:06:17 +10:00
  • f117c0cd24 Make spree_current_user available to serializers as 'scope' Rohan Mitchell 2014-09-03 13:39:03 +10:00
  • 29e49b67cc In BPE, rename producer and category JSON attrs to producer_id and category_id Rohan Mitchell 2014-09-03 13:22:50 +10:00
  • 021cca4fca Stylistic changes Rohan Mitchell 2014-09-02 12:06:35 +10:00
  • ebaaf2a136 Display line items in confirmation email with fees included in item totals Rob Harrington 2014-11-20 20:17:18 +11:00
  • b64b48f26e Removing obsolete MailerHelper reference Rob Harrington 2014-11-20 20:16:34 +11:00
  • c310a3bdaa Don't use svg for email header Rob Harrington 2014-11-20 20:14:57 +11:00
  • 46462a1abb Format fiddling in user signup confirm email Rob Harrington 2014-11-20 20:13:54 +11:00
  • b941ffabeb Update README for Figaro config, add Maikel to credits Rohan Mitchell 2014-11-20 16:20:07 +11:00
  • 76c300283b Remove CONTACT_STRING config - Rob has an admin-managable override for this coming soon Rohan Mitchell 2014-11-20 15:59:06 +11:00
  • 3d98ec6eef Stripping out inline styles from enterprise email templates Rob Harrington 2014-11-20 15:51:28 +11:00
  • 4dd5e51ed5 Stripping out inline styles from user signup email template Rob Harrington 2014-11-20 15:48:36 +11:00
  • 1f42d32151 Remove naughty pry Rob Harrington 2014-11-20 15:45:50 +11:00
  • f5a5b93c22 Can use relative paths for assets in emails because roadie Rob Harrington 2014-11-20 15:45:12 +11:00
  • 15d157abc0 Stripping out inline styles from email templates Rob Harrington 2014-11-20 15:42:03 +11:00
  • 8096ca2519 Merge remote-tracking branch 'origin/config' into config Rohan Mitchell 2014-11-20 15:41:15 +11:00
  • 2e84a8f626 Pull layout and roadie style inlining out into spree's base mailer so it applies to all mailers Rob Harrington 2014-11-20 15:05:19 +11:00
  • ac6a043f40 Add roadie-rails to help with inlining styles for emails Rob Harrington 2014-11-20 14:56:35 +11:00
  • fe0bb49baf WIP: Adding templates for different order confirmation emails Rob Harrington 2014-11-20 12:06:53 +11:00
  • 20341ecbc1 Send bugsnag notification when order confirmation email fails Rob Harrington 2014-11-20 12:04:51 +11:00
  • dd6a5ecd0b Adding helper for assets in mailer views, fixing links in mailer layout Rob Harrington 2014-11-19 16:42:31 +11:00
  • c9d0721acd Rewire order confirmation email so that two separate emails are sent, one for customers and one for shop owners Rob Harrington 2014-11-19 11:03:00 +11:00
  • b81bf60dc2 267: Cont. Didn't realise commit -a doesn't add a file Lynne Davis 2014-11-18 19:30:44 +00:00
  • cc0da142b7 267: Adding to new product form ability to add shipping category to record frozen/chilled Lynne Davis 2014-11-18 19:28:49 +00:00
  • 375bdc0586 #275: Change report format. Improved mailer. Paul Mackay 2014-11-16 07:14:29 +00:00
  • 03b59eae75 266: Updating with rohans suggestions to tidy up and 'rubify' the code. Thanks for the tips Rohan! Lynne Davis 2014-11-14 15:56:07 +00:00
  • e89184de02 286: Last sneaky dollar sign. Updated to use spree_number_to_currency Lynne Davis 2014-11-14 14:24:22 +00:00
  • 8d1facb7c3 Adding revamp of enterprise welcome email by @summerscope Rob Harrington 2014-11-14 18:42:16 +11:00
  • 0907e2d886 A few alterations to the enterprise email confirmation email Rob Harrington 2014-11-14 18:10:40 +11:00
  • d182bb7bf7 Add signoff partial for mailer templates Rob Harrington 2014-11-14 18:09:48 +11:00
  • b320f71771 Adding revamp for signup confirmation by @summerscope Rob Harrington 2014-11-14 17:59:56 +11:00
  • 27d1886d53 Fix mailto link Rob Harrington 2014-11-14 17:58:13 +11:00
  • 15559b2388 Merge branch 'master' into pretty-emails Rob Harrington 2014-11-14 16:54:50 +11:00
  • ffb915ccc5 Orders page doesn't crash when orders have no distributor Rob Harrington 2014-11-14 16:48:33 +11:00
  • d9d6b7bee4 Adding filtering to Users and Enterprises report Rob Harrington 2014-11-14 16:17:36 +11:00
  • 79a83ee206 Adding users and enterprises report, controller action and template Rob Harrington 2014-11-14 12:52:19 +11:00
  • 66a3410087 WIP: Adding new report to ability spec Rob Harrington 2014-11-13 12:49:50 +11:00
  • 65a5960fcc WIP: Add route for User and Enterprise report Rob Harrington 2014-11-13 12:44:33 +11:00
  • cc3959467d 285: Report downlaod naming - Updating to the cleaner suggestions of Rohan. Note to self, don't be lazy :-) Lynne Davis 2014-11-13 10:30:00 +00:00
  • 43bac4079f Show hubs that are not ready for checkout so that we can view SEFH - Sample :/ Rohan Mitchell 2014-11-13 15:21:02 +11:00
  • 15f29f4c8e 266: Adding ability to search by distribution Lynne Davis 2014-11-12 18:52:25 +00:00
  • 932d571d2c 266: Updating to incorporate Rohans suggestions. Searching on payment method name rather than id Lynne Davis 2014-11-12 11:47:26 +00:00
  • 43ddac84b0 I like nice code Rohan Mitchell 2014-11-12 16:25:22 +11:00
  • 2ca2d53273 Do not include perftools gem by default - it breaks Travis Rohan Mitchell 2014-11-12 16:17:16 +11:00
  • 4e655d7866 Uncouple migrations from models Rohan Mitchell 2014-11-12 14:39:59 +11:00
  • 7282c7174f Moving alert box to top of section Rob Harrington 2014-11-12 15:55:48 +11:00
  • 7a719952fc Adding informative messages about email confirmations to enterprise form Rob Harrington 2014-11-12 15:19:59 +11:00
  • 2c67066366 Add alert to enterprise edit page to remind user that confirmation email has been sent Rob Harrington 2014-11-12 12:31:01 +11:00
  • 6b21bbdf74 Reconfirmation email sends to the right address Rob Harrington 2014-11-12 12:30:32 +11:00
  • ee2ee5dba7 Adding an enterprise welcome email Rob Harrington 2014-11-12 11:57:23 +11:00
  • 6953449d28 Merge pull request #288 from folklabs/doc-improvements Rohan Mitchell 2014-11-12 14:40:33 +11:00
  • 9a5ee81431 Changing report download titles in include download date Lynne Davis 2014-11-11 17:49:08 +00:00
  • bb9b244d18 Upgrade paperclip to 3.x, fixes incorrect cropping of EXIF-rotated JPGs Rohan Mitchell 2014-11-10 14:54:49 +11:00
  • 1d0dab5cc6 Small doc tweak to add db:setup command. Paul Mackay 2014-11-09 12:08:40 +00:00
  • 9b7fd1c16b #275: small tweaks. Paul Mackay 2014-11-09 11:19:26 +00:00
  • 05437e2a56 #275: start on producer email. Paul Mackay 2014-11-09 11:17:46 +00:00
  • 0432fe229b Add bottom margin to loading gif Rob Harrington 2014-11-07 16:53:15 +11:00
  • 66bbaabf79 Adding loading gif to shop page Rob Harrington 2014-11-07 16:50:31 +11:00
  • 2addb1c472 Tweak producer register pane styling for lightweight view summerscope 2014-11-07 13:56:56 +11:00
  • 791cc9b301 Hide pricing table until language is sorted summerscope 2014-11-07 13:56:28 +11:00
  • 2166fbc8a0 Tweak wording for kirsten summerscope 2014-11-07 13:56:07 +11:00
  • 9f74e8ff03 Add caret to right on register buttons, kill commented out text summerscope 2014-11-07 12:05:35 +11:00
  • 4795de5ab0 Adding new partial into homepage summerscope 2014-11-07 08:49:09 +11:00
  • 039b94aa47 Styling for Producers Register pane and pricing table summerscope 2014-11-07 08:48:54 +11:00
  • 9a2e510f2c Add Producers register link to footer summerscope 2014-11-07 08:48:37 +11:00
  • cd34aedbb9 New partial for producer register pricing table summerscope 2014-11-07 08:48:24 +11:00
  • e1823212d6 Reconfirmation email not required when we already know about new email address for enterprise Rob Harrington 2014-11-06 15:19:46 +11:00
  • 898af0a55e Enterprise confirmation emails can be resent, and sensible things happen if confirmation link is clicked twice Rob Harrington 2014-11-06 13:59:06 +11:00
  • e6f5811a60 Only send confirmation instructions to the enterprise email address Rob Harrington 2014-10-31 14:00:41 +11:00
  • 70c4b7082d Split ent confirmation email out into layout and partial Rob Harrington 2014-10-31 13:57:10 +11:00
  • 74642c3825 Update checkout helper spec to reflect Rohan's changes Rob Harrington 2014-11-06 21:18:20 +11:00