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
15,608 Commits 18 Branches 452 Tags
20c41ce69e04299a6bf821094de21f63f678dcc2
Commit Graph

5852 Commits

Author SHA1 Message Date
luisramos0
c2e05e7d87 In api orders controller spec, remove inventory_units_shipment_id_null as the filter was removed in spree 2 
Also set the distributor used in the tests on completed_order_with_fees so results for that distributor are correct
 2018-12-21 16:10:31 +00:00
luisramos0
8970131685 In restart checkout spec, create failed payment before the valid payment otherwise the failed payment will invalidate the previous payment, even if it is a good one 
In spree 2, every new payment will invalidate all previous payments in the order
See here: c9eebba4f7
 2018-12-21 15:13:52 +00:00
luisramos0
7155f28acf Remove shipping_method_id from RestartCheckout, destroying shipments is now enough as order.shipping_method_id is no longer used and will be dropped. See #2683 for more details 2018-12-21 15:13:43 +00:00
luisramos0
c0a095ffaf Improve variant_overrides_spec variable names 2018-12-21 11:33:07 +00:00
luisramos0
4f79fd5be0 Improve availability validator spec readability and remove unnecessary expect statements 2018-12-21 11:19:12 +00:00
Maikel
9557457ec2 Merge pull request #3088 from kristinalim/cleanup-test_scripts 
Run RSpec tests in custom engines (and some fixes, cleanup)
 2018-12-21 14:32:56 +11:00
luisramos0
c1aeb2e9a3 Improve naming in availability_validator_decorator and cover it with tests 2018-12-20 14:26:34 +00:00
luisramos0
3085e15961 Fix order factory by making line_item.skip_stock_check work in spree 2 2018-12-20 14:26:34 +00:00
luisramos0
88b1bb61d6 Fix availability validator to include inventory_units in it's validation 2018-12-20 14:26:34 +00:00
Maikel
073f88b1c2 Merge pull request #3198 from kristinalim/fix-variant_override_stock_settings_validation 
Validation and others for keeping variant override "On Demand" and "Count on Hand" compatible
 2018-12-20 14:05:20 +11:00
Kristina Lim
a460e9d35f Allow disabling Knapsack when running RSpec tests 2018-12-19 17:50:29 +08:00
Luis Ramos
0aaa41ced0 Merge pull request #3228 from luisramos0/2-0-stable-dec-18th 
[Spree Upgrade] Merging master into 2-0-stable (third run in Dec2018)
 2018-12-19 09:30:57 +00:00
Maikel
4201549992 Merge pull request #3219 from luisramos0/2-0-payment-ctrl 
[Spree Upgrade] Adapt payment controller spec to spree 2
 2018-12-19 15:23:11 +11:00
Maikel Linke
3169a384ba Find approximate tax rate if no other is found 
There are several cases in which a tax rate is not associated with an
adjustment. We find the closest one for reporting here. It is not a good
solution, but a workaround introduced for reporting:
https://github.com/openfoodfoundation/openfoodnetwork/pull/1496
 2018-12-19 14:31:29 +11:00
Maikel Linke
a341561446 Move tax rate finding into service and spec it 
The `#tax_rates` method is actually not present in Spree. We encapsulate
the logic in this commit and enable better unit testing. The new tests
cover a current bug: https://github.com/openfoodfoundation/openfoodnetwork/issues/3127
 2018-12-19 14:31:29 +11:00
luisramos0
6fc3562a73 Merge branch 'master' into 2-0-stable-dec-18th 2018-12-18 23:32:45 +00:00
luisramos0
5e960512ac Set user locale on user registrations #create 
This is done so that user.locale is used in the first confirmation email. This also stores user.locale in the DB from registration.
 2018-12-18 15:30:01 +00:00
Pau Pérez Fabregat
2deffb9c9f Merge pull request #3076 from Matt-Yorkley/orders_checkboxes 
Fix checkbox values on orders page
 2018-12-17 10:35:46 +01:00
luisramos0
a5bf7a1f35 Adapt payment controller spec to spree 2 
In spree 2, since 5ed6015916, to fire a payment event the order needs to be in either payment or complete state
 2018-12-14 16:04:19 +00:00
Pau Perez
51e277a183 Make test setup more readable 2018-12-14 15:12:41 +01:00
Maikel
1ed880e353 Merge pull request #3206 from coopdevs/fix-redirection-on-admin-products-specs 
[Spree Upgrade] Fix redirection on admin products specs
 2018-12-14 11:59:21 +11:00
Maikel
f0d3992511 Merge pull request #3203 from luisramos0/2-0-fix-prod-images-delete 
[Spree Upgrade] Fix product properties and images deletion
 2018-12-14 11:54:05 +11:00
Pau Pérez Fabregat
64e41712c6 Merge pull request #3130 from coopdevs/extract-restart-checkout 
Extract restart checkout
 2018-12-12 17:12:53 +01:00
