luisramos0
ee8fe4b6b4
Move registration process translations to lazy lookups to better organize the en.yml file
2019-02-22 14:37:45 +00:00
luisramos0
0b1ea1beda
Rename VariantOverride.use_producer_settings to VariantOverride.use_producer_stock_settings
2019-02-22 09:57:21 +00:00
Pau Pérez Fabregat
439ea618df
Merge pull request #3524 from luisramos0/2-0-stable-Feb20
...
[Spree Upgrade] Merging master into 2-0-stable (3rd run in Feb2019)
2019-02-22 09:01:40 +01:00
Pau Pérez Fabregat
632826a192
Merge pull request #3494 from luisramos0/break-oc-specs
...
Break order_cycle_spec.js in specific files and remove reference to product.count_on_hand in bulk_product_update_spec.js
2019-02-22 08:30:35 +01:00
luisramos0
45e5fed609
Improve scope_variant_to_hub code and spec by testing an invalid data state
2019-02-21 11:25:01 +00:00
Maikel
509e644cf7
Merge pull request #3526 from openfoodfoundation/transifex
...
Transifex
2019-02-21 16:05:21 +11:00
luisramos0
b73ca88811
Fix edit ship method and tracking number in backoffice order page
...
The data-hook is necessary to make spree js code work, in this case, activate click events on edit and save buttons
2019-02-20 23:57:57 +00:00
Transifex-Openfoodnetwork
4b21c9cb70
Updating translations for config/locales/en_CA.yml
2019-02-21 07:32:50 +11:00
luisramos0
5d51ad71b0
Merge branch 'master' into 2-0-stable-Feb20
2019-02-20 14:32:36 +00:00
Luis Ramos
34acaa4e03
Merge pull request #3425 from mkllnk/2783-product-importer-spec
...
Apply import defaults to variants of new products in Spree 2
2019-02-20 13:34:57 +00:00
Matt-Yorkley
f73221ed85
Use Dir::Tmpname.make_tmpname for threadsafe file naming
2019-02-20 13:10:47 +00:00
luisramos0
ef786adcfc
Make variant_override.stock_overridden? simpler and add comment to explain relationship between count_on_hand and on_demand in a VO
2019-02-20 13:07:21 +00:00
Maikel
ec26948949
Merge pull request #3521 from openfoodfoundation/transifex
...
Transifex
2019-02-20 19:10:16 +11:00
Maikel
806226b404
Merge pull request #3496 from luisramos0/2-0-kill-allow-backorders
...
[Spree Upgrade] Remove allow_backorders from product stock verification
2019-02-20 13:09:05 +11:00
Transifex-Openfoodnetwork
aba4d742f6
Updating translations for config/locales/fr_CA.yml
2019-02-20 12:55:33 +11:00
luisramos0
5b4c986733
Add spec to cover variant scoping in order_cycle.items_bought_by_user
2019-02-20 00:05:28 +00:00
Maikel
e7e2d1d870
Merge pull request #3516 from openfoodfoundation/transifex
...
Transifex
2019-02-20 10:39:55 +11:00
Maikel Linke
8374c7dea4
Fix serializer spec for supplied products
...
In a previous commit we removed the now obsolete scope
Product.not_deleted. Calling Enterprise#supplied_products without
any scope does not issue a new SQL query but returns the products that
were present when the enterprise was loaded.
The fixed spec creates more products after loading the enterprise. So
the enterprise needs to be reloaded or the new products are not visible.
2019-02-20 08:45:58 +11:00
Transifex-Openfoodnetwork
7e59132bb2
Updating translations for config/locales/en_GB.yml
2019-02-20 06:50:52 +11:00
dependabot[bot]
47e154f2ac
Bump oj from 3.7.8 to 3.7.9
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.7.8 to 3.7.9.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.7.8...v3.7.9 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-02-19 19:21:37 +00:00
Transifex-Openfoodnetwork
9688fe7540
Updating translations for config/locales/fr.yml
2019-02-20 06:15:01 +11:00
luisramos0
8ee14ccb4b
Make variants_stock_levels return variants on_demand values
2019-02-19 11:56:02 +00:00
Maikel
f0a6f5ae3c
Merge pull request #3514 from openfoodfoundation/transifex
...
Transifex
2019-02-19 15:40:30 +11:00
Transifex-Openfoodnetwork
0a50a74561
Updating translations for config/locales/en_US.yml
2019-02-19 15:23:20 +11:00
Maikel Linke
99f0be2f1c
Remove unnecessary scope Variant.not_deleted
...
Spree made that scope default so that we don't need to define or call
it. There might be cases in which we were showing deleted variants and
now we are not, but I have not idea how to find them.
Related Spree commit:
- cd3add960e
2019-02-19 14:25:18 +11:00
Maikel Linke
b4d1e48693
Update soft-delete of variants
...
Spree changed their way of soft-deleting variants from calling `delete`
to calling `destroy`. We don't need our own implementation any more.
2019-02-19 14:25:18 +11:00
Maikel Linke
cdb49f88b0
Move Variant deletion into its own service
...
This keeps the override of Spree's model leaner. More importantly, it
prepares us for using `destroy` instead of `delete`.
In the past, `Product#delete` soft-deleted the product, but didn't
delete the variants. When we use `Product#destroy` to soft-delete the
product, it will also call destroy on the variants. If the model doesn't
allow the deletion of the last variant, it will fail. So when a product
is deleted we want to allow the deletion of all variants. But the user
should not be allowed to delete the last variant. That's why I'm moving
the check to the controller level.
Related commits:
- e6c7acdff32b47c9145ab9f19d5777 (diff-412c5af2ec1ba9f6643f6df5a673c1d4R105)
2019-02-19 14:25:18 +11:00
Maikel Linke
8f49f0006a
Update products controller decorator with Spree
...
Spree changed the controller to deal with the updated soft-delete. This
commit brings these changes to our decorator.
2019-02-19 14:25:18 +11:00
Maikel Linke
5d828bd7ae
Update soft-delete of products
...
Spree changed their way of soft-deleting products, variants and
some other models. `#destroy` is now soft-deleting and replaces
`#delete`.
This commit considers only products. Variants will follow in another
commit. The other models can be ignored, because we don't call `delete`
on them.
2019-02-19 14:25:18 +11:00
Maikel
bb4d42ef9d
Merge pull request #3464 from openfoodfoundation/transifex
...
Transifex
2019-02-19 12:41:16 +11:00
Maikel
1b45033e33
Merge pull request #3506 from Matt-Yorkley/pi/parse_bom
...
Sanitize non-parsable BOM characters inserted by Excel
2019-02-19 11:24:11 +11:00
Maikel
be59a8ce32
Merge pull request #3434 from Matt-Yorkley/pi/fix_hash_merge
...
Fix hash merge for recording already created products by name
2019-02-19 11:21:49 +11:00
Maikel
b7abb72ed5
Merge pull request #3462 from luisramos0/delete-api-order-ctrl
...
Delete empty controller class eval and spec
2019-02-19 11:14:29 +11:00
Maikel
ae4d36b3ed
Merge pull request #3451 from Matt-Yorkley/subs/currency
...
Use localized currency symbols in Subs pages
2019-02-19 09:55:36 +11:00
luisramos0
30967a5ffa
Fix bulk product edit page. on_hand and on_demand should never be mixed on the server side, the UI can make the decision to show on_demand on the on_hand column if on_demand is true
2019-02-18 22:01:48 +00:00
luisramos0
12eab1bfa9
Merge variant_stock.count_on_hand into variant_stock.on_hand
...
variant.on_hand will not return infinity any longer if variant.on_demand is true. Clients of these methods will have to handle the combinations between on_hand and on_demand values
2019-02-18 22:00:16 +00:00
luisramos0
f0842fcbe5
Convert all calls to variant.count_on_hand to variant.on_hand
2019-02-18 21:54:07 +00:00
Matt-Yorkley
9705c249ac
Sanitize no-parsable BOM characters inserted by Excel
2019-02-18 13:13:37 +00:00
luisramos0
5aee043b86
Remove allow_backorders from product stock verification because product.has_stock? already includes product.on_demand and in v2 allow_backorders becomes on_demand
2019-02-18 13:12:29 +00:00
Luis Ramos
8f192c39fb
Merge pull request #3508 from luisramos0/2-0-green
...
[Spree Upgrade] Fix bulk_order_mgmt_spec - 2-0 build GREEN !!!
2019-02-18 13:05:17 +00:00
Kristina Lim
b0a82b0e21
Exclude $0 adjustments from report
2019-02-18 16:53:19 +08:00
Kristina Lim
36fd385f7d
Add test showing $0 mandatory adjustments included
2019-02-18 16:53:19 +08:00
Kristina Lim
19f99255fa
Exclude non-eligible entries from report
2019-02-18 16:53:18 +08:00
Kristina Lim
8ce7337c9d
Add test showing $0 non-mandatory adjustments included
2019-02-18 16:53:18 +08:00
Kristina Lim
ca2c8e6ff2
Add test showing non-"eligible" entries included
2019-02-18 16:53:18 +08:00
Pau Pérez Fabregat
f5df10f5dc
Merge pull request #3507 from openfoodfoundation/dependabot/bundler/selenium-webdriver-3.141.0
...
Bump selenium-webdriver from 3.12.0 to 3.141.0
2019-02-18 09:28:01 +01:00
luisramos0
a0bd290b6a
Fix bulk_order_management spec by setting ship address on the stest order, this makes the order worflow work up to complete because the shipping methods will be validated against the address
2019-02-17 21:53:58 +00:00
Matt-Yorkley
09655b9f88
Fix nil values in on_hand column
2019-02-16 01:05:20 +00:00
dependabot[bot]
ed7015ae98
Bump selenium-webdriver from 3.12.0 to 3.141.0
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.12.0 to 3.141.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases )
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES )
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-3.12.0...selenium-3.141.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2019-02-15 19:20:25 +00:00
Pau Pérez Fabregat
fb412cd9cd
Merge pull request #3299 from luisramos0/2-0-admin-capture-payment
...
[Spree Upgrade] Fix order_with_totals_and_distribution factory by updating shipping fees
2019-02-15 18:37:43 +01:00
