Commit Graph

  • b324207121 Merge current master Steve Pettitt 2016-03-10 21:48:13 +00:00
  • fe3c0b8d29 Move data processing to model, add payment method preload Steve Pettitt 2016-03-10 21:42:42 +00:00
  • 02cc5adf78 Revert false HAML indent Maikel Linke 2016-03-09 18:57:54 +11:00
  • 02cbad2697 Remove duplicate lines from merging Maikel Linke 2016-03-09 18:49:35 +11:00
  • 071ee9ab54 Add brackets to t call in js line items controller Maikel Linke 2016-03-09 18:39:23 +11:00
  • 61fb34e738 Use user's email address as enterprise.email Maikel Linke 2016-03-09 14:52:52 +11:00
  • f2c8ea9722 Auto-merged master into uk/account-balances on deployment. Maikel 2016-03-09 14:43:05 +11:00
  • b6406b54b4 Apply code style Maikel Linke 2016-03-09 14:40:04 +11:00
  • 9ce5c45799 Update gem nokogiri to 1.6.7.2 Maikel Linke 2016-03-09 14:05:38 +11:00
  • f1cc3a7b0d Apply code style following Rubocop Maikel Linke 2016-03-09 12:42:16 +11:00
  • d925c2aefc Translate Spree payment, shipment and order states Maikel Linke 2016-03-02 16:17:40 +11:00
  • 7e65b3176d Add retry to failing payment method spec Rohan Mitchell 2016-03-09 14:20:48 +11:00
  • 9645ec727b Refresh products cache when inventory items are changed Rohan Mitchell 2016-03-09 14:07:04 +11:00
  • 6f29a8b642 Refresh cache when inventory setting product_selection_from_inventory_only is changed Rohan Mitchell 2016-03-09 13:29:33 +11:00
  • 27d7b3026b Move OpenFoodNetwork::ProductsCacheIntegrityChecker.active_exchanges to Exchange model Rohan Mitchell 2016-03-09 12:28:09 +11:00
  • c1647ccd2c Set public enterprise.email_address at registration Maikel Linke 2016-03-04 17:50:04 +11:00
  • 28e2d4041f Hide create-enterprise-group button from non-admins Maikel Linke 2016-03-04 14:24:24 +11:00
  • 780ec598d6 Use preferred_currency instead of preferences[:currency]. Use constant for currency instead of config var. Rohan Mitchell 2016-03-04 11:31:18 +11:00
  • 73b53e02fc Exclude performance specs from CI, which were modifying Spree::Config.currency Rohan Mitchell 2016-03-04 10:53:48 +11:00
  • 1440544b2d Use persisted models Rohan Mitchell 2016-03-04 10:29:26 +11:00
  • 6300f87987 Use have_no_selector in VO spec Maikel Linke 2016-03-04 10:23:13 +11:00
  • bc2223fb8e Fix intermittent spec fails: currency inconsistencies on CI and retry on VOs Rohan Mitchell 2016-03-04 10:15:57 +11:00
  • b5d4f8b781 Merge remote-tracking branch 'origin/master' into groups Maikel Linke 2016-03-04 09:36:46 +11:00
  • 939356ef26 Update spec with nulls Steve Pettitt 2016-03-03 07:18:49 +00:00
  • 4966290f87 Check missing lat/long instead of zero Steve Pettitt 2016-03-03 06:41:59 +00:00
  • 422061f137 Merge branch 'master' into products-caching Rohan Mitchell 2016-03-03 09:42:52 +11:00
  • 7e6d544180 Do not serialize product count_on_hand - reduce coupling between variant create and products JSON Rohan Mitchell 2016-03-03 09:33:32 +11:00
  • c1d068aeb9 Add/modify karma specs Steve Pettitt 2016-03-02 20:07:39 +00:00
  • 6a2319e16d Remove producers without lat + long from map Steve Pettitt 2016-03-02 19:08:57 +00:00
  • 0d65838e5d Adding a second migration to auto-add variants to inventories v1.5.0 Rob Harrington 2016-03-02 17:09:39 +11:00
  • 587d06dced Merge remote-tracking branch 'origin/master' into groups Maikel Linke 2016-03-02 15:31:35 +11:00
  • 465649475d Revoke ability to overide variants based on shared management/ownership (ie. only explicit permissions) Rob Harrington 2016-03-02 08:51:54 +11:00
  • aff346071f Automatically selecting a hub on inventory page when it is the only option Rob Harrington 2016-02-26 13:49:34 +11:00
  • 3f466e86b6 Renaming 'Override Variant Details' permission to 'Add Products To Inventory' Rob Harrington 2016-02-26 00:17:36 +11:00
  • 4bf27982f4 Applying variant override permissions when they are added or removed Rob Harrington 2016-02-25 18:32:10 +11:00
  • 8e1b4e299c Adding column 'permission_revoked_at' to VOs Rob Harrington 2016-02-25 15:20:22 +11:00
  • 51d77d5781 Adding migration to explicitly grant VO permission where it is currently implicitly granted via managers/owners Rob Harrington 2016-02-25 09:58:15 +11:00
  • 186d1c1f26 Revoking ability to create variant overrides via OC permission Rob Harrington 2016-02-25 09:15:20 +11:00
  • e00fe824ac Updating text for inventory only product selection setting for enterprises Rob Harrington 2016-02-24 17:44:23 +11:00
  • b2657ddc72 Adding data migration to populate inventories of enterprises that are already using variant overrides Rob Harrington 2016-02-19 11:44:42 +11:00
  • 4de0a5c220 Renaming 'Variant Overrides' index page to 'Inventory' Rob Harrington 2016-02-19 10:36:50 +11:00
  • ed40ebace6 Existing Exchange Variants must be explicitly set to true by form data to remain in an exchange when an order cycle is updated Rob Harrington 2016-02-18 09:53:35 +11:00
  • 1d83809866 Bugfix: Spree::Variant#not_hidden_for scope was broken Rob Harrington 2016-02-13 16:14:19 +11:00
  • 6ee4e4190e New product count for inventory takes permissions into account Rob Harrington 2016-02-12 14:38:13 +11:00
  • f280b96215 Hiding a variant from inventory prevents it being available on the shopfront Rob Harrington 2016-02-12 12:26:53 +11:00
  • e16ca82e76 Extract product JSON rendering to lib class. Fix HTML stripping that never actually worked. Rohan Mitchell 2016-01-15 13:29:28 +11:00
  • 77e74c5642 OC Coordinators can opt to restrict products in an order cycle to those in their inventory only Rob Harrington 2016-02-11 17:35:15 +11:00
  • f288c09380 Moving inventory settings to their own section within the enterprise edit form Rob Harrington 2016-02-11 11:21:16 +11:00
  • 488daed8f3 Translating variant overrides / inventory page Rob Harrington 2016-02-10 16:43:20 +11:00
  • f05f88c1cb Adding global config to allow shop users to only select from inventory variants in OC interface Rob Harrington 2016-02-10 16:42:52 +11:00
  • 28b143da73 WIP: Splitting Variant overrides into views Rob Harrington 2016-02-01 15:30:08 +11:00
  • 8f37aa0522 WIP: Adding Loading flash to variant overrides page Rob Harrington 2016-01-24 09:57:39 +11:00
  • 7008d26f68 WIP: Alerting user to presence of new variant for inventory, new variants can be filtered + limited Rob Harrington 2016-01-20 18:36:28 +11:00
  • f06d909c23 WIP: Adding infrastructure to show/hide variants + overrides using inventory items Rob Harrington 2016-01-15 18:09:07 +11:00
  • 095b420997 WIP: Adding InventoryItem model for managing contents of inventories Rob Harrington 2016-01-15 14:20:10 +11:00
  • 59745fbc73 EnterpriseFees can inherit tax_category from product Rob Harrington 2016-02-05 09:26:27 +11:00
  • caa8818f02 Adding option to 'Inherit From Product' for enterprise_fee tax categories Rob Harrington 2016-02-04 15:35:49 +11:00
  • a66582a8fb WIP: Using directive for EnterpriseFee index select elements, to properly bind data to the model Rob Harrington 2016-02-04 10:42:26 +11:00
  • 0bd9dc7af0 Enterprise Fees: Splitting ng controllers and directives into separate files, reanming module and coffee-ising Rob Harrington 2016-02-03 15:10:52 +11:00
  • 69ee1a98a7 EnterpriseFeeCalculator return empty list when retrieving applicators without distributor or order_cycle being present Rob Harrington 2016-01-29 12:41:57 +11:00
  • 137003c671 Correct calculation of tax on EnterpriseFees with TaxRates where included_in_price=false Rob Harrington 2016-01-22 15:31:59 +11:00
  • 4a7a40425a Fix problems in rake file Rohan Mitchell 2016-03-02 11:38:42 +11:00
  • 81ec3fef60 Auto-merged master into products-caching on deployment. Maikel 2016-03-02 11:12:40 +11:00
  • 7cb64e8804 Merge remote-tracking branch 'origin/master' into groups Maikel Linke 2016-03-02 11:12:33 +11:00
  • 39708d773d Merge branch 'transifex' into groups Maikel Linke 2016-03-02 11:11:43 +11:00
  • ec55af5b8a Display products cache integrity checker results on cache settings admin page Rohan Mitchell 2016-03-02 11:05:03 +11:00
  • 2abee3fcdd Extract integrity checking to lib class Rohan Mitchell 2016-03-02 11:01:41 +11:00
  • 23a1c2a772 Remove scroll bar from enterprise modal description Maikel Linke 2016-03-02 10:40:45 +11:00
  • f394cf559c Fix integrity checker rake task name Rohan Mitchell 2016-03-02 08:49:36 +11:00
  • 54ecdb670d fixed failing i18n test in variant overrides elf Pavlik 2016-02-26 17:17:06 -06:00
  • 68db9b9926 fixing faling tests elf Pavlik 2016-02-25 13:10:50 -06:00
  • cb33ede9dc Revert "elf-pavlik@ee52f1d" Nicolas Blanc 2016-02-28 19:54:44 +00:00
  • a8d7732a39 elf-pavlik@ee52f1d Nicolas Blanc 2016-02-28 19:23:26 +00:00
  • 1770cbb6bf Display footer_email in confirmation emails correctly Maikel Linke 2016-02-26 16:09:14 +11:00
  • 21ce7ab30a Fix integrity checker error message, add task to warm products cache Rohan Mitchell 2016-02-26 13:04:55 +11:00
  • d89e9620ac Fix output of cache integrity checker errors Rohan Mitchell 2016-02-26 12:05:49 +11:00
  • 45a7b13e9a Refresh cache when option type destroyed Rohan Mitchell 2016-02-26 10:09:16 +11:00
  • 8928e461d4 Refresh cache when option type changed Rohan Mitchell 2016-02-26 09:59:16 +11:00
  • 4621f625a0 new validation6 02/25/2016 Nicolas Blanc 2016-02-25 12:36:21 +00:00
  • 5e71790cd1 new validation5 02/25/2016 Nicolas Blanc 2016-02-25 11:04:21 +00:00
  • b5204a4820 Refresh cache when option value changed or destroyed Rohan Mitchell 2016-02-25 11:08:53 +11:00
  • b84f49a1c3 Satisfy style police Steve Pettitt 2016-02-24 20:39:26 +00:00
  • 8e88cd6255 Localise dates Steve Pettitt 2016-02-24 20:33:37 +00:00
  • c07fefde1a Change non-js translations to be done in rails Steve Pettitt 2016-02-24 20:23:13 +00:00
  • 098d313163 Using should syntax in payment method spec Maikel Linke 2016-02-24 16:33:31 +11:00
  • a7e3b2d9df Update enterprise email tests Maikel Linke 2016-02-24 16:21:18 +11:00
  • 71862e00a7 Perform products cache refresh when producer property changed or destroyed Rohan Mitchell 2016-02-24 16:11:59 +11:00
  • 68f3d0951a Merge branch 'groups' into indicate-required-fields-for-new-enterprise-form Maikel Linke 2016-02-24 15:36:25 +11:00
  • 4feb7c893b Introduce contact email address for enterprises Maikel Linke 2016-02-24 15:14:07 +11:00
  • 1b62dd06b8 Add products cache integrity checker Rohan Mitchell 2016-02-05 15:16:12 +11:00
  • 687fb6f0aa Enqueue RefreshProductsCacheJob with lower than default priority Rohan Mitchell 2016-02-05 14:57:31 +11:00
  • 98961fef74 Trigger cache refresh when producer property changed or destroyed Rohan Mitchell 2016-02-05 12:04:32 +11:00
  • 8b070fddbb Refresh products cache when exchange fee is changed or destroyed Rohan Mitchell 2016-02-05 10:40:27 +11:00
  • 8af6866ae4 Refresh products cache when exchange is changed or destroyed Rohan Mitchell 2016-02-05 10:37:05 +11:00
  • 146797ea61 Generalise method for reuse Rohan Mitchell 2016-02-05 09:37:10 +11:00
  • 8bd5a36aaf Remove enterprise fee destruction cache callback - responsibility to be handled by dependent models Rohan Mitchell 2016-02-05 09:14:49 +11:00
  • a64a501dbb Smarter job queuing: Do not enqueue a RefreshProductsCacheJob if there's already one waiting to run Rohan Mitchell 2016-02-04 15:15:49 +11:00
  • 0a90a48b04 Refresh products cache when coordinator fees are changed or destroyed Rohan Mitchell 2016-02-04 12:45:05 +11:00
  • 540687515e Reify coordinator_fees HABTM join table as CoordinatorFee model using HMT Rohan Mitchell 2016-02-04 12:29:16 +11:00
  • 62c6530ca9 Do not refresh products cache when price destroyed - variant destruction is main (only?) trigger, it causes refresh Rohan Mitchell 2016-02-04 12:15:59 +11:00