Pau Perez
43cacfc2fc Fix redirection on admin/products controller specs 
In Spree v2.0 the product attributes being sent were no longer valid.
Providing a shipping category and setting a stock location on the DB so
that a stock item can be created fixes them.

Remember `Variant#create_stock_item`, which is defined as an
`after_create` callback, relies on `StockLocation` to create the item.
 2018-12-12 13:10:39 +01:00
luisramos0
66e69edca4 Rename ProductOnDemand to ProductStock; move product.on_hand into it; add product.on_demand; and remove unnecessary on_demand= 2018-12-12 12:10:25 +00:00
luisramos0
181915c63a Fix deletion of product properties 2018-12-11 15:53:40 +00:00
luisramos0
e274442d77 Cover i18nhelper.valid_locale and user mailer with tests related to localized emails 2018-12-11 11:16:50 +00:00
Maikel
1819fc8493 Merge pull request #3199 from luisramos0/2-0-stable-dec-10th 
[Spree Upgrade] Merging master into 2-0-stable (second run in Dec2018)
 2018-12-11 18:50:24 +11:00
Pau Pérez Fabregat
7834fa4d00 Merge pull request #3190 from luisramos0/2-0-new-product 
[Spree Upgrade] Fix "new product" page specs and an html issue
 2018-12-11 08:35:26 +01:00
Maikel
d63ae792b3 Merge pull request #2775 from luisramos0/2-0-checkout-ship-method 
[Spree Upgrade] Handle shipping_method_id in checkout
 2018-12-11 11:59:03 +11:00
Matt-Yorkley
e711c5ed03 Add spec for search filters 2018-12-10 20:48:53 +00:00
luisramos0
cdee7c0422 Merge branch 'master' into 2-0-stable-dec-10th 2018-12-10 16:41:29 +00:00
Pau Pérez Fabregat
b8a61257da Merge pull request #3188 from luisramos0/2-0-ctrl-specs 
[Spree Upgrade] Fix line_item_controller spec by adpating to new spree 2 factories
 2018-12-10 12:31:26 +01:00
luisramos0
4f4fc00549 Improve code, specs and comments in the shipping_method selection process in the checkout controller 2018-12-09 20:05:10 +00:00
luisramos0
38ff99717a Fix bug on calculator_decorator line_items_for where input is line_item with an nil order. Adapted line_items_for so that weight_calculator.line_items_for could be removed. 2018-12-09 19:37:11 +00:00
Kristina Lim
d67b3faf01 Address affected specs from new VO validations 2018-12-09 21:48:08 +08:00
Kristina Lim
34313c94ca Make reset stock settings for VO force limited stock 2018-12-09 21:47:05 +08:00
Kristina Lim
ad35ea1102 Add factory stock traits for variant overrides 2018-12-09 21:47:05 +08:00
Kristina Lim
210a11783c Test that saving invalid variant override provides error 2018-12-09 21:43:57 +08:00
luisramos0
7ecce51b8b Create default stock location and set required product.shipping_category in specs that create products 2018-12-08 14:52:50 +00:00
Kristina Lim
83b6973bc2 Require compatible VO on_demand and count_on_hand 2018-12-07 14:39:36 +08:00
luisramos0
7df869bd35 Fix line_item_controller spec by adpating to new spree 2 factories 2018-12-05 22:22:15 +00:00
luisramos0
afd243c548 Replace stub with allow in checkout_controller_spec 2018-12-05 15:40:14 +00:00
Kristina Lim
842a8e3654 Move null option for VO use_producer_settings to JS 2018-12-05 17:40:32 +08:00
Kristina Lim
802e3bb447 Refactor choosing VO on_demand in feature specs 
We are still using the Rails view I18n scope for :use_producer_settings.
Angular requires this replacement of the default blank option, which we
use for nil on_demand, to be in the template itself.

If we eventually move this template to a JS template, we can move it to
the same I18n scope as the :yes and :no options.
 2018-12-05 17:40:31 +08:00
Kristina Lim
cff4eb0005 Improve and simplify VO count on hand suggestions 
Set variant override count_on_hand in UI to variant count_on_hand value
if on_demand is changed and both specify limited stock.
 2018-12-05 17:40:30 +08:00
Kristina Lim
4f2d96d763 Use correct placeholders for VO count_on_hand 2018-12-05 17:40:29 +08:00
Kristina Lim
09b9f968b7 Make VO count on hand readonly unless limited stock 2018-12-05 17:40:29 +08:00
Kristina Lim
cc003c99d5 Ensure in UI compatible VO count and on demand 2018-12-05 17:40:28 +08:00
Kristina Lim
7ae555cd9c Translate variant override on_demand yes and no 2018-12-05 17:40:27 +08:00