Commit Graph

  • 41b5cf10dd Quick testing update Matt-Yorkley 2017-04-12 20:13:46 +01:00
  • b6955cb98c Updated variant feature spec Matt-Yorkley 2017-04-11 11:29:22 +01:00
  • 6c36c269c8 Product Edit UX adjustments Matt-Yorkley 2017-04-11 10:34:21 +01:00
  • b879ea5a96 add comments Pierre de Lacroix 2017-05-15 09:03:59 +02:00
  • a6ed4a2c6a fix bad return value Pierre de Lacroix 2017-04-29 06:16:05 +02:00
  • 6972822c49 fix escaping problems on ticket view Pierre de Lacroix 2017-04-27 16:00:28 +02:00
  • db63f30a76 cosmetic fixes to the ticket view Pierre de Lacroix 2017-04-17 22:09:25 +02:00
  • 848193434b Show item single_display_amount instead of variant price in order details table Rob Harrington 2017-05-19 17:26:55 +10:00
  • 570f0344da Remove unused method in wrong controller ^_^ stveep 2017-04-10 21:07:44 +01:00
  • 38c25c412f Remove duplicated spec, better error message suppression, fix shipping test to wait correctly stveep 2017-04-09 18:44:05 +01:00
  • 3b4ffe1f70 Suppress line item validation error for newly-created orders stveep 2017-04-08 23:37:07 +01:00
  • 4699c654fc Fix feature specs for new 'new admin order' flow stveep 2017-04-08 22:36:43 +01:00
  • c1c5d00f45 Add new view to set distribution, ensure the scoped variant single item price is used. stveep 2017-04-08 11:58:23 +01:00
  • 220693f4e3 Starting alternative flow for new manual order stveep 2017-03-19 19:24:31 +00:00
  • fcce858ea4 Fix OC with override factory stveep 2017-02-25 12:18:59 +00:00
  • 1f9698f7a2 Test to reproduce bug with overridden price not being displayed when an order is added manually stveep 2017-02-13 23:14:04 +00:00
  • 1766da9d60 Adding ng-cloak directive to changeable orders banner Rob Harrington 2017-05-19 15:23:37 +10:00
  • 15ee62aaa8 Fixing race condition on link click in spec/features/consumer/shops_spec.rb Rob Harrington 2017-05-19 13:29:47 +10:00
  • 6fc4a297a0 Fixing race condition on link click in spec/features/consumer/shopping/products_spec.rb Rob Harrington 2017-05-19 13:15:30 +10:00
  • 74d8dc48b4 Rewriting shopfront alert regarding changeable orders to be dynamic Rob Harrington 2017-05-18 15:35:07 +10:00
  • b6f4ce373e Preloading variants for VariantOverride.indexed Rob Harrington 2017-05-18 15:34:22 +10:00
  • c9f186f48f Fixing SlideOutUp animation for darkswarm Rob Harrington 2017-05-18 15:33:14 +10:00
  • daab0dfd7a Refactor: Splitting changeable_order_from_number out into separate method Rob Harrington 2017-05-17 12:38:17 +10:00
  • 22b5dafad2 Further tweaks to LineItemsController Rob Harrington 2017-05-17 12:27:29 +10:00
  • 110f74eee8 Updating translations for config/locales/es.yml [skip ci] Transifex-Openfoodnetwork 2017-05-12 20:49:15 +10:00
  • 61cb78fc93 Tweaks to LineItemsController, renaming #index to #bought Rob Harrington 2017-05-12 16:10:43 +10:00
  • 38d3b446cc Removing unused #tag_list method on VariantSerializer Rob Harrington 2017-05-12 12:45:42 +10:00
  • e47e10d267 Removing n+1 query from #items_bought_by_user Rob Harrington 2017-05-12 12:39:36 +10:00
  • 77c8c85775 Memoizing the result of OrdersController#order_to_update Rob Harrington 2017-05-12 12:18:05 +10:00
  • fab6d70832 Changeable orders only returns orders if the shop allows changes Rob Harrington 2017-05-12 11:22:33 +10:00
  • 9586666248 Updating translation for allow_changes option Rob Harrington 2017-05-12 10:45:59 +10:00
  • f5ab9a3445 Merge remote-tracking branch 'origin/master' into HEAD Continuous Integration 2017-05-12 10:39:06 +10:00
  • 1ac8c85113 Merge remote-tracking branch 'origin/master' into HEAD Continuous Integration 2017-05-12 09:55:25 +10:00
  • 56c2350d36 Updating enterprise fees on completed order from OrdersController#update Rob Harrington 2017-05-10 12:04:32 +10:00
  • 6eafed00f5 Updating translations for config/locales/fr.yml [skip ci] Transifex-Openfoodnetwork 2017-05-05 21:35:28 +10:00
  • 74661c0b77 Updating translations for config/locales/nb.yml [skip ci] Transifex-Openfoodnetwork 2017-05-05 18:10:25 +10:00
  • c4fbcb19d0 Only show Admin & Handling fees once on completed order form Rob Harrington 2017-05-05 15:28:01 +10:00
  • 08e391856c Ask user to confirm cancellation of order Rob Harrington 2017-05-05 15:17:14 +10:00
  • 8c8b40c5a8 Showing order cycle close time on banner when multiple open orders are present Rob Harrington 2017-05-05 12:20:00 +10:00
  • c3eda435eb Hiding 'Back to Cart' and 'Back to Store' buttons on completed orders when distributor does not match cart Rob Harrington 2017-05-05 12:05:57 +10:00
  • 5eadb33db9 Using changes_allowed? to authorize cancellation of line_items Rob Harrington 2017-05-05 11:44:05 +10:00
  • f977a05b08 Fixing broken spec for fetching list of bought items as json Rob Harrington 2017-05-05 08:50:45 +10:00
  • 217eda8362 Shipping and payment fees are updated for completed orders when the order changes Rob Harrington 2017-05-04 18:26:07 +10:00
  • 579f3bf90a Changing quantity and deleting line_items of completed orders works with inventory where present Rob Harrington 2017-05-03 16:11:39 +10:00
  • 348ab81c42 Overriding #increment! using variant overrides Rob Harrington 2017-05-03 16:09:47 +10:00
  • 3df629bc6e Prevent users from removing the final line item of an order, suggest cancelling instead Rob Harrington 2017-05-03 11:36:45 +10:00
  • 07b2f0a7c2 Showing banner for distributor of order on order summary, regardless of current_distributor Rob Harrington 2017-04-28 15:44:41 +10:00
  • c0445d46f3 Changeable orders ignores cancelled orders Rob Harrington 2017-04-28 15:26:37 +10:00
  • 6c90b4e6d0 Adding alert to order summary, notifying user of remaining time to make changes Rob Harrington 2017-04-28 15:18:35 +10:00
  • e79a23a554 Disabling save button on order page until changes are made to the order Rob Harrington 2017-04-28 14:42:00 +10:00
  • 314ccc2f27 Ensuring that #items_bought_by_user doesn't return items from cancelled orders Rob Harrington 2017-04-27 14:39:36 +10:00
  • 68c8759af1 Count of items in cart form looks is consistent with rest of UI (ie. uses quantities) Rob Harrington 2017-04-27 13:18:05 +10:00
  • 314e9a4f15 Open shopfront existing orders flash link in a new window Rob Harrington 2017-04-27 13:16:06 +10:00
  • 0029a1b6cf Ensure order adjustments are displayed in edit form for customers Rob Harrington 2017-04-27 12:41:12 +10:00
  • bfcde72855 Use explicit format for dates on front-end account page Rob Harrington 2017-04-21 14:03:47 +10:00
  • 3d0ada803f Test presence of 'Edit' link for previous orders in cart Rob Harrington 2017-04-12 16:24:03 +10:00
  • 840c936a6f OrderSerializer#changes_allowed_until returns 'Not allowed' unless changes are allowed Rob Harrington 2017-04-12 16:06:58 +10:00
  • 7ea74ccf4a Order confirmation redirects 'Back to Cart' if cart is non-empty Rob Harrington 2017-04-12 16:02:28 +10:00
  • b55036e165 Adding alert to shopfront to alert user to presence of orders open for editing Rob Harrington 2017-04-12 15:50:01 +10:00
  • 47011e11ff order_cycle.items_bought_by_user actually scopes to the current distributor Rob Harrington 2017-04-12 14:21:51 +10:00
  • ae28d7a96b Adding a link in cart to allow user to edit existing + open orders for same OC Rob Harrington 2017-04-12 14:15:52 +10:00
  • 0dd8959bf7 Use an actual completed order for OrdersController#order_to_update spec Rob Harrington 2017-04-12 12:17:00 +10:00
  • 316b0915e4 Just display the date that orders can be changed until Rob Harrington 2017-04-12 12:00:08 +10:00
  • e21bfd95f4 Renaming order.editable? to order.changes_allowed? Rob Harrington 2017-04-12 11:48:31 +10:00
  • 893331c7bb Adding 'Open Orders' section to the top of customer accounts page Rob Harrington 2017-04-12 11:29:12 +10:00
  • b94bcd697f Restructuring customer accounts spec Rob Harrington 2017-04-12 09:43:45 +10:00
  • b0ff7ca767 Making accounts page orders listing full-width Rob Harrington 2017-03-24 10:39:35 +11:00
  • 493a537f2c Making out-of-stock products in the cart more visible Rob Harrington 2017-04-06 18:04:34 +10:00
  • cda43f075b Moving bought items listing up into main section of cart Rob Harrington 2017-04-06 17:29:13 +10:00
  • 5d9f92eaa7 Adding 'Cancel Order' button to order confimation interface Rob Harrington 2017-04-06 12:38:34 +10:00
  • c6afa1849c Basic routing for front-end OrdersController#cancel action Rob Harrington 2017-04-05 15:31:11 +10:00
  • eec3a21c89 Allow editing of completed orders from confirmation page where distributor allows it Rob Harrington 2017-03-30 17:34:39 +11:00
  • 768240a5ba Reorganising darkswarm order views into partials Rob Harrington 2017-03-30 15:23:09 +11:00
  • 5af8668560 Rewriting Spree::Taxons.distributed_taxons for better performance Rob Harrington 2017-03-30 12:19:43 +11:00
  • 630b8a2577 Add OrdersController#order_to_update method, to allow updating a complete order where appropriate Rob Harrington 2017-03-29 17:01:28 +11:00
  • 12a6f652ad Warn when allowing guest orders and order changes Maikel Linke 2017-01-06 16:32:38 +11:00
  • db4a528ba3 Update shipment to re-calculate included tax Maikel Linke 2016-12-22 13:26:11 +11:00
  • 479c7ba24b Update transaction fees of completed orders Maikel Linke 2016-12-16 15:33:49 +11:00
  • 1f08729df3 Update shipping fees after removing item Maikel Linke 2016-12-15 14:50:06 +11:00
  • 811671661e Remove item from dropdown cart after deletion Maikel Linke 2016-12-08 13:03:12 +11:00
  • 936df71d0d Link to bought products on cart page Maikel Linke 2016-12-07 15:04:55 +11:00
  • f3f6714472 Add message about previous orders on checkout page Maikel Linke 2016-11-09 12:50:53 +11:00
  • 3bce2eb7b5 Rename translation key checkout to avoid conflicts Maikel Linke 2016-11-09 11:34:55 +11:00
  • bf05866f92 Change headline of already ordered items Maikel Linke 2016-11-04 16:23:49 +11:00
  • 219ad4a3a7 Reload bought products after choosing order cycle Maikel Linke 2016-11-04 15:38:17 +11:00
  • a7d8028d5a Add retry: 3 to intermittently failing spec Maikel Linke 2016-10-14 16:04:16 +11:00
  • d49469a3e6 Show bought items only if changes are allowed Maikel Linke 2016-10-14 15:50:45 +11:00
  • 4835ef067f Add feature to remove line items from open order cycle Maikel Linke 2016-08-03 17:23:02 +10:00
  • 4112c3cc75 Set auth token for all JS HTTP requests Maikel Linke 2016-08-24 16:46:33 +10:00
  • 0fe4030d71 Display bought items only if present Maikel Linke 2016-08-03 14:25:23 +10:00
  • e8d2d4d96f Display already bought items in edit cart view Maikel Linke 2016-07-29 14:53:43 +10:00
  • 88c3f414fb Handle missing order in cart Maikel Linke 2016-07-29 10:42:16 +10:00
  • c0d6b68233 Apply some style guidelines to older code Maikel Linke 2016-07-27 16:21:56 +10:00
  • 65f62c42b9 Display products already ordered in this oc Maikel Linke 2016-07-27 16:05:39 +10:00
  • fe7bd5e2cd Serialise tag_list only for variant overrides Maikel Linke 2016-07-27 15:58:54 +10:00
  • e1b40142b8 Remove unused translations Maikel Linke 2016-07-22 14:30:00 +10:00
  • 963b4617a9 Add allow-order-changes option to enterprise Maikel Linke 2016-10-12 13:56:06 +11:00
  • 95ddfc4e40 Merge tag 'v1.8.10' into transifex Maikel Linke 2017-05-05 12:28:16 +10:00
  • 01746ed470 Add missing translations on views François Turbelin 2017-03-28 21:52:48 +02:00
  • f25e3bc6f7 Implement with_currency rspec helper for money amounts Julius Pabrinkis 2017-05-04 18:02:38 +01:00