Commit Graph

  • 9ba0fc268e Run transpec and clean up rubocop issues in credit_card_controller and spec luisramos0 2018-11-15 11:03:40 +00:00
  • fb56293748 Merge pull request #3046 from luisramos0/2-0-knapsack-report Pau Pérez Fabregat 2018-11-15 09:32:10 +01:00
  • d109f882fc Merge pull request #3038 from luisramos0/2-0-order-factory Maikel 2018-11-15 15:22:31 +11:00
  • a2c9ba60d8 Merge pull request #3035 from luisramos0/2-0-order-ctrl-line-item-delete Maikel 2018-11-15 15:20:31 +11:00
  • ebbe02523e Merge pull request #3019 from luisramos0/more-x-spec-reports Maikel 2018-11-15 15:17:04 +11:00
  • 2d3f706c05 Merge pull request #3042 from luisramos0/2-0-stable-nov-14th Maikel 2018-11-15 15:02:21 +11:00
  • 1e312dfa41 Update test mail setup for Spree 2 Maikel Linke 2018-11-15 14:30:46 +11:00
  • a25cdd90de Merge pull request #3014 from luisramos0/2-0-payments_spec Maikel 2018-11-15 13:02:28 +11:00
  • ece21a674a Simplify completed_order_with_fees factory and make shipment_with factory an ofn factory to avoid creating extra dummy shipping_method in every test luisramos0 2018-11-13 20:57:14 +00:00
  • 688ec5fb21 Fix rubocop issues in calculator_decorator and calculator/flat_percent_item_total_spec luisramos0 2018-11-13 16:06:14 +00:00
  • 7c0627a823 Improve failed_checkout_spec by making calculator decorator line_items_for work with new Stock::Package luisramos0 2018-11-13 15:59:28 +00:00
  • a5fb3e337d New knapsack report New knapsack report for 2-0-stable. Makes the 4 jobs with 20 mins each. luisramos0 2018-11-14 16:01:58 +00:00
  • c19e954113 Merge pull request #3009 from HugsDaniel/authenticate-api-use-through-logged-in-user Luis Ramos 2018-11-14 14:27:30 +00:00
  • 0a77eeb4b6 Merge branch 'master' into 2-0-stable-nov-14th luisramos0 2018-11-14 11:35:58 +00:00
  • 19321b6d4f Fix admin payments spec. Add missing payment method to order.distributor luisramos0 2018-11-13 11:02:01 +00:00
  • 3dd981ca05 Use logged in user (spree_current_user) for API authentication (current_api_user) Hugo Daniel 2018-11-09 17:49:23 +01:00
  • a65e2487c4 Merge pull request #3013 from luisramos0/2-0-api-orders-ctrl-spec Pau Pérez Fabregat 2018-11-14 11:48:34 +01:00
  • 605f84d30a Merge pull request #3010 from openfoodfoundation/transifex Pau Pérez Fabregat 2018-11-14 11:27:01 +01:00
  • 8ee193dbcf Merge pull request #2984 from Matt-Yorkley/email_https_links2 Pau Pérez Fabregat 2018-11-14 11:26:14 +01:00
  • e66f406ea6 Merge pull request #2946 from luisramos0/improve_taxons Pau Pérez Fabregat 2018-11-14 11:23:59 +01:00
  • 2947d7a98c Remove shipping_method_id from order factory. This attribute is gone in spree 2 and doesnt need to be the responsibility of the order factory to handle order shipping method. The shipping method is selected only when the order workflow is progressed on checkout luisramos0 2018-11-13 21:25:59 +00:00
  • 9b894c6a55 Fix orders controller spec when removing line items from order. Improved spec and adapted to the fact that in spree 2 the default number of line items in this factory is 5 luisramos0 2018-11-13 19:30:23 +00:00
  • a234308a06 Fix credit card controller by adding a rescue for wrong arguments passed in params luisramos0 2018-11-13 15:28:10 +00:00
  • 2037413df7 Make some report specs xdescribe and leave them for spree upgrade phase 2 luisramos0 2018-11-13 14:53:42 +00:00
  • ef5d679f90 Fix api/orders_controller_spec by fixing expectations on order attributes: remove old attributes shipments_path and show_path luisramos0 2018-11-12 16:25:08 +00:00
  • bbdbfc1374 Fix opi/orders_controller_spec by providing line items with shipment and thus make the order workflow work luisramos0 2018-11-08 21:46:51 +00:00
  • f9fae06a7a Updating translations for config/locales/en_BE.yml Transifex-Openfoodnetwork 2018-11-10 07:09:02 +11:00
  • 5c208a68c6 Merge pull request #3007 from openfoodfoundation/revert-2859-instagram_pattern Maikel 2018-11-09 14:23:44 +11:00
  • d8d20429aa Revert "Instagram pattern" Maikel 2018-11-09 13:33:11 +11:00
  • 57efc36448 Merge pull request #2993 from Matt-Yorkley/user_class Maikel 2018-11-09 10:21:31 +11:00
  • 0ea0016fc9 Merge pull request #2998 from coopdevs/adapt-product-on-demand Luis Ramos 2018-11-08 19:21:46 +00:00
  • ed7c12bd26 Merge pull request #2997 from luisramos0/2-0-stable-nov-8th Luis Ramos 2018-11-08 19:20:42 +00:00
  • 4149c95c65 Merge pull request #2991 from Matt-Yorkley/missing_resource_translation Luis Ramos 2018-11-08 12:34:53 +00:00
  • 30bca40ed0 Merge pull request #2996 from coopdevs/update-products-new-js-template Luis Ramos 2018-11-08 12:13:47 +00:00
  • a3da941d8f Merge pull request #2992 from Matt-Yorkley/credit-cards Luis Ramos 2018-11-08 12:12:34 +00:00
  • de31823151 Add #on_demand= to make product creation page work Pau Perez 2018-10-18 17:23:06 +02:00
  • fcdb5cd7af Merge branch 'master' into 2-0-stable-nov-8th luisramos0 2018-11-08 11:18:54 +00:00
  • 18c51dc596 Bring Spree changes on admin/products/new.js.erb Pau Perez 2018-11-08 10:38:36 +00:00
  • 8aa6b2c0ac Stub spree_api_key on Spree::LegacyUser when signing in as regular user Matt-Yorkley 2018-11-08 00:07:24 +00:00
  • edbfd64a44 Set the Spree.user_class explicitly in spree initializer Matt-Yorkley 2018-11-07 22:18:30 +00:00
  • fae0617639 Merge pull request #2986 from HugsDaniel/2985-api-product-images-specs Matt-Yorkley 2018-11-08 00:01:46 +00:00
  • 3f33e28839 Fix outdated credit card spec Matt-Yorkley 2018-11-07 20:48:54 +00:00
  • cfc31f1fbd Import missing translations from Spree 2 to fix some tests Matt-Yorkley 2018-11-07 19:23:28 +00:00
  • 51a94c8194 Merge pull request #2964 from openfoodfoundation/dependabot/bundler/awesome_print-1.8.0 Pau Pérez Fabregat 2018-11-07 18:48:32 +00:00
  • 9011f5d9a2 Rescue ArgumentError and give user feedback Matt-Yorkley 2018-11-07 17:12:19 +00:00
  • 72a9d39ee1 Merge pull request #2932 from luisramos0/2931-weight-calculator Pau Pérez Fabregat 2018-11-07 18:40:38 +00:00
  • ecc69c2c58 Merge pull request #2948 from pfac/pfac-config-time-zone Pau Pérez Fabregat 2018-11-07 18:39:25 +00:00
  • b5c6ecb45a Explicitly use UTF-8 encoding when opening spreadsheet files Matt-Yorkley 2018-11-07 16:50:24 +00:00
  • bc9af7c45f Add an API key for admin user Hugo Daniel 2018-11-07 15:24:22 +01:00
  • 5b16353938 Specify only link protocol setting Matt-Yorkley 2018-11-07 11:22:24 +00:00
  • b7ffde795a Add migration to update calculator class name of weight calculators luisramos0 2018-11-06 16:31:40 +00:00
  • 9490da329a Move Calculator::Weight from models/open_food_network/calculator to models/calculator luisramos0 2018-10-25 20:07:34 +01:00
  • bf55f50a7e Fix rubocop warnings on weight and weight_spec luisramos0 2018-10-25 19:28:55 +01:00
  • 275a192270 Convert specs to RSpec 3.7.1 syntax with Transpec luisramos0 2018-10-25 19:15:20 +01:00
  • 1ef04354fd Add capacity to weight calculator to calculate based on any object with an order (needed in spree 2 to calculate based on package) luisramos0 2018-10-25 19:09:14 +01:00
  • 8547d5302c Merge pull request #2978 from Matt-Yorkley/spree-upgrade/orders#show Pau Pérez Fabregat 2018-11-06 16:20:47 +00:00
  • 0c02e8c15f Merge pull request #2981 from coopdevs/remove-commented-out-code Luis Ramos 2018-11-06 16:06:59 +00:00
  • 1ceb632b83 Merge pull request #2980 from coopdevs/fix-long-line Luis Ramos 2018-11-06 16:05:22 +00:00
  • a4139a14a8 Merge pull request #2977 from luisramos0/2-0-payment-translation Pau Pérez Fabregat 2018-11-06 16:01:00 +00:00
  • 86721d6d42 Merge pull request #2974 from luisramos0/2-0-user-balance Luis Ramos 2018-11-06 16:00:44 +00:00
  • 71702af3c3 Have a single attributes list in serializer Pau Perez 2018-11-06 13:58:32 +00:00
  • 51155bb368 Remove old commented out code Pau Perez 2018-10-19 13:17:54 +02:00
  • 26d95b7250 Fix long lines Pau Perez 2018-11-06 13:41:28 +00:00
  • d0b7b57017 Remove OrderSerializer#show_path and adjust to use #edit over #show Matt-Yorkley 2018-11-06 11:07:14 +00:00
  • aaaec4777d Remove admin order #show link from helper Matt-Yorkley 2018-11-06 11:03:06 +00:00
  • c191a1feb8 Add missing translation related to authorization failure luisramos0 2018-11-06 10:11:00 +00:00
  • 79fcc7bce0 Fix user balance calculator spec by setting a target_shipment on line item of the order being tested luisramos0 2018-11-05 19:23:09 +00:00
  • 4155f086e0 Merge pull request #2968 from openfoodfoundation/transifex Pau Pérez Fabregat 2018-11-05 19:40:33 +01:00
  • 6bc14f4bab Merge pull request #2970 from Matt-Yorkley/2939-edit-order-button Pau Pérez Fabregat 2018-11-05 19:25:00 +01:00
  • 057412111d Merge pull request #2972 from coopdevs/mark-last-failing-enterprise-spec-pending Pau Pérez Fabregat 2018-11-05 18:59:47 +01:00
  • e76bf81e2a Merge pull request #2973 from coopdevs/deliver-email-in-spec Pau Pérez Fabregat 2018-11-05 18:58:37 +01:00
  • f7b6867c28 Perform mail delivery in spec to make it pass Pau Perez 2018-11-05 17:49:08 +00:00
  • 21d756a1af Mark last failing enterprises spec as pending Pau Perez 2018-11-05 16:45:53 +00:00
  • fd47756e2f Remove workaround in failing feature spec Matt-Yorkley 2018-11-05 11:19:57 +00:00
  • 50a06d1bd9 Merge pull request #2969 from luisramos0/2897-2-0-price-fix Pau Pérez Fabregat 2018-11-05 11:59:06 +01:00
  • 4f992a18f7 Fix specs creating deleted variants luisramos0 2018-11-05 10:43:10 +00:00
  • 98d79ec939 Updating translations for config/locales/fr_BE.yml Transifex-Openfoodnetwork 2018-11-05 18:46:40 +11:00
  • 4930c9bc06 Merge pull request #2934 from mkllnk/manual-rubocop-todo-config Maikel 2018-11-05 10:37:03 +11:00
  • 7ad40074a5 Make Code Climate show our real score ans split rubocop config Maikel Linke 2018-11-02 08:23:13 +11:00
  • e798532a2f Add offending files to rubocop config Maikel Linke 2018-10-26 16:15:03 +11:00
  • fe8303cb19 Merge pull request #2957 from luisramos0/2-0-paypal-spec Pau Pérez Fabregat 2018-11-02 15:50:59 +01:00
  • 834520491c Merge pull request #2900 from luisramos0/raise_error_if_no_stock_item_available Pau Pérez Fabregat 2018-11-02 15:49:21 +01:00
  • e635cfc9c1 Merge pull request #2901 from luisramos0/variants_including_master Pau Pérez Fabregat 2018-11-02 15:48:19 +01:00
  • b1f3fa14e5 Merge pull request #2880 from luisramos0/backorders Pau Pérez Fabregat 2018-11-02 15:47:02 +01:00
  • ad743a03ac Merge pull request #2888 from luisramos0/backorders-line-items Pau Pérez Fabregat 2018-11-02 15:45:25 +01:00
  • 3b85bbe911 Merge pull request #2923 from mkllnk/2882-extract-email-setup-in-specs Pau Pérez Fabregat 2018-11-02 15:40:19 +01:00
  • a910fc50f5 Merge pull request #2926 from luisramos0/2-0-stable-oct-25 Pau Pérez Fabregat 2018-11-02 15:37:34 +01:00
  • 3259b3ecf1 Merge pull request #2912 from Matt-Yorkley/admin_orders_refactor v1.22.0 Maikel 2018-11-02 16:57:28 +11:00
  • cbfe1b535d Merge pull request #2871 from openfoodfoundation/dependabot/bundler/figaro-1.1.1 Maikel 2018-11-02 12:09:53 +11:00
  • 6416d0e1c3 Bump awesome_print from 1.0.2 to 1.8.0 dependabot[bot] 2018-11-01 19:15:40 +00:00
  • 931c1207da Merge pull request #2813 from openfoodfoundation/dependabot/bundler/haml-4.0.7 Maikel 2018-11-01 16:52:07 +11:00
  • 7c4370be69 Merge pull request #2963 from luisramos0/2960_migration Maikel 2018-11-01 11:41:51 +11:00
  • 079d4e0bf5 Fix variant_overrides permissions for overrides that belong to the supplier herself luisramos0 2018-10-31 11:23:29 +00:00
  • 1fbeb43c3a Merge pull request #2958 from coopdevs/pull-translations Pau Pérez Fabregat 2018-10-31 10:52:02 +01:00
  • fc6a2d4a53 Merge pull request #2959 from coopdevs/fix-name-error-on-migrate Pau Pérez Fabregat 2018-10-31 10:51:06 +01:00
  • f16897a0b8 Fix DE translations manually Pau Perez 2018-10-31 08:39:25 +01:00
  • 1ddbc24a8b Fix default time zone config Pedro Costa 2018-10-28 18:35:36 +00:00
  • 2e2c7c56cb Move default_url_options set up to an initializer Pau Perez 2018-10-30 18:45:33 +01:00
  • 3d106d749b Fix rubocop warnings on load_sample_data task luisramos0 2018-10-30 17:51:00 +00:00
  • 82befd945b Sort Product categories alphabetically by name and fixsample data by fixing taxons taxonomy id luisramos0 2018-10-27 22:19:30 +01:00