10345 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Hugo Daniel	bc9af7c45f	Add an API key for admin user	2018-11-07 16:47:35 +01:00
Pau Pérez Fabregat	8547d5302c	Merge pull request #2978 from Matt-Yorkley/spree-upgrade/orders#show ... [Spree Upgrade] orders#show	2018-11-06 16:20:47 +00:00
Pau Pérez Fabregat	a4139a14a8	Merge pull request #2977 from luisramos0/2-0-payment-translation ... [Spree Upgrade] Add missing failed authorization translation	2018-11-06 16:01:00 +00:00
Luis Ramos	86721d6d42	Merge pull request #2974 from luisramos0/2-0-user-balance ... [Spree Upgrade] Fix User Balance Calculator spec	2018-11-06 16:00:44 +00:00
Matt-Yorkley	d0b7b57017	Remove OrderSerializer#show_path and adjust to use #edit over #show	2018-11-06 11:07:14 +00:00
Matt-Yorkley	aaaec4777d	Remove admin order #show link from helper	2018-11-06 11:03:06 +00:00
luisramos0	c191a1feb8	Add missing translation related to authorization failure	2018-11-06 10:20:52 +00:00
luisramos0	79fcc7bce0	Fix user balance calculator spec by setting a target_shipment on line item of the order being tested	2018-11-05 19:23:09 +00:00
Pau Pérez Fabregat	6bc14f4bab	Merge pull request #2970 from Matt-Yorkley/2939-edit-order-button ... Remove workaround in failing feature spec	2018-11-05 19:25:00 +01:00
Pau Pérez Fabregat	057412111d	Merge pull request #2972 from coopdevs/mark-last-failing-enterprise-spec-pending ... [Spree Upgrade] Mark last failing enterprises spec as pending	2018-11-05 18:59:47 +01:00
Pau Pérez Fabregat	e76bf81e2a	Merge pull request #2973 from coopdevs/deliver-email-in-spec ... [Spree Upgrade] Perform mail delivery in spec to make it pass	2018-11-05 18:58:37 +01:00
Pau Perez	f7b6867c28	Perform mail delivery in spec to make it pass ... We need to purposefully enable deliveries for the deliveries array to list this email. Otherwise the delivery logic is not executed and thus the deliveries array never filled.	2018-11-05 17:49:08 +00:00
Pau Perez	21d756a1af	Mark last failing enterprises spec as pending ... This will get solved once we complete https://github.com/openfoodfoundation/openfoodnetwork/issues/2971. Until then, let's not focus on this spec to reach our 100% green test suite.	2018-11-05 16:45:53 +00:00
Matt-Yorkley	fd47756e2f	Remove workaround in failing feature spec ... Removed an old workaround that clicked a button multiple times. This was no longer working and causing the spec to fail.	2018-11-05 11:19:57 +00:00
Pau Pérez Fabregat	50a06d1bd9	Merge pull request #2969 from luisramos0/2897-2-0-price-fix ... [Spree Upgrade] Fix specs creating deleted variants	2018-11-05 11:59:06 +01:00
luisramos0	4f992a18f7	Fix specs creating deleted variants ... Spree checks that each price belongs to a variant Since we were creating deleted variants, the price models couldnt see those	2018-11-05 10:43:10 +00:00
Pau Pérez Fabregat	fe8303cb19	Merge pull request #2957 from luisramos0/2-0-paypal-spec ... [Spree Upgrade] Fix occurrences of order.shipping_method= by replacing with order.shipments	2018-11-02 15:50:59 +01:00
Pau Pérez Fabregat	834520491c	Merge pull request #2900 from luisramos0/raise_error_if_no_stock_item_available ... [Spree Upgrade] Avoiding variantStock raise by creating variant first and then setting `count_on_hand`	2018-11-02 15:49:21 +01:00
Pau Pérez Fabregat	e635cfc9c1	Merge pull request #2901 from luisramos0/variants_including_master ... [Spree Upgrade] Adapt product_decorator code to spree 2 with new variants_including_master	2018-11-02 15:48:19 +01:00
Pau Pérez Fabregat	b1f3fa14e5	Merge pull request #2880 from luisramos0/backorders ... [Spree Upgrade] Replace allow_backorders with variant.on_demand in the cart	2018-11-02 15:47:02 +01:00
Pau Pérez Fabregat	ad743a03ac	Merge pull request #2888 from luisramos0/backorders-line-items ... [Spree Upgrade] Replace allow_backorders with variant.on_demand in the line_item_decorator	2018-11-02 15:45:25 +01:00
Pau Pérez Fabregat	a910fc50f5	Merge pull request #2926 from luisramos0/2-0-stable-oct-25 ... [Spree Upgrade] Merging master into 2-0-stable (second run in October2018)	2018-11-02 15:37:34 +01:00
luisramos0	8a034a1538	Fix occurrences of order.shipping_method= by replacing with order.shipments=	2018-10-30 13:37:45 +00:00
Luis Ramos	4422cdc691	Merge pull request #2936 from luisramos0/2933-2-0-orders-admin ... [Spree Upgrade] Fix some tests in orders admin spec	2018-10-29 23:17:48 +00:00
luisramos0	b16ed86b2d	Fix shipping_method basic test. Adapt to spree 2 that needs shipping_categories to be set and sets them on the base factory in a after_create block, the build command was not picking it up	2018-10-27 20:34:25 +01:00
luisramos0	4450380cb0	Add missing translation to filter on orders admin page	2018-10-26 21:32:16 +01:00
luisramos0	a5d4c50dea	Fix some specs in admin orders. Fixed path to order edit page and some html class identifiers that were changed in spree 2. Subtotal line is gone in spree 2, removed test.	2018-10-26 21:32:16 +01:00
luisramos0	90d7b7f4a0	Merge branch 'master' into 2-0-stable-oct-25	2018-10-25 14:28:58 +01:00
Maikel	acb8ec772e	Merge pull request #2922 from mkllnk/update-rubocop-todo ... Update rubocop todo list	2018-10-25 14:48:51 +11:00
Maikel	3cab3d1798	Merge pull request #2921 from openfoodfoundation/transifex ... Transifex	2018-10-25 14:22:10 +11:00
Maikel Linke	cd5c23993a	Update rubocop todo list ... Since we activated more cops in 0ac16ce096 we had a lot of files missing in the todo list. They are likely from other pull requests that have been open at the same time. This is a quick update so that rubocop gives us some useful feedback again.	2018-10-25 14:08:04 +11:00
Maikel	51a1787881	Merge pull request #2908 from Matt-Yorkley/bulk_orders_bug ... Fix pagination conflict with LineItemsCtrl requests	2018-10-25 13:18:11 +11:00
Transifex-Openfoodnetwork	c17939631f	Updating translations for config/locales/en_US.yml	2018-10-25 09:31:36 +11:00
Pau Pérez Fabregat	ce93c52dfe	Merge pull request #2850 from Matt-Yorkley/password_change_logout ... Password change logout	2018-10-24 11:43:09 +02:00
Pau Pérez Fabregat	9ef4852bd4	Merge pull request #2818 from nikobozi/refactor-variant-overrides-query ... Move query from variant_overrides_controller to its model scope	2018-10-24 11:42:22 +02:00
Pau Pérez Fabregat	7651ee0909	Merge pull request #2798 from as1729/as1729-update-docs-Stripe-publishable_key-for-pr ... Better docs for Stripe.publishable_key and Stripe.endpoint_secret.	2018-10-24 11:23:21 +02:00
Pau Pérez Fabregat	f32e4dddb1	Merge pull request #2902 from luisramos0/more-pending-tests ... [Spree Upgrade] Mark specs from secondary features as xfeature	2018-10-23 19:00:49 +02:00
Pau Pérez Fabregat	9a06c1ef98	Merge pull request #2899 from luisramos0/2898-2-0-fix-orders-admin ... [Spree Upgrade] Fix orders admin page by removing a filter that is gone in spree 2	2018-10-23 18:59:01 +02:00
Pau Pérez Fabregat	235d42024a	Merge pull request #2903 from luisramos0/2884-2-0-order-ships-path ... [Spree Upgrade] In order list page, the shipment state is now a label, not a link. The shipments page is gone in spree 2.	2018-10-23 18:57:05 +02:00
Maikel	6f5289c730	Merge pull request #2894 from openfoodfoundation/transifex ... Transifex	2018-10-23 16:21:20 +11:00
Luis Ramos	a9b390d0aa	Merge pull request #2761 from HugsDaniel/2744_fix_feature_specs ... [Spree Upgrade] Fix feature specs for shipping_methods	2018-10-22 23:12:20 +01:00
Matt-Yorkley	42c1584e6f	Fix pagination conflict with LineItemsCtrl requests	2018-10-22 18:13:56 +01:00
Pau Pérez Fabregat	a1bbf5328e	Merge pull request #2872 from mkllnk/2765-fix-geocoding ... 2765 Fix geocoding to display enterprises on map	2018-10-22 16:44:30 +02:00
luisramos0	d0d9038308	Removed order.shipments_path from order serializer. In order list page the shipment state is now a label, not a link. The shipmeents page is gone in spree 2	2018-10-22 11:24:01 +01:00
luisramos0	34d1e6ffdb	Remove pending from bulk_product_update_spec because it's a core spec and should not be left for later in the upgrade process. This reverts PR#2794	2018-10-21 22:13:15 +01:00
luisramos0	7ae5a615b2	Move all specs in update_account_invoices_spec and finalize_account_invoices_spec.rb temporarily to pending	2018-10-21 22:09:21 +01:00
luisramos0	6f78f3c595	Move all specs in proxy_order_spec temporarily to pending	2018-10-21 22:08:10 +01:00
luisramos0	b0ffb0f91a	Move all specs in subscription_confirm_job_spec temporarily to pending	2018-10-21 22:07:23 +01:00
luisramos0	2e64226d29	Move all specs in spec/features/admin/subscriptions_spec temporarily to pending	2018-10-21 22:06:31 +01:00
luisramos0	ca786249a6	Move all specs in subscription_form_spec temporarily to pending	2018-10-21 22:05:45 +01:00