Ahmed Ejaz
0887f0676f
12294 - Fix Wrong Tax Category Display
...
- Only display the tax_category name if the tax_category_id is present
- tax_category is overriden in the variant model
- if tax category is not present, then return the default tax category
2024-04-04 06:06:23 +05:00
David Cook
0bae5d67c6
Merge pull request #12325 from openfoodfoundation/dependabot/bundler/letter_opener-1.10.0
...
chore(deps-dev): bump letter_opener from 1.9.0 to 1.10.0
2024-04-04 09:28:26 +11:00
David Cook
2007b2e1b0
Merge pull request #12322 from openfoodfoundation/dependabot/bundler/debug-1.9.2
...
chore(deps-dev): bump debug from 1.9.1 to 1.9.2
2024-04-04 09:26:04 +11:00
David Cook
0d0a9a467c
Merge pull request #12321 from openfoodfoundation/dependabot/bundler/aws-sdk-s3-1.146.1
...
chore(deps): bump aws-sdk-s3 from 1.146.0 to 1.146.1
2024-04-04 09:25:35 +11:00
David Cook
a4cc4e28e7
Merge pull request #12319 from openfoodfoundation/dependabot/npm_and_yarn/trix-2.1.0
...
chore(deps): bump trix from 2.0.10 to 2.1.0
2024-04-04 09:25:04 +11:00
Gaetan Craig-Riou
12cf626202
Update all locales with the latest Transifex translations
2024-04-03 16:48:50 +11:00
David Cook
af2e3ca703
Merge pull request #12326 from filipefurtad0/deletes_connected_accounts_after_specs
...
Removes Stripe accounts created for testing purposes
2024-04-03 10:37:17 +11:00
Gaetan Craig-Riou
52bc88bbd8
Merge pull request #11369 from Matt-Yorkley/product-taxon
...
[Product Refactor] Primary Taxon
2024-04-03 10:31:49 +11:00
David Cook
cadc2bf5d3
Merge pull request #12320 from anansilva/6055-fix-rubocop-lint-duplicate-branch
...
Fix rubocop Lint/DuplicateBranch group
2024-04-03 10:02:14 +11:00
Ana Nunes da Silva
eedbaaff6e
Fix duplicate branch in Spree::Preferences::Preferable private method
...
:string, :text and :password cases have the same value
2024-04-02 10:20:17 +01:00
Ana Nunes da Silva
5fde1cc7cd
Fix duplicate branch in Spree::Preference#value method
...
:string, :text and :password cases have the same value
2024-04-02 10:20:17 +01:00
Ana Nunes da Silva
3e796da8ff
Fix duplicate branch Spree::Calculator
2024-04-02 10:20:17 +01:00
Ana Nunes da Silva
8bee48df6d
Fix duplicate branch in Enterprise#category method
...
non_producer_sells_any and non_producer_sells_own have the same category
2024-04-02 10:20:17 +01:00
Ana Nunes da Silva
eaf32226a4
Fix duplicate branches in Spree::Admin::BaseHelper
...
:string case already handled by the else case
2024-04-02 10:20:17 +01:00
Maikel
97c6c97499
Merge pull request #12318 from openfoodfoundation/dependabot/bundler/newrelic_rpm-9.8.0
...
chore(deps): bump newrelic_rpm from 9.7.1 to 9.8.0
2024-04-02 10:42:51 +11:00
Gaetan Craig-Riou
484c037c38
Fix duplication coming from a rebase error
2024-04-02 10:18:47 +11:00
Gaetan Craig-Riou
100239c4e6
Fix #bulk_product duplicate
...
Remove duplicate when a product has mutiple variant in the same category
(taxon)
2024-04-02 09:59:16 +11:00
Gaetan Craig-Riou
678fa37df9
Fix duplication issue
...
When a product had mutiple variant assigned to the same category it
should only return the product one
2024-04-02 09:57:36 +11:00
Gaetan Craig-Riou
8c05838080
Move the category to the variant row
2024-04-02 09:57:36 +11:00
Gaetan Craig-Riou
6d1249e7f9
Update DFC supplied product
2024-04-02 09:57:36 +11:00
Matt-Yorkley
d3e62c4390
Add test for persisting taxon on variant during product creation
2024-04-02 09:43:24 +11:00
Matt-Yorkley
ac4ec36b3b
Update ProductScopeQuery spec
2024-04-02 09:43:24 +11:00
Matt-Yorkley
8a364a5f48
Fix product touch spec
2024-04-02 09:43:24 +11:00
Matt-Yorkley
d959ee2358
Fix rubocop warnings
2024-04-02 09:43:24 +11:00
Matt-Yorkley
a55931c081
Reinstate sorting by arbitrary list of product categories
2024-04-02 09:42:43 +11:00
Maikel
eac278ea1f
Merge pull request #12262 from filipefurtad0/vcr_stripe_accounts_controller_spec
...
Vcr stripe accounts controller spec
2024-04-02 09:39:53 +11:00
Matt-Yorkley
2743a8183d
Disable sorting by user-defined product category order
2024-04-02 09:33:34 +11:00
Matt-Yorkley
3f2a5786bd
Apply taxon from sibling variant if none is provided on variant creation
2024-04-02 09:27:37 +11:00
Matt-Yorkley
02abe5cc06
Remove dead code related to multiple product taxons
2024-04-02 09:27:37 +11:00
Matt-Yorkley
fb09a7f1e6
Fix product filtering
2024-04-02 09:27:37 +11:00
Matt-Yorkley
78495d0ace
Drop unnecessary params filtering
2024-04-02 09:27:37 +11:00
Matt-Yorkley
6025491f94
Update product serializer
2024-04-02 09:27:37 +11:00
Matt-Yorkley
c5ec7e361b
Update product import
2024-04-02 09:27:36 +11:00
Matt-Yorkley
d4dd3cc708
Update products v3 table
2024-04-02 09:27:36 +11:00
Matt-Yorkley
c0864405a1
Update bulk products JS spec
2024-04-02 09:27:36 +11:00
Matt-Yorkley
6e7b97879b
Update DFC product importer
2024-04-02 09:27:36 +11:00
Matt-Yorkley
d281e9d1b5
Adjust factory
2024-04-02 09:27:36 +11:00
Matt-Yorkley
d9899e8af6
Update more specs
2024-04-02 09:27:36 +11:00
Matt-Yorkley
b22c42613a
Update taxon querying in reports
2024-04-02 09:27:36 +11:00
Matt-Yorkley
269d3ced0c
Update enterprise caching spec
2024-04-02 09:27:36 +11:00
Matt-Yorkley
861f2aef01
Update product import spec
2024-04-02 09:27:36 +11:00
Matt-Yorkley
6b3e33f607
Update Taxon associations and joins
2024-04-02 09:27:36 +11:00
Matt-Yorkley
cd601319f3
Fix factory issues
2024-04-02 09:27:36 +11:00
Matt-Yorkley
3b715875ad
Update taxon association
2024-04-02 09:27:36 +11:00
Matt-Yorkley
0dbbd5ed3b
Migrate primary taxon id from products to variants
2024-04-02 09:27:36 +11:00
Matt-Yorkley
65731f6c52
Update serializers and views for admin products index
2024-04-02 09:27:36 +11:00
Matt-Yorkley
3a38eeb248
Remove products taxon null constraint
2024-04-02 09:27:36 +11:00
Matt-Yorkley
2707c3137a
Apply taxon to new variant when creating a new product
2024-04-02 09:27:36 +11:00
Matt-Yorkley
b30944471d
Update admin forms
2024-04-02 09:27:36 +11:00
Matt-Yorkley
c805486f0a
Update attribute translations
2024-04-02 09:27:36 +11:00
