Commit Graph

  • fe149967e4 Merge pull request #2521 from luisramos0/cookies_in_engine Pau Pérez Fabregat 2018-10-15 10:03:30 +02:00
  • f133524a9c Remove useless comment from spec factories luisramos0 2018-10-09 17:03:36 +01:00
  • 4380ff7bd7 Drop calculated_adjustments_decorator. This file was introduced in ofn's a0b740f52d. The change is already in spree 2.0.4, see here 2c82aab566 (diff-00aa4190da81ca29804a406252f1d0f4) luisramos0 2018-10-02 13:28:50 +01:00
  • a5522b90f6 Fix Shipment adjustments specs on adjustment_spec by setting Config values before test objects are created luisramos0 2018-10-02 12:01:09 +01:00
  • bd31348b94 Improve docs and readability on tax_rate_decorator luisramos0 2018-10-02 11:57:58 +01:00
  • 5693f44f5e Fix shipping adjustment basic test in adjustment_spec by removing extra shipping_method from test shipment luisramos0 2018-10-01 14:47:56 +01:00
  • fcff835922 Update results on dropdown select Matt-Yorkley 2018-10-12 17:06:42 +01:00
  • a2828ea305 Use :for_hubs scope Matt-Yorkley 2018-10-09 11:21:21 +01:00
  • 123d1963ad Remove duplicate method Matt-Yorkley 2018-10-09 11:18:52 +01:00
  • 3cb43121d5 Refactor long lines for new character limit Matt-Yorkley 2018-10-08 17:41:27 +01:00
  • 8fcaa54de7 Update CSV templates Matt-Yorkley 2018-10-08 17:06:37 +01:00
  • bd4f0507ce Adjustments for new Settings and ResetAbsent classes Matt-Yorkley 2018-10-08 17:00:55 +01:00
  • 1c85de6f58 Use producer and distributor for field names Matt-Yorkley 2018-10-02 15:06:37 +01:00
  • 2c9dc8899a Update fields in specs Matt-Yorkley 2018-10-02 13:16:55 +01:00
  • 5c2b5377bc Assign supplier_id when saving new product to products list Matt-Yorkley 2018-10-02 13:15:18 +01:00
  • e7a909e828 Rename supplier to enterprise Matt-Yorkley 2018-10-02 12:25:57 +01:00
  • 8a0a33deec Merge pull request #2858 from Matt-Yorkley/rubocop_line_limit Matt-Yorkley 2018-10-12 16:52:37 +01:00
  • 1b6f7485b8 Update spree 2-0-4-stable revision used to pick up latest commits luisramos0 2018-10-12 12:05:18 +01:00
  • 3b6d29968d Fix spree/models/adjustment_spec rubocop issues luisramos0 2018-10-09 18:07:53 +01:00
  • 6aa8978fe9 Convert specs to RSpec 3.7.1 syntax with Transpec luisramos0 2018-10-09 17:46:14 +01:00
  • 23ed4f705c Fix Enterprise Fee tax category inheritance spec by ensuring the line item is assigned to the order when the order is created. That way the tax category from product is correctly copied to the line item luisramos0 2018-10-02 23:31:51 +01:00
  • b7416e42f4 Adapt tax_rate_decorator to new spree version. Spree's default tax calculator now is checking line_items tax category, not the product tax category. See Spree's change here: a0a4b91f13 (diff-46e557ca8717d6ab5039470a40d00ea8) luisramos0 2018-10-02 17:47:15 +01:00
  • 8b0726b815 Fix enterprise fee calculation. The adjustment.source value of the fee is now allowing the inheritance of the tax category from line items luisramos0 2018-10-02 23:42:22 +01:00
  • 8aee0f9438 Reorganize code in EnterpriseFeeApplicator luisramos0 2018-10-02 16:20:44 +01:00
  • 6ad32fb66d Add check for instagram.com fabricio.albarnaz 2018-10-11 18:05:18 -03:00
  • e46b3566c3 Remove the check for www.instagram.com fabricio.albarnaz 2018-10-11 16:51:43 -03:00
  • 48720c835c Add spec to instagram pattern fabricio.albarnaz 2018-10-11 16:30:17 -03:00
  • e87075aed7 Add before save to check the instagram link pattern fabricio.albarnaz 2018-10-11 15:27:46 -03:00
  • ed429dd20d Fix models/spree/order_spec tests related to tax on shipments: - make Spree::Config be picked up correctly by reordering test object creation - make sure line item is loaded in the order when the order is created luisramos0 2018-10-04 13:15:31 +01:00
  • 56ff4fe90d Remove useless comment from spec factories luisramos0 2018-10-09 17:03:36 +01:00
  • dcf0eefe04 Drop calculated_adjustments_decorator. This file was introduced in ofn's a0b740f52d. The change is already in spree 2.0.4, see here 2c82aab566 (diff-00aa4190da81ca29804a406252f1d0f4) luisramos0 2018-10-02 13:28:50 +01:00
  • 57c6530e46 DRY code and use more flexible I18n Matt-Yorkley 2018-10-11 16:04:45 +01:00
  • ebb03906cf Increase rubocop line limit to 100 Matt-Yorkley 2018-10-11 15:37:38 +01:00
  • 60d05a941c Fix variants with 'weight' and missing unit_value Pau Perez 2018-10-10 14:03:14 +02:00
  • 5bd375d422 Favor early return over dumb else branch Pau Perez 2018-10-08 21:23:08 +02:00
  • c8c16f0e8a Use Rails 3.2 validates syntax Pau Perez 2018-10-08 16:54:22 +02:00
  • cbac916e66 Validate unit value when updating variant_unit Pau Perez 2018-10-08 16:45:37 +02:00
  • a2228d4131 Make ProductSet parseable by humans Pau Perez 2018-10-04 20:26:49 +02:00
  • 575d76e23e Cover variant creation and update with basic tests Pau Perez 2018-10-04 20:25:24 +02:00
  • d43726504b Make #update_attributes parseable by humans Pau Perez 2018-10-04 19:59:26 +02:00
  • f54c69cbba Add first test case for ProductSet Pau Perez 2018-10-04 18:21:53 +02:00
  • 2d60b3180e Wrap and improve comment block readability Pau Perez 2018-10-04 17:44:34 +02:00
  • 4760ebb80c Use global config Matt-Yorkley 2018-10-11 09:04:37 +01:00
  • dafcd0ddc2 Add per_page controls to admin orders index Matt-Yorkley 2018-09-25 13:19:51 +01:00
  • 1bafa0cb7d Merge pull request #2853 from mkllnk/remove-parallel-tests Pau Pérez Fabregat 2018-10-10 16:01:44 +02:00
  • 39d232daaf Fix Enterprise Fee tax category inheritance spec by ensuring the line item is assigned to the order when the order is created. That way the tax category from product is correctly copied to the line item luisramos0 2018-10-02 23:31:51 +01:00
  • 227dd3e399 Merge pull request #2831 from kristinalim/fix-product_import_date_error v1.21.0 Pau Pérez Fabregat 2018-10-09 16:37:25 +02:00
  • 85962158b8 Merge pull request #2821 from nikobozi/oc-clear-filter Pau Pérez Fabregat 2018-10-09 16:35:57 +02:00
  • 900c65e0fc Merge pull request #2855 from openfoodfoundation/transifex Matt-Yorkley 2018-10-09 14:21:14 +01:00
  • edca209f67 Merge pull request #2844 from Matt-Yorkley/bi/angular_orders_changing_page Matt-Yorkley 2018-10-09 14:15:38 +01:00
  • c2c492cd6b Updating translations for config/locales/es.yml Transifex-Openfoodnetwork 2018-10-09 21:57:06 +11:00
  • 55411af3fa Improve user account spec Matt-Yorkley 2018-10-08 23:55:28 +01:00
  • 245d900b58 Remove unused CI scripts Maikel Linke 2018-10-09 17:06:59 +11:00
  • 4cbc449a51 Remove unused parallel_tests gem Maikel Linke 2018-10-09 16:54:08 +11:00
  • 5606550cd2 Merge pull request #2815 from openfoodfoundation/dependabot/bundler/rspec-retry-0.6.1 Pau Pérez Fabregat 2018-10-09 07:30:25 +02:00
  • 68c58dcb68 Merge pull request #2770 from openfoodfoundation/transifex Maikel 2018-10-09 15:18:17 +11:00
  • 3e39f3e749 Disable logout on password change Matt-Yorkley 2018-10-08 23:06:54 +01:00
  • 8f5fd41c8b Update email confirmation address Matt-Yorkley 2018-10-08 21:30:49 +01:00
  • 3ec8c12899 Update account setting spec for updating email address Matt-Yorkley 2018-10-08 20:41:59 +01:00
  • 2aeed9763c Merge pull request #2789 from luisramos0/pending_order_syncer Pau Pérez Fabregat 2018-10-08 17:51:36 +02:00
  • c30458b90a Merge pull request #2787 from luisramos0/pending_subs_mailer Pau Pérez Fabregat 2018-10-08 17:51:24 +02:00
  • 875f0c01bc Merge pull request #2794 from luisramos0/pending_bulk_prod_update Pau Pérez Fabregat 2018-10-08 17:51:08 +02:00
  • d2720652bb Merge pull request #2795 from luisramos0/pending_subs_pacement_job Pau Pérez Fabregat 2018-10-08 17:50:58 +02:00
  • b51bd4aa4b Merge pull request #2796 from luisramos0/pending_prod_import Pau Pérez Fabregat 2018-10-08 17:50:48 +02:00
  • 86d9f4d56a Merge pull request #2797 from luisramos0/pending_reports Pau Pérez Fabregat 2018-10-08 17:50:25 +02:00
  • ea6e522775 Merge pull request #2826 from 73VW/master Pau Pérez Fabregat 2018-10-08 17:47:52 +02:00
  • f5573f419b Merge pull request #2778 from coopdevs/refactor-entry-processor Pau Pérez Fabregat 2018-10-08 17:11:23 +02:00
  • 37a7cceead Fix bindings on angular orders data Matt-Yorkley 2018-10-08 15:42:46 +01:00
  • b78716c283 Fix missing local variable Matt-Yorkley 2018-10-08 13:59:33 +01:00
  • d15f524cb1 Merge pull request #2779 from luisramos0/2-0-shipment-specs Maikel 2018-10-08 17:43:54 +11:00
  • 8b59943256 Updating translations for config/locales/de_DE.yml Transifex-Openfoodnetwork 2018-10-08 16:58:01 +11:00
  • 574f031020 Fix typo in matomo optout iframe url in cookies_policy_helper luisramos0 2018-10-05 21:36:03 +01:00
  • da904c908d Fix product import date when not all variants have it Kristina Lim 2018-10-06 03:02:13 +08:00
  • 58a99a7f89 Merge pull request #2692 from Matt-Yorkley/bi/angular_orders Pau Pérez Fabregat 2018-10-04 21:10:48 +02:00
  • 7a1cffb4b5 Updated build status badge 73VW 2018-10-04 18:43:30 +02:00
  • b139f3839a Merge pull request #2806 from luisramos0/rep Pau Pérez Fabregat 2018-10-04 13:02:35 +02:00
  • f99ed81863 Make 'Clear All' button work on order cycle page niko 2018-10-04 11:46:38 +02:00
  • f65d3c2815 fix rubocop issue niko 2018-10-04 03:30:32 +02:00
  • 3ae38178a3 Move query from variant_overrides_controller to its model scope niko 2018-10-04 02:43:02 +02:00
  • f8ec198f9f Remove on_demand from Api::CachedProductSerializer Pau Perez 2018-10-03 14:25:32 +02:00
  • 75ad4254a6 Remove on_demand from Api::Admin::ProductSerializer Pau Perez 2018-10-03 12:26:13 +02:00
  • 8a22567291 Fix enterprise fee calculation. The adjustment.source value of the fee is now allowing the inheritance of the tax category from line items luisramos0 2018-10-02 23:42:22 +01:00
  • 1ce431b671 Reorganize code in EnterpriseFeeApplicator luisramos0 2018-10-02 16:20:44 +01:00
  • 3fbb98519d Adapt tax_rate_decorator to new spree version. Spree's default tax calculator now is checking line_items tax category, not the product tax category. See Spree's change here: a0a4b91f13 (diff-46e557ca8717d6ab5039470a40d00ea8) luisramos0 2018-10-02 17:47:15 +01:00
  • 8a6da745a3 Bump rspec-retry from 0.5.6 to 0.6.1 dependabot[bot] 2018-10-02 19:15:12 +00:00
  • 4e1521fd6a Bump haml from 4.0.4 to 4.0.7 dependabot[bot] 2018-10-02 19:13:34 +00:00
  • c559cf0394 Fix Shipment adjustments specs on adjustment_spec by setting Config values before test objects are created luisramos0 2018-10-02 12:01:09 +01:00
  • bed4ec4102 Improve docs and readability on tax_rate_decorator luisramos0 2018-10-02 11:57:58 +01:00
  • 795441484d Fix shipping adjustment basic test in adjustment_spec by removing extra shipping_method from test shipment luisramos0 2018-10-01 14:47:56 +01:00
  • daafe73d81 Delete representative_view dependency, not used luisramos0 2018-10-02 15:11:13 +01:00
  • aa78b9e54c Merge pull request #2777 from coopdevs/setup-simplecov Pau Pérez Fabregat 2018-10-02 14:39:43 +02:00
  • 6ddcb01b7c Merge pull request #2736 from openfoodfoundation/dependabot/bundler/oj-3.6.10 Pau Pérez Fabregat 2018-10-02 14:38:26 +02:00
  • 55d7d5d1e4 Rename #capture_path to #payment_capture_path Matt-Yorkley 2018-10-02 11:10:51 +01:00
  • 017e3d14df Use variable colour assignment Matt-Yorkley 2018-10-02 11:10:21 +01:00
  • 6a7359a3c5 Pass supplier_ids in strategy #reset instead Pau Perez 2018-10-01 17:37:49 +02:00
  • 82654cd1ee Turn delegation to a reader to make it simpler Pau Perez 2018-10-01 16:33:46 +02:00
  • 148321f7b7 Make strategies class names more explicit Pau Perez 2018-10-01 16:00:42 +02:00
  • af93af1a64 Replace strategy with a more explicit name Pau Perez 2018-10-01 15:53:26 +02:00
  • 8715fce295 Remove @import_settings in favor of Settings Pau Perez 2018-09-27 15:34:46 +02:00
  • fd69c7672d Add specs for ResetAbsent strategies Pau Perez 2018-09-26 11:38:22 +02:00