Commit Graph

  • f499dd627a with_tax_included_in_price handles exceptions gracefully Rohan Mitchell 2015-11-04 15:32:31 +11:00
  • 8e1bade355 Move adjustment specs to their own spec file Rohan Mitchell 2015-11-04 15:28:03 +11:00
  • a32321df68 Clarify label Rohan Mitchell 2015-11-04 14:54:15 +11:00
  • 5a29311137 Choose a more sensible default tax rate: one that calculates to the same amount as the current adjustment tax Rohan Mitchell 2015-11-04 14:51:15 +11:00
  • 3e7a12cca1 Rename spec support method for faster tab completion on save_and_open_page Rohan Mitchell 2015-11-04 12:26:19 +11:00
  • 81a6e07d5c Admin can remove tax on an adjustment Rohan Mitchell 2015-11-04 12:25:55 +11:00
  • 727ecae62b Admin can modify a taxed adjustment on an order Rohan Mitchell 2015-11-04 11:56:16 +11:00
  • 85e45fa558 Use select2 Rohan Mitchell 2015-11-04 11:25:15 +11:00
  • 83c0093665 Admin can include tax when creating an adjustment Rohan Mitchell 2015-11-04 11:18:55 +11:00
  • 46a9304ae1 Extract compute_tax from EnterpriseFeeApplicator to Spree::TaxRate model Rohan Mitchell 2015-11-04 10:59:29 +11:00
  • d794981ecf Add form field to set tax when creating adjustment on order. Display tax included in adjustments on order interface. Rohan Mitchell 2015-11-04 10:44:33 +11:00
  • 6476ce6ba9 Make spec more resilient Rohan Mitchell 2015-11-10 15:05:45 +11:00
  • a06b452e7e updated norwegian locale Maikel Linke 2015-11-07 16:42:35 +11:00
  • 0b6cbb43d6 updated locale nb.yml Maikel Linke 2015-11-06 11:56:25 +11:00
  • 27903a46e6 Adding new save-bar directive for handling save actions for index pages Rob Harrington 2015-11-06 09:53:31 +11:00
  • 330882c689 Pulling out styling for red buttons in admin into more generic .red class Rob Harrington 2015-11-06 09:52:48 +11:00
  • b1bac703ed WIP: BOM Refactor, delete line_items using ngResource, updating data requests in line_items_controller Rob Harrington 2015-11-05 17:50:18 +11:00
  • bf6bd2dc68 Hack down routes available for Admin::LineItemsController Rob Harrington 2015-11-05 17:18:32 +11:00
  • eb7b2e7a3b Use ams_prefix not ams_suffix! Rob Harrington 2015-11-05 17:17:45 +11:00
  • 73c80cb5e5 Ordering index orders within query Rob Harrington 2015-11-05 17:11:13 +11:00
  • 6769c2c729 Can pass params for order or line items into LineItemsController#index Rob Harrington 2015-11-05 17:07:47 +11:00
  • afef9e3211 WIP: BOM Refactor, building order_cycle fetch and update logic with ngResource Rob Harrington 2015-11-05 15:13:19 +11:00
  • a9e5f2912f WIP: Fixing Orders service specs Rob Harrington 2015-11-05 14:48:26 +11:00
  • 66d1e4297e WIP: Renaming admin.order_cycles to admin.orderCycles for consistency Rob Harrington 2015-11-05 14:40:42 +11:00
  • 5e59048705 i18n typo Maikel Linke 2015-11-05 14:39:33 +11:00
  • 4d4e2d4abd WIP: Moving order_cycle controller into order_cycles folder Rob Harrington 2015-11-05 14:38:01 +11:00
  • db4e8382e4 Oops, updating template to make order filtering work Rob Harrington 2015-11-05 14:05:14 +11:00
  • 51762753f4 WIP: BOM Refactor, adding json route for OrderCyclesController#index, loading OCs based on show_more or specific order_close_at_gt Rob Harrington 2015-11-05 14:04:29 +11:00
  • 2483eef4be WIP: BOM Refactor, removing obsolete OrderCycle.recently_closed scope, ordering closed OCs Rob Harrington 2015-11-05 14:02:04 +11:00
  • 38d2616ea0 No need to empty cache if I18n asset depends on locale Maikel Linke 2015-11-05 12:50:11 +11:00
  • 5db64b6f21 Update travis config and README with new ruby version Rohan Mitchell 2015-11-05 12:48:22 +11:00
  • 0505a45de5 Invalidate I18n asset if locale changes Maikel Linke 2015-11-05 12:47:15 +11:00
  • e96fa967b8 WIP: BOM refactor, rebuilding bulk orders controller as line items controller using new AJAX routes Rob Harrington 2015-11-05 11:54:36 +11:00
  • 8b29612614 Merge remote-tracking branch 'origin/master' into i18n Maikel Linke 2015-11-05 11:54:06 +11:00
  • 90d52151b6 Updated fr.yml Maikel Linke 2015-11-05 11:53:38 +11:00
  • 6666de96b2 Update ruby version used in CI Rohan Mitchell 2015-11-05 11:24:12 +11:00
  • b7d92786d0 Bumping ruby version to 2.1.5 Rob Harrington 2015-09-19 01:06:16 +10:00
  • d731d4e803 Making sure flash is a hash so that is can be used to initialize OpenStuct Rob Harrington 2015-09-12 23:49:45 +10:00
  • 2277b9f5a6 Changing ruby version in version manager config Rob Harrington 2015-09-12 15:34:24 +10:00
  • aef8b9648e Initial upgrade of Gemfile Rob Harrington 2015-09-12 14:42:18 +10:00
  • 65589d25c6 Display more verbose product and variant name Rohan Mitchell 2015-11-05 09:50:00 +11:00
  • 5ffad4d343 Fix quantity calculation Rohan Mitchell 2015-11-05 09:43:44 +11:00
  • 50a551a87e Coffeescript! Rob Harrington 2015-11-04 18:35:14 +11:00
  • 1494389d34 WIP: BOM Refactor, organising admin.products files in appropriate folders Rob Harrington 2015-11-04 18:28:53 +11:00
  • b43049af47 WIP: BOM Refactor, building line_item fetch and update logic with ngResource Rob Harrington 2015-11-04 18:16:17 +11:00
  • f563f04f1c WIP: BOM Refactor, building order fetch and update logic with ngResource, updating rails routes Rob Harrington 2015-11-04 16:35:56 +11:00
  • ae7e744644 WIP: BOM Refactor, adding for_line_items action to enterprises controller Rob Harrington 2015-11-04 15:02:29 +11:00
  • 625e0888ea Adding logic to Admin::BaseController to standardise rendering of data with AMS Rob Harrington 2015-11-04 12:10:50 +11:00
  • a3d638df67 Merge branch 'master' into folklabs-producer-emails Rohan Mitchell 2015-11-04 11:15:01 +11:00
  • 9227df54b6 Display detail rows for admin adjustments Rohan Mitchell 2015-10-30 14:47:01 +11:00
  • 015f3eb9ac Display summary rows for admin adjustments Rohan Mitchell 2015-10-30 14:18:55 +11:00
  • fd747f9012 Updated French locale Maikel Linke 2015-10-30 12:20:12 +11:00
  • 7350dbb75e Adding tweaks that have been missed from merges Lynne Davis 2015-09-16 16:09:51 +01:00
  • 94e1264aef Add rspec-retry for inconsistently failing spec Rohan Mitchell 2015-10-29 16:01:39 +11:00
  • aec3980a93 Merge remote-tracking branch 'origin/master' into i18n Maikel Linke 2015-10-29 14:56:17 +11:00
  • 4eed222f18 Fixed several i18n issues reported by Myriam Maikel Linke 2015-10-29 14:55:38 +11:00
  • f63a80300b Merge branch 'master' into folklabs-producer-emails Rohan Mitchell 2015-10-29 11:49:24 +11:00
  • 87cf3eda41 Amend 'Detailed orders breakdown' heading with missing content Rohan Mitchell 2015-10-29 11:48:12 +11:00
  • 02423d3a41 Using rails time zone account invoice job specs Rob Harrington 2015-10-28 16:51:18 +11:00
  • cb1f79f59a Updating front end order details, invoices and pdfs to display names of line_items as opposed to variants Rob Harrington 2015-10-28 15:42:14 +11:00
  • 18a7317185 Merge branch 'account-invoices' into line_item_naming Rob Harrington 2015-10-28 13:42:27 +11:00
  • c5810fc003 Improving BOM form validation Rob Harrington 2015-10-09 17:04:20 +11:00
  • f60b6994eb Wrapping line_item update with order.update_distribution_charge inside lock Rob Harrington 2015-10-09 16:45:13 +11:00
  • 50b3635e7e Locking line_items on API update Rob Harrington 2015-10-09 12:50:34 +11:00
  • ab7bfd10c5 Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module" Rob Harrington 2015-10-08 14:50:41 +11:00
  • cdb0c2db33 Admin Orders show page uses line_item.full_name to describe line_items Rob Harrington 2015-10-02 09:39:25 +10:00
  • 21e5895a8a Group Buy panel on BOM takes changes to final_weight_volumes into account Rob Harrington 2015-10-02 09:05:58 +10:00
  • 33e1322a44 Adding form validation to BOM Rob Harrington 2015-10-01 21:56:44 +10:00
  • b08556ec7f WIP: Making final_weight_volume adjustment a bit nicer Rob Harrington 2015-10-01 16:41:16 +10:00
  • a71999ba84 Weight only returned for products whose variant_unit is 'weight' Rob Harrington 2015-10-01 11:06:02 +10:00
  • 2d468f5022 Fixing attr_accessible for line_items (broken in previous commit) Rob Harrington 2015-09-30 15:01:40 +10:00
  • eba13a0dd7 Line items inherit units from variants upon creation Rob Harrington 2015-09-30 13:23:54 +10:00
  • 1946bac8e4 Fixing report spec that cares about table title case Rob Harrington 2015-09-30 13:23:27 +10:00
  • e52f7165c3 Overriding any last references to options_text in the spree codebase Rob Harrington 2015-09-26 10:14:46 +10:00
  • 6dfae1b014 Whitespace crusader Rob Harrington 2015-09-26 10:13:35 +10:00
  • 40972cc6ec Updating reports to use naming information from line_items directly, rather than from the original variant Rob Harrington 2015-09-25 18:53:03 +10:00
  • 795830d94d Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module Rob Harrington 2015-09-25 17:43:11 +10:00
  • 039fcb80eb Extracting variant and option_value naming out into a lib class that is now shared between line items and variants, line_items have option_values Rob Harrington 2015-09-25 12:32:09 +10:00
  • 6a70c162bb Account invoice jobs run according to rails config time zone rather than system time zone Rob Harrington 2015-10-23 12:33:05 +11:00
  • 0fd29dd32e use expect in bulk_order_management_spec Maikel Linke 2015-10-22 13:43:15 +11:00
  • bbeeb8a493 Merge remote-tracking branch 'origin/master' into i18n Maikel Linke 2015-10-22 11:03:42 +11:00
  • 6c1619ba60 i18n more content Maikel Linke 2015-10-22 11:03:35 +11:00
  • df34f6ef8e using default_locale for precompiled assets Maikel Linke 2015-10-22 10:50:29 +11:00
  • dc8166ec84 New CI script to check test state via GitHub API Maikel Linke 2015-10-21 16:29:41 +11:00
  • ef08977dbe Prevent invoices from being sent unless the distributor of an order has set their ABN Rob Harrington 2015-10-21 16:23:48 +11:00
  • 9b2653aa2d Updating order invoice template to be more legally compliant Rob Harrington 2015-10-21 15:52:14 +11:00
  • adf0a84669 Use ! version of find_by_permalink to recover on missing resource Maikel Linke 2015-10-21 15:42:28 +11:00
  • 7163664725 updated locales fr and nb Maikel Linke 2015-10-21 14:36:02 +11:00
  • 2053fbecda Merge branch 'i18n-replace-strings-in-js' into i18n Maikel Linke 2015-10-21 14:09:43 +11:00
  • 6781051fe6 enabling Travis container-based infrastucture Maikel Linke 2015-10-21 10:27:16 +11:00
  • 2357f46a4e CI scripts use env vars Maikel Linke 2015-10-15 17:17:31 +11:00
  • 8bd78eb139 spec_helper for lib/open_food_network/permissions_spec.rb Maikel Linke 2015-10-15 18:18:26 +11:00
  • f152e4054c Remove obsolete deface Maikel Linke 2015-10-09 15:54:59 +11:00
  • 62d31f79ed Remove obsolete deface Maikel Linke 2015-10-09 15:51:05 +11:00
  • 2ea1a59666 depricating db2fog.rb initializer due to invalid bucket name Maikel Linke 2015-10-09 15:03:50 +11:00
  • a95727b376 running all specs in Travis Maikel Linke 2015-10-11 11:04:58 +11:00
  • b35df3c945 Travis config for parallel execution on five nodes Maikel 2015-10-08 15:24:48 +11:00
  • 421774e46c Do not send producer notifications when the producer has no orders for this order cycle Rohan Mitchell 2015-10-17 11:02:47 +11:00
  • 5b3e052f78 Using a compiled stylesheet for pdf styling Rob Harrington 2015-10-16 21:36:18 +11:00
  • 47fb2270bd Making spec do the right thing Rob Harrington 2015-10-16 15:14:25 +11:00