Commit Graph

  • d177f3ff73 Variant overrides table styling Rohan Mitchell 2014-12-11 11:34:41 +11:00
  • d83ff4ef33 Remove short wait, show variant overrides tab in admin Rohan Mitchell 2014-12-11 11:16:07 +11:00
  • fb980981fb Display variant override errors Rohan Mitchell 2014-12-11 11:15:00 +11:00
  • 45e709b2cc VariantOverrides require hub and variant Rohan Mitchell 2014-12-11 10:39:26 +11:00
  • 0393007ba5 Update variant overrides Rohan Mitchell 2014-12-11 09:43:22 +11:00
  • c38686c820 Create new variant overrides Rohan Mitchell 2014-12-11 09:39:19 +11:00
  • 27444c6589 Extract variant overrides to own controller - permissions Rohan Mitchell 2014-12-10 12:42:22 +11:00
  • 531b35bbc6 WIP: Extract variant overrides to own controller - route, controller, views Rohan Mitchell 2014-12-10 12:25:57 +11:00
  • 9ee44e9aef WIP: Extract variant overrides to own controller - move views Rohan Mitchell 2014-12-10 12:19:59 +11:00
  • 91434fe12a Rename override_variants to variant_overrides - JS file names Rohan Mitchell 2014-12-10 11:59:46 +11:00
  • a6f116aa09 WIP: Rename override_variants to variant_overrides - JS Rohan Mitchell 2014-12-10 11:59:00 +11:00
  • d02511bf1d WIP: Rename override_variants to variant_overrides - file and dir name changes Rohan Mitchell 2014-12-10 11:55:08 +11:00
  • 51d2805de9 WIP: Rename override_variants to variant_overrides Rohan Mitchell 2014-12-10 11:49:56 +11:00
  • a1906a71fa Return promise directly Rohan Mitchell 2014-12-10 11:22:40 +11:00
  • 47592cdbd8 Submit variant overrides to server Rohan Mitchell 2014-12-10 11:14:21 +11:00
  • d67e614947 Remove extracted method Rohan Mitchell 2014-12-10 10:40:19 +11:00
  • 0a984b9041 Remove duplicate status message on BPE Rohan Mitchell 2014-12-10 10:38:18 +11:00
  • c62ce57e0f Display count of dirty variant overrides Rohan Mitchell 2014-12-10 10:37:52 +11:00
  • a1fc4dec43 Updating variant overrides stores dirty values Rohan Mitchell 2014-12-10 10:21:58 +11:00
  • 7255520471 Display success message on save variant overrides (stub) Rohan Mitchell 2014-12-04 17:28:23 +11:00
  • 9d4b8ae949 Rename div update-status-message to status-message Rohan Mitchell 2014-12-04 17:26:57 +11:00
  • 0938debafc Extract status message markup into partial Rohan Mitchell 2014-12-04 17:24:00 +11:00
  • a8e1265a58 Swap parameter ordering - follows convention Rails.logger.error 'foo' Rohan Mitchell 2014-12-04 17:14:28 +11:00
  • 9c4c0f87e3 Rename methods to reduce naming duplication Rohan Mitchell 2014-12-04 17:09:05 +11:00
  • bcc3815f6b Extract status message to a service Rohan Mitchell 2014-12-04 17:07:51 +11:00
  • abf58c0e02 Provide blank values for all variant overrides Rohan Mitchell 2014-12-04 15:22:54 +11:00
  • d3e639aa03 Index variant overrides by hub_id x variant_id Rohan Mitchell 2014-12-04 12:12:20 +11:00
  • 5cf3579b26 Extract variant overrides to service Rohan Mitchell 2014-12-04 11:50:39 +11:00
  • 5df4f1b7fe Convert text to form fields Rohan Mitchell 2014-12-04 10:27:45 +11:00
  • 3aedbb6c48 Display variant overrides Rohan Mitchell 2014-11-27 11:45:49 +11:00
  • 8baed4429c Indexer accepts arbitrary key to index by. Fix bug: Return an object instead of an array. Rohan Mitchell 2014-11-27 11:34:35 +11:00
  • 47b479c6c9 Show variants in override variants interface, not just products Rohan Mitchell 2014-11-27 10:48:20 +11:00
  • 42481e9691 Provide hub permissions to specs Rohan Mitchell 2014-11-27 10:00:28 +11:00
  • efae9265c1 Inject variant overrides Rohan Mitchell 2014-11-26 13:08:16 +11:00
  • ff28da345d Find variant overrides for some hubs Rohan Mitchell 2014-11-26 13:07:18 +11:00
  • 91b386003a Add VariantOverrideSerializer Rohan Mitchell 2014-11-26 12:35:23 +11:00
  • a3a3832c8d Only show products that the chosen hub can add to an order cycle Rohan Mitchell 2014-11-26 11:51:52 +11:00
  • 500b5ce347 Enterprise managers can access override variants Rohan Mitchell 2014-11-26 11:45:50 +11:00
  • b1ba519a73 When finding per hub order cycle enterprises, also return managed producers Rohan Mitchell 2014-11-26 09:45:17 +11:00
  • 5b82fcaca7 Inject hub permissions - which producers each hub can add to order cycle Rohan Mitchell 2014-11-21 16:05:27 +11:00
  • 3a9c4e0826 Adding a price without fees column to the order cycle customer report Rob Harrington 2014-12-12 11:59:45 +11:00
  • 6a226e4f92 Fixing typos and changing delivery address display in order confirmation email Rob Harrington 2014-12-12 11:59:17 +11:00
  • 086f69ccfb Default payment method server/test_mode to live Rohan Mitchell 2014-12-12 11:35:18 +11:00
  • e607c9855f Add Pin Payments gateway Rohan Mitchell 2014-12-12 10:59:23 +11:00
  • 079781576b Adding new specs and a couple updates the lib/report Lynne Davis 2014-12-11 12:47:56 +00:00
  • b9011d9abe Remove obsolete spree checkout views Rob Harrington 2014-12-11 16:17:15 +11:00
  • b7810df346 Revert "Removing obsolete checkout views" Rob Harrington 2014-12-11 16:09:17 +11:00
  • dfb9e5bde5 Order reports now present the price of line items with adjustments included Rob Harrington 2014-12-11 15:48:29 +11:00
  • eab2e5de2a Use scope Rohan Mitchell 2014-12-11 15:00:44 +11:00
  • 3be437485a Redirecting any spree checkout_state redirects to our checkout controller Rob Harrington 2014-12-11 14:53:11 +11:00
  • d0e013c1a5 Removing obsolete checkout views Rob Harrington 2014-12-11 14:50:29 +11:00
  • 440044372b Leave-page-warning only after changing inputs Maikel Linke 2014-12-11 14:27:08 +11:00
  • 76739a4746 Unify nav-check and nav-callback attributes in nav-check-callback Maikel Linke 2014-12-11 12:14:51 +11:00
  • 11f1261dd3 Navigation Callbacks for WebKit Maikel Linke 2014-12-11 12:07:48 +11:00
  • 27896534f0 Navigation Callbacks (confirmation to leave) refs Maikel Linke 2014-12-11 12:05:59 +11:00
  • 2f83d71931 Adding mail/all.css to assets precompile list Rob Harrington 2014-12-10 09:56:33 +11:00
  • f878e18037 Update that works better with the specs Lynne Davis 2014-12-08 16:25:18 +00:00
  • 3cc79d0036 Filter deleted products in products report Maikel Linke 2014-12-05 15:52:10 +11:00
  • 7b41d4c5d4 Denoting the product category as required Maikel Linke 2014-12-05 14:56:32 +11:00
  • ec08ab4cc9 Merge pull request #307 from openfoodfoundation/replace-fixtures Rohan Mitchell 2014-12-04 16:31:30 +11:00
  • 5c191bcc7f Moving test seeding into spec/support/seeds.rb Maikel Linke 2014-12-04 15:38:59 +11:00
  • 19667f31fa Add missing translation for welcome_to Rohan Mitchell 2014-12-03 15:19:25 +11:00
  • 95f8334370 Reinstate style Rohan Mitchell 2014-12-03 12:28:22 +11:00
  • 50e26ed96f Remove old required partial Rohan Mitchell 2014-12-03 12:22:43 +11:00
  • e30021537a Merge branch 'master' into enterprise-form-required-fields Rohan Mitchell 2014-12-03 12:20:52 +11:00
  • bd7253bdda Merge branch 'using-simple-order-cycle' Rohan Mitchell 2014-12-03 12:08:25 +11:00
  • fbef139fc5 Merge branch 'master' into using-simple-order-cycle Rohan Mitchell 2014-12-03 11:57:59 +11:00
  • 633a8a49e2 updating spec based on the wise advice of Rohan Lynne Davis 2014-12-03 00:35:53 +00:00
  • 3358fb3d73 Name based on meaning instead of context Rohan Mitchell 2014-11-26 14:45:33 +11:00
  • 26bca0faf8 Localize more strings on home page. Paul Mackay 2014-11-25 09:33:00 +00:00
  • 73ece4075c Add rails-i18n gem. Paul Mackay 2014-11-20 05:59:04 +00:00
  • a5ae1c490c Fixing typo in report found through testing Lynne Davis 2014-12-02 17:48:04 +00:00
  • c2c51a5531 Fixing typo in feature spec Lynne Davis 2014-12-02 12:24:34 +00:00
  • 8e280919ac Using simple_order_cycle in clone spec Maikel Linke 2014-11-28 15:36:34 +11:00
  • e240933b29 Using simple_order_cycle in spec Maikel Linke 2014-11-28 14:45:35 +11:00
  • 349b7de11a Using simple_order_cycle Maikel Linke 2014-11-28 14:02:55 +11:00
  • 73b8f37d77 Using simple_order_cycle Maikel Linke 2014-11-28 13:55:06 +11:00
  • aa2cefb88c Using simple_order_cycle where applicable Maikel Linke 2014-11-28 13:45:25 +11:00
  • ccd03bfa84 Using simple_order_cycle Maikel Linke 2014-11-28 13:20:05 +11:00
  • 7f764db4d7 Using simple_order_cycle Maikel Linke 2014-11-28 12:39:05 +11:00
  • 082a3cd9ab Creating simple_order_cycle instead of order_cycle Maikel Linke 2014-11-28 12:29:47 +11:00
  • 35c27bf516 First specs for additional scope to order model. Not liking the repeated code so would appreciate feedback to get rid of it. Thanks! Lynne Davis 2014-11-27 20:36:41 +00:00
  • 699c9a62a5 Removing pretty_inspect so that bugsnag alert work on production Rob Harrington 2014-11-27 16:39:14 +11:00
  • ef0b0a9a94 Replacing fixtures with minimal seeding Maikel Linke 2014-11-27 12:59:25 +11:00
  • 9782a9d3d6 Hopefully fixing Poltergeist Timeout error due to long long time for first admin spec Rob Harrington 2014-11-27 14:42:02 +11:00
  • 45bcee16ef Pulling out obsolete setup in BOM spec to make it more like BPE spec, see if that helps with intermittent fails Rob Harrington 2014-11-27 09:44:13 +11:00
  • 5799f09caf Merge branch 'master' into pretty-emails Rob Harrington 2014-11-27 00:02:44 +11:00
  • 38440dd70a Ammending checkout specs for two emails on placement of order Rob Harrington 2014-11-26 23:16:11 +11:00
  • 258573f5a6 Remove obsolete text version of user signup_confirmation Rob Harrington 2014-11-26 18:58:26 +11:00
  • 0cf2df8358 Remove obsolete text version of order confirm_email Rob Harrington 2014-11-26 18:54:50 +11:00
  • 8a3bffb37d Cart page conforms to convention in rest of checkout, adjusting helpers through checkout Rob Harrington 2014-11-26 18:53:29 +11:00
  • 8f27c643f1 Move override for cart line item into existing view replacement Rob Harrington 2014-11-26 16:08:53 +11:00
  • a8dde3bbb9 Moving shopfront trial progress bar logic into enterprises helper and dealing with expiry Rob Harrington 2014-11-26 15:16:53 +11:00
  • f5acf36771 Hiding enterprise shop url in ent welcome email, as that may bot actually make sense Rob Harrington 2014-11-26 14:50:19 +11:00
  • 17a2e37eda Fixing broken category lookup on BPE Rob Harrington 2014-11-26 13:16:29 +11:00
  • f6b0863279 Make cost breakdowns consistent throughout checkout Rob Harrington 2014-11-26 13:07:40 +11:00
  • c4961d2502 Whitespace crusader Rob Harrington 2014-11-26 11:59:22 +11:00
  • 8d5a0aea9f Setup daemon and delayed job table. Paul Mackay 2014-11-24 21:25:58 +00:00
  • 803d790b7a Remove nokigiri warning. Tweak email subject. Paul Mackay 2014-11-24 21:00:36 +00:00
  • e4d1ae7548 Refactored currency symbol display Matt-Yorkley 2014-11-24 18:20:10 +00:00