raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-04 22:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,330 Commits 18 Branches 452 Tags
fd47756e2f53e89ebf2c805b0cfb50273b5ff7cf
Commit Graph

10330 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
luisramos0
3afc59c864 Move all specs in products_reset_strategy_spec (part of product import feature) temporarily to pending 2018-10-21 22:04:16 +01:00
luisramos0
5b6b0f408f Move all specs in product_importer_spec temporarily to pending. There were 11 temporarily pending tests but more were failing 2018-10-21 22:02:34 +01:00
luisramos0
5d36450de2 Move all specs in reports_spec temporarily to pending. There were 6 temporarily pending tests but 3 more were failing 2018-10-21 21:56:55 +01:00
luisramos0
92c7db2249 Adapt product_decorator code to spree 2 where variants_including_master now makes use of Paranoi gem 2018-10-20 23:43:33 +01:00
luisramos0
f3ef3d0c3e Avoiding variantStock raise by creating variant first and then setting count_on_hand 2018-10-20 23:28:22 +01:00
luisramos0
653c67971f Remove order admin page filter 'show only unfulfilled orders' as done on spree 2 2018-10-20 15:11:47 +01:00
Transifex-Openfoodnetwork
c911462737 Updating translations for config/locales/en_GB.yml 2018-10-20 02:04:33 +11:00
luisramos0
c373d5ab33 Replace usage of global allow_backorders with variant.on_demand in line item sufficient stock method 2018-10-18 19:44:38 +01:00
luisramos0
df36e0b344 In cart population, replace usage of global allow_backorders with variant.on_demand adapter 2018-10-18 18:37:09 +01:00
Pau Pérez Fabregat
32632addfb Merge pull request #2823 from luisramos0/2-0-order-spec-fees 
[Spree Upgrade] Fix fees tests in models/spree/order_spec
 2018-10-18 13:30:15 +02:00
luisramos0
a92e8c9923 Improve readability of shipment decorator 2018-10-18 10:54:21 +01:00
luisramos0
a83af367b4 Fix order_spec related to retrieving previously ordered items 
In spree 2, each completed_order_with_totals comes with 5 line items (see order_factory in spree), so instead of 1+1+1=3 the calculation becomes 5+5+1=11
 2018-10-18 10:54:21 +01:00
luisramos0
74eff8730b Fix tests of fees in a completed order in models/spree/order_spec by: 
- set distributor with taxes on the order
- simplify the factory completed_order_with_fees by replacing shipment with shipping_method and ship_address and letting the order workflow handle shipments and inventory units
 2018-10-18 10:54:21 +01:00
luisramos0
91f52d80c8 Fix problem in order and adjustment model specs by fixing the order.adjustment association 
This fix was taken from spree 2.1  here 3fa44165c7
 2018-10-18 10:53:00 +01:00
luisramos0
2ccbb87adc Fix payment decorator bug 
Payment line items must come from the order, payment does not have inventory_units
 2018-10-18 10:53:00 +01:00