Maikel Linke
73372a58ef
Remove unused and dangerous Exchange#eql? override
...
The `eql?` override has been added in very early commits but was
actually not used except in a test. It also caused performance problems
since each call to `eql?` would issue two database queries. A developer
would unknowingly trigger these when using `exchanges.uniq`. A mistake
that could have happened again in the future.
I moved the implementation to the test that was actually using it and
made a second test a bit more explicit.
2019-07-02 18:42:02 +10:00
Maikel
592a468448
Merge pull request #3960 from mkllnk/test-spec-stability
...
Remove retries from previously flaky specs
2019-07-02 13:50:16 +10:00
Luis Ramos
5ecab7a0c2
Merge pull request #3971 from Matt-Yorkley/basket_errors
...
Avoid `undefined method 'order'` errors when removing lineitems from basket
2019-06-26 15:33:26 +01:00
Luis Ramos
d8785bdaba
Merge pull request #3932 from luisramos0/shpfront_message
...
Improve message in private shopfront when user is not logged in or not a customer
2019-06-26 15:31:06 +01:00
Luis Ramos
00841cb537
Merge pull request #3923 from luisramos0/prod_image_error
...
User friendly error when creating a product with an image in an unsupported format
2019-06-26 15:30:18 +01:00
luisramos0
61c8859da8
Fix problem in array concatenation in orders helper and cover it with specs
2019-06-26 14:17:41 +01:00
luisramos0
95170bacd5
Show print invoices button in orders list page only if invoices are enabled in the backoffice
2019-06-26 14:17:25 +01:00
Maikel Linke
5d3dbca9c3
Toggle features via env instead of initializer
...
A FeatureToggle could be switched via a class_eval in an initializer.
The initializer was installed via ofn-install. We want to get rid of
custom, untracked initializers. Here I'm changing the FeatureToggle
class to use environment variables instead.
This change needs to be followed up with a change in ofn-install to use
the new environment variable. It affects only Australian production.
2019-06-26 11:43:22 +10:00
Maikel Linke
5bbd63bcd8
Add spec for rescuing order saving shipment
2019-06-26 11:32:01 +10:00
Matt-Yorkley
5100ad6b51
Improve #line_items_for logic and add more tests
2019-06-25 15:33:42 +01:00
luisramos0
2b6e6c62dd
Simplify order_factory_spec by extracting copy pasted code to method
2019-06-25 14:50:03 +01:00
luisramos0
05a15d9441
Extract method to remove some copy pasted code in order_factory_spec
2019-06-25 14:50:03 +01:00
luisramos0
567196fe0e
Fix line item verification of stock on the browser side by adding logic to handle completed orders with some reserved stock
...
The shopping/orders_spec is now validating this edge case by using all stock available in one of the line items
2019-06-25 14:50:03 +01:00
luisramos0
7bd32d4967
Fix usage of variant.on_hand in subscriptions order factory, we now take on_demand into account
...
This fixes a problem introduced in 12eab1bfa9 (diff-c3c4192f302cc77e9a8547012fe86ddb)
2019-06-25 14:47:47 +01:00
Matt-Yorkley
f19a6f0dec
Add tests for class_eval on Spree::Calculator private method #line_items_for
2019-06-25 12:19:16 +01:00
Matt-Yorkley
034e8b180a
Use let for CSV data
2019-06-25 10:24:53 +01:00
Matt-Yorkley
8dfb628d88
Add test for ignoring non-updatable description field in validations when updating
2019-06-25 10:19:05 +01:00
Maikel Linke
6a06e0ac3b
Raise error on missing translation keys
2019-06-25 15:06:56 +10:00
luisramos0
a6ea975848
Fix editing cart when variant on_demand but on_hand is zero or negative
2019-06-24 22:07:46 +01:00
Maikel
e4c3c1664a
Merge pull request #3943 from jonleighton/issue-2112
...
Bring back ‘Shop for X products at:’ title
2019-06-21 15:06:21 +10:00
Maikel
5b0c8bbaef
Merge pull request #3836 from Matt-Yorkley/fast_and_furious2
...
Improve /shops, /producers, and /groups performance
2019-06-21 15:02:19 +10:00
Maikel
71f396a44f
Merge pull request #3896 from luisramos0/clear_unit_desc
...
Clear product.variants.unit_description if product.variant_unit is items
2019-06-21 15:00:06 +10:00
Maikel
5aea361d87
Merge pull request #3709 from luisramos0/2-0-prepare-4-rails-4
...
Start upgrade to Rails 4
2019-06-21 14:58:24 +10:00
Maikel
3721c017fa
Merge pull request #3670 from luisramos0/2-0-without-spree-fe-assets
...
[Spree Upgrade] Remove dependency to spree frontend - routes and controllers
2019-06-21 14:57:03 +10:00
Maikel
12f0ed9955
Merge pull request #3940 from luisramos0/zones
...
Remove matching of shipping method zone to user address on checkout
2019-06-21 14:43:40 +10:00
Maikel
4c4881430c
Merge pull request #3908 from kristinalim/fix/3843-unit_type_in_product_import
...
3877,3843 Improve handling of units and unit type in product import
2019-06-21 14:43:01 +10:00
Maikel Linke
cccd35fdf3
Remove retries from previously flaky specs
...
It's not acceptable to have flaky specs that only pass once in three
tries. Our specs might be more stable now that we use Chrome as test
browser. Otherwise we have to find out why these specs are not stable.
It might be an important bug that happens only sometimes.
2019-06-19 16:48:04 +10:00
Maikel Linke
d8ece7cd8b
First stored credit card becomes default again
...
A user can store their credit card when checking out. Due to a bug in
https://github.com/openfoodfoundation/openfoodnetwork/pull/3840 it
didn't become the default card any more. This behaviour is now restored.
If there is not default card yet, a new card added during checkout
becomes the default card.
2019-06-19 15:43:38 +10:00
luisramos0
2b3865855d
Simplify shipping_method.include? method
2019-06-18 11:42:34 +01:00
luisramos0
3c964933b1
Remove stub of a deleted method #deadcode
2019-06-18 10:49:20 +01:00
luisramos0
02b9fca620
Remove unused spree checkout and spree cart routes
2019-06-18 10:49:19 +01:00
luisramos0
ba91abd20e
Adapt exchanges.with_any_variant scope to rails 4
2019-06-18 10:40:49 +01:00
luisramos0
0d07bf2a3b
Adapt enterprise.distributing_products scope to rails 4
2019-06-18 10:40:49 +01:00
Jon Leighton
fcff302d55
Bring back ‘Shop for X products at:’ title
...
Fixes #2112
It looks like this bug was accidentally introduced during a refactor in
e5ca494db8https://docs.angularjs.org/api/ng/directive/ngBindHtml ) because the
former is not a valid AngularJS directive.
It was also necessary to bubble up the `.cta-container` class in order to
get the appropriate styling on the title.
2019-06-17 15:43:15 +10:00
luisramos0
ccc7a43a06
Bypass validation of shipping methods zone on checkout
2019-06-15 21:11:51 +01:00
Luis Ramos
b1d4461c77
Merge pull request #3936 from luisramos0/factories_refactor
...
Extract factories to separate files and fix rubocop issues
2019-06-14 22:28:55 +01:00
Pau Pérez Fabregat
45c77196b3
Merge pull request #3935 from mkllnk/update-rubocop-style
...
Update rubocop style
2019-06-14 19:52:22 +02:00
luisramos0
13d41dc1aa
Remove duplicate modify entry in factories
2019-06-14 13:59:24 +01:00
luisramos0
3259db69f0
Remove unnecessary code, this code as been accepted in spree code base and included in spree v1.2
2019-06-14 13:43:30 +01:00
luisramos0
6efb71d903
Fix more rubocop issues in spec/factories
2019-06-14 13:42:27 +01:00
Luis Ramos
91401446a5
Merge pull request #3915 from mkllnk/3844-permalink-conflicts
...
Consider deleted products when creating permalinks
2019-06-14 13:20:35 +01:00
luisramos0
59593c824a
Fix rubocop issues in different factories
2019-06-14 13:10:53 +01:00
luisramos0
79cf03b124
Fix rubocop issues in spec/factories
2019-06-14 13:01:08 +01:00
luisramos0
a6b3c26bbe
Extract users factories to separate file
2019-06-14 12:50:26 +01:00
luisramos0
8345765ada
Extract tag rules factories to separate file
2019-06-14 12:49:17 +01:00
luisramos0
03fb33ba86
Extract variant factory modify to separate file
2019-06-14 12:48:04 +01:00
luisramos0
2c8ce6e4e5
Extract products factories to separate file
2019-06-14 12:45:55 +01:00
luisramos0
3e10c703bf
Extract shipments factories to separate file
2019-06-14 12:43:07 +01:00
luisramos0
42f8b2efed
Fix static file path in order_cycle_factory
2019-06-14 12:30:36 +01:00
luisramos0
bd493c392a
Extract shipping_methods factories to separate file
2019-06-14 12:25:10 +01:00